summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-06-13 20:22:53 -0700
committermalufett <malufett.eat.my.binaries@gmail.com>2013-06-13 20:22:53 -0700
commitf9005c40ca41167aea6cdc6b7ed4a6f8ec543a00 (patch)
tree66452a679b4d9ff1b0ff539c03b6fe93a001ebe0 /src/map
parent8efb1316771b03b0c778010321e30e65edb4d689 (diff)
downloadhercules-f9005c40ca41167aea6cdc6b7ed4a6f8ec543a00.tar.gz
hercules-f9005c40ca41167aea6cdc6b7ed4a6f8ec543a00.tar.bz2
hercules-f9005c40ca41167aea6cdc6b7ed4a6f8ec543a00.tar.xz
hercules-f9005c40ca41167aea6cdc6b7ed4a6f8ec543a00.zip
Fixed Bug#7359
Map Crashed on battle_calc_return_damage.
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 9fa4224f5..91733c945 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5134,10 +5134,10 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
}
}
- }
- if( sc->data[SC_SHIELDSPELL_DEF] && sc->data[SC_SHIELDSPELL_DEF]->val1 == 2 && !is_boss(src) ){
- NORMALIZE_RDAMAGE(damage * sc->data[SC_SHIELDSPELL_DEF]->val2 / 100);
- rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+ if( sc->data[SC_SHIELDSPELL_DEF] && sc->data[SC_SHIELDSPELL_DEF]->val1 == 2 && !is_boss(src) ){
+ NORMALIZE_RDAMAGE(damage * sc->data[SC_SHIELDSPELL_DEF]->val2 / 100);
+ rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+ }
}
} else {
if (sd && sd->bonus.long_weapon_damage_return){