Skip to content

Commit

Permalink
Fixed a crash when a mercenary warps back to its master
Browse files Browse the repository at this point in the history
- Issue introduced in 6c066dc (that sure was a while ago!)
- Special thanks to Ancyker

Signed-off-by: Haru <haru@dotalux.com>
  • Loading branch information
MishimaHaruna committed Aug 14, 2014
1 parent 2b8d501 commit 7f4d6fc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/map/unit.c
Expand Up @@ -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
Expand Down

0 comments on commit 7f4d6fc

Please sign in to comment.