diff options
| author | meko <mekolat@users.noreply.github.com> | 2015-09-29 12:23:25 -0400 |
|---|---|---|
| committer | meko <mekolat@users.noreply.github.com> | 2015-09-29 12:23:25 -0400 |
| commit | 61d50af431c7ea54bde2da0cc480c75ce531d96d (patch) | |
| tree | 8fbe0f3c49a671804dcfed9bab12ce5cd65d8e9d /src | |
| parent | 029e03e8fb6f66c370bedde08f47d9c5cdb813c9 (diff) | |
| parent | bc2950c3216e9b2fbb40e0c0dde0a6471d332ae4 (diff) | |
| download | tmwa-61d50af431c7ea54bde2da0cc480c75ce531d96d.tar.gz tmwa-61d50af431c7ea54bde2da0cc480c75ce531d96d.tar.bz2 tmwa-61d50af431c7ea54bde2da0cc480c75ce531d96d.tar.xz tmwa-61d50af431c7ea54bde2da0cc480c75ce531d96d.zip | |
Merge pull request #161 from wushin/failover-bug
Stop looking for the next victim on the map for mob deaths.
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/mob.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp index ddfdeb6..7566e03 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -2696,24 +2696,8 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage, if (sd == nullptr) { if (mvp_sd != nullptr) - sd = mvp_sd; - else { - for (io::FD i : iter_fds()) - { - Session *s = get_session(i); - if (!s) - continue; - dumb_ptr<map_session_data> tmp_sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s->session_data.get())); - if (tmp_sd && tmp_sd->state.auth) - { - if (md->bl_m == tmp_sd->bl_m) - { - sd = tmp_sd; - break; - } - } - } + sd = mvp_sd; } } if (sd) |