diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-07 02:40:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 02:40:56 +0300 |
| commit | 90ec4a40d04100d0c7d1d5e1f80c12742e8883d3 (patch) | |
| tree | a1234320efa4f33b6c6f18f9b197be7aabdd7415 /src/map/battle.c | |
| parent | 336c264a324d708a3b5a72c1c086b74dc76c1b0f (diff) | |
| parent | 872fc8d4f4a8ea60a1d97da4ca724c7b70e1af18 (diff) | |
| download | hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.tar.gz hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.tar.bz2 hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.tar.xz hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.zip | |
Merge pull request #1464 from MishimaHaruna/variousfixes
Build / CI improvements
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index daef8f6a8..67ab8c9b8 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6008,20 +6008,18 @@ int battle_damage_area(struct block_list *bl, va_list ap) { if (bl->type == BL_MOB && BL_UCCAST(BL_MOB, bl)->class_ == MOBID_EMPELIUM) return 0; if( bl != src && battle->check_target(src,bl,BCT_ENEMY) > 0 ) { - struct map_session_data *sd = NULL; nullpo_ret(src); map->freeblock_lock(); - sd = BL_CAST(BL_PC, src); if (src->type == BL_PC) - battle->drain(sd, bl, damage, damage, status_get_race(bl), is_boss(bl)); + battle->drain(BL_UCAST(BL_PC, src), bl, damage, damage, status_get_race(bl), is_boss(bl)); if( amotion ) battle->delay_damage(tick, amotion,src,bl,0,CR_REFLECTSHIELD,0,damage,ATK_DEF,0,true); else status_fix_damage(src,bl,damage,0); clif->damage(bl,bl,amotion,dmotion,damage,1,BDT_ENDURE,0); - if (src->type != BL_PC || !sd->state.autocast) + if (src->type != BL_PC || !BL_UCCAST(BL_PC, src)->state.autocast) skill->additional_effect(src, bl, CR_REFLECTSHIELD, 1, BF_WEAPON|BF_SHORT|BF_NORMAL,ATK_DEF,tick); map->freeblock_unlock(); } |