summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 05175a991..dc57dfd38 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -156,6 +156,9 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data)
map_moveblock(bl, x, y, tick);
ud->walk_count++; //walked cell counter, to be used for walk-triggered skills. [Skotlex]
+ if (bl->x != x || bl->y != y || ud->walktimer != -1)
+ return 0; //map_moveblock has altered the object beyond what we expected (moved/warped it)
+
ud->walktimer = 1;
map_foreachinmovearea(clif_insight, bl, AREA_SIZE,
-dx, -dy, sd?BL_ALL:BL_PC, bl);