From 7f4d6fc1cb21da16e30eb5a5848f550d7d41d3e3 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 14 Aug 2014 03:02:03 +0200 Subject: 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 --- src/map/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-60-g2f50