summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-08-14 03:02:03 +0200
committerHaru <haru@dotalux.com>2014-08-14 03:05:48 +0200
commit7f4d6fc1cb21da16e30eb5a5848f550d7d41d3e3 (patch)
treef128e4fc9076b7b6ba4493b2fc90782d419ff530 /src
parent2b8d5013ea8ba9904d157c773f12495bbca8ca80 (diff)
downloadhercules-7f4d6fc1cb21da16e30eb5a5848f550d7d41d3e3.tar.gz
hercules-7f4d6fc1cb21da16e30eb5a5848f550d7d41d3e3.tar.bz2
hercules-7f4d6fc1cb21da16e30eb5a5848f550d7d41d3e3.tar.xz
hercules-7f4d6fc1cb21da16e30eb5a5848f550d7d41d3e3.zip
Fixed a crash when a mercenary warps back to its master
- Issue introduced in 6c066dc6 (that sure was a while ago!) - Special thanks to Ancyker Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src')
-rw-r--r--src/map/unit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 78a85ba3e..af0c0a948 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -263,7 +263,7 @@ int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
else if (DIFF_TICK(timer->gettick(), mrd->masterteleport_timer) > 3000)
{
mrd->masterteleport_timer = 0;
- unit->warp( bl, mrd->master->bl.id, mrd->master->bl.x, mrd->master->bl.y, CLR_TELEPORT );
+ unit->warp( bl, mrd->master->bl.m, mrd->master->bl.x, mrd->master->bl.y, CLR_TELEPORT );
}
}
else