|
@@ -310,14 +310,15 @@ int unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data)
|
|
|
|
|
|
int unit_delay_walktobl_timer(int tid, unsigned int tick, int id, intptr_t data)
|
|
|
{
|
|
|
- struct block_list *bl = map_id2bl(id);
|
|
|
+ struct block_list *bl = map_id2bl(id), *tbl = map_id2bl(data);
|
|
|
|
|
|
- if (!bl || bl->prev == NULL || !data)
|
|
|
+ if(!bl || bl->prev == NULL || tbl == NULL)
|
|
|
return 0;
|
|
|
-
|
|
|
- struct unit_data* ud = unit_bl2ud(bl);
|
|
|
- unit_walktobl(bl, map_id2bl(data), 0, 0);
|
|
|
- ud->target_to = 0;
|
|
|
+ else {
|
|
|
+ struct unit_data* ud = unit_bl2ud(bl);
|
|
|
+ unit_walktobl(bl, tbl, 0, 0);
|
|
|
+ ud->target_to = 0;
|
|
|
+ }
|
|
|
return 1;
|
|
|
}
|
|
|
|