From e02e85b65e196874433c15496fdb9a2f856ea748 Mon Sep 17 00:00:00 2001 From: Aleos Date: Thu, 29 Nov 2018 18:13:06 -0500 Subject: [PATCH] Corrected White Imprison and reflected damage (#3685) * Fixes #3634. * Targets in White Imprison using reflect equipment or skills should not send damage back to those outside. Thanks to @admkakaroto! --- src/map/battle.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/map/battle.cpp b/src/map/battle.cpp index 6d33980536..742430664f 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -6850,6 +6850,9 @@ int64 battle_calc_return_damage(struct block_list* bl, struct block_list *src, i sc = status_get_sc(bl); ssc = status_get_sc(src); + if (sc->data[SC_WHITEIMPRISON]) + return 0; // White Imprison does not reflect any damage + if (flag & BF_SHORT) {//Bounces back part of the damage. if ( (skill_get_inf2(skill_id)&INF2_TRAP || !status_reflect) && sd && sd->bonus.short_weapon_damage_return ) { rdamage += damage * sd->bonus.short_weapon_damage_return / 100;