diff options
| author | Wushin <pasekei@gmail.com> | 2015-09-20 20:11:20 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-09-20 20:11:20 -0500 |
| commit | 5dac6c5ff0f1e2883ce923dfe2f70b638c2a4118 (patch) | |
| tree | 39eb7c77e6780cb106689231c12b4938ffaf1d00 | |
| parent | 265d24a84c2db76ab0c90ea6589b983bbbf5e17f (diff) | |
| parent | 611030c37917edffe67ea6df114fa65b1b1d6f77 (diff) | |
| download | tmwa-5dac6c5ff0f1e2883ce923dfe2f70b638c2a4118.tar.gz tmwa-5dac6c5ff0f1e2883ce923dfe2f70b638c2a4118.tar.bz2 tmwa-5dac6c5ff0f1e2883ce923dfe2f70b638c2a4118.tar.xz tmwa-5dac6c5ff0f1e2883ce923dfe2f70b638c2a4118.zip | |
Merge pull request #150 from wushin/mob-freeze-bug
Add missing checks
| -rw-r--r-- | src/map/mob.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp index d6bd80b..d037972 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -1377,7 +1377,7 @@ int mob_target(dumb_ptr<mob_data> md, dumb_ptr<block_list> bl, int dist) { sd = bl->is_player(); nullpo_retz(sd); - if (sd->invincible_timer || pc_isinvisible(sd)) + if (pc_isdead(sd) || sd->invincible_timer || pc_isinvisible(sd)) return 0; if (!bool(mode & MobMode::BOSS) && race != Race::_insect && race != Race::_demon && sd->state.gangsterparadise) @@ -1803,7 +1803,7 @@ void mob_ai_sub_hard(dumb_ptr<block_list> bl, tick_t tick) dumb_ptr<map_session_data> asd = map_id2sd(md->attacked_id); if (asd) { - if (!asd->invincible_timer && !pc_isinvisible(asd)) + if (!pc_isdead(asd) && !asd->invincible_timer && !pc_isinvisible(asd)) { map_foreachinarea(std::bind(mob_ai_sub_hard_linksearch, ph::_1, md, asd), md->bl_m, @@ -1826,7 +1826,7 @@ void mob_ai_sub_hard(dumb_ptr<block_list> bl, tick_t tick) if (abl->bl_type == BL::PC) asd = abl->is_player(); if (asd == nullptr || md->bl_m != abl->bl_m || abl->bl_prev == nullptr - || asd->invincible_timer || pc_isinvisible(asd) + || asd->invincible_timer || pc_isinvisible(asd) || pc_isdead(asd) || (dist = distance(md->bl_x, md->bl_y, abl->bl_x, abl->bl_y)) >= 32 || battle_check_target(bl, abl, BCT_ENEMY) == 0) |