From 193956af55b94852917fc236a431ae384bf78d84 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 01:25:04 +0200 Subject: Add nullpo_retr for unit_data in unit->walktobl_sub --- src/map/unit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/map/unit.c b/src/map/unit.c index 5d3011aba..64a849384 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -618,9 +618,13 @@ static inline void set_mobstate(struct block_list *bl, int flag) static int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); - struct unit_data *ud = bl?unit->bl2ud(bl):NULL; + if (bl == NULL) + return 1; + struct unit_data *ud = unit->bl2ud(bl); + if (ud == NULL) + return 1; - if (ud && ud->walktimer == INVALID_TIMER && ud->target == data) { + if (ud->walktimer == INVALID_TIMER && ud->target == data) { if (DIFF_TICK(ud->canmove_tick, tick) > 0) //Keep waiting? timer->add(ud->canmove_tick+1, unit->walktobl_sub, id, data); else if (unit->can_move(bl)) { -- cgit v1.2.3-60-g2f50