summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-04-16 00:20:56 -0300
committershennetsind <ind@henn.et>2013-04-16 00:20:56 -0300
commitf3e20da4be387c0e49da58a8be676c9878818ebb (patch)
tree6fcb047ca4d0e5cc39638d205e5260561a17d5b7 /src/map/skill.c
parent1e21ff7d621ca19f341318c67756d7b39baa7d7b (diff)
downloadhercules-f3e20da4be387c0e49da58a8be676c9878818ebb.tar.gz
hercules-f3e20da4be387c0e49da58a8be676c9878818ebb.tar.bz2
hercules-f3e20da4be387c0e49da58a8be676c9878818ebb.tar.xz
hercules-f3e20da4be387c0e49da58a8be676c9878818ebb.zip
Fixed Bug #7060
When using official magical reflection, the damage is no longer reduceable by mdef items or cards (elemental armors work), assumption doesnt reduce either when used in pre-re mode and energy coat is capable of reducing the damage. http://hercules.ws/board/tracker/issue-7060-bmagicdamagereturn/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 14bb7a4cb..f4bee2934 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2233,8 +2233,11 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
* Official Magic Reflection Behavior : damage reflected depends on gears caster wears, not target
**/
#if MAGIC_REFLECTION_TYPE
- if( dmg.dmg_lv != ATK_MISS )//Wiz SL cancelled and consumed fragment
+ if( dmg.dmg_lv != ATK_MISS ){ //Wiz SL cancelled and consumed fragment
+ battle->isMagicReflect = true;
dmg = battle->calc_attack(BF_MAGIC,bl,bl,skill_id,skill_lv,flag&0xFFF);
+ battle->isMagicReflect = false;
+ }
#endif
}
if(sc && sc->data[SC_MAGICROD] && src == dsrc) {