diff options
| author | shennetsind <ind@henn.et> | 2015-02-13 11:21:44 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2015-02-13 11:21:44 -0200 |
| commit | 868a2b4ab50431e0d0a48927b40156d5a83d9d46 (patch) | |
| tree | 76d555000b29adc5276b377390bfd4dbf7cf8031 /src/map/battle.c | |
| parent | 00ca143b9f76620b7f68559bbdb4458e6936b639 (diff) | |
| download | hercules-868a2b4ab50431e0d0a48927b40156d5a83d9d46.tar.gz hercules-868a2b4ab50431e0d0a48927b40156d5a83d9d46.tar.bz2 hercules-868a2b4ab50431e0d0a48927b40156d5a83d9d46.tar.xz hercules-868a2b4ab50431e0d0a48927b40156d5a83d9d46.zip | |
Fixed alchemist marine sphere causing double deletion on renewal
Special Thanks to Haruna, Michieru.
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 37e13a83f..7b979a51f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -263,7 +263,7 @@ int battle_delay_damage(int64 tick, int amotion, struct block_list *src, struct if (d_tbl && sc && check_distance_bl(target, d_tbl, sc->data[SC_DEVOTION]->val3) && damage > 0 && skill_id != PA_PRESSURE && skill_id != CR_REFLECTSHIELD) damage = 0; - + if ( !battle_config.delay_battle_damage || amotion <= 1 ) { map->freeblock_lock(); status_fix_damage(src, target, damage, ddelay); // We have to separate here between reflect damage and others [icescope] @@ -3160,9 +3160,9 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam } if( bl->type == BL_MOB && !status->isdead(bl) && src != bl) { - if (damage > 0 ) + if ( damage > 0 ) mob->skill_event((TBL_MOB*)bl,src,timer->gettick(),flag); - if (skill_id) + if (skill_id) mob->skill_event((TBL_MOB*)bl,src,timer->gettick(),MSC_SKILLUSED|(skill_id<<16)); } if( sd ) { |