diff options
| author | shennetsind <ind@henn.et> | 2014-09-21 01:00:19 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-09-21 01:00:19 -0300 |
| commit | 14475dc879bcd2cf1f9816fb9448831a9b33d295 (patch) | |
| tree | 18dac405c6d438a591790ffe56385e3f0ac3eae6 /src/map/battle.c | |
| parent | 09326b385734eb824a4e39b59f332f93a1fb2949 (diff) | |
| download | hercules-14475dc879bcd2cf1f9816fb9448831a9b33d295.tar.gz hercules-14475dc879bcd2cf1f9816fb9448831a9b33d295.tar.bz2 hercules-14475dc879bcd2cf1f9816fb9448831a9b33d295.tar.xz hercules-14475dc879bcd2cf1f9816fb9448831a9b33d295.zip | |
Fixed Bug 8294
Asura can now issue damage regardless of distance (including map-transfer)
Special Thanks to kyeme! <3 videos
http://hercules.ws/board/tracker/issue-8294-no-damage-when-warped-out/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 544d53a1c..c511c5885 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -220,9 +220,9 @@ int battle_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { src = map->id2bl(dat->src_id); //Check to see if you haven't teleported. [Skotlex] - if( src && target->m == src->m + if( src && (target->type != BL_PC || ((TBL_PC*)target)->invincible_timer == INVALID_TIMER) - && check_distance_bl(src, target, dat->distance) + && (dat->skill_id == MO_EXTREMITYFIST || (target->m == src->m && check_distance_bl(src, target, dat->distance)) ) ) { map->freeblock_lock(); status_fix_damage(src, target, dat->damage, dat->delay); |