Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected White Imprison and reflected damage (#3685)

Browse Source 
* Fixes #3634.
* Targets in White Imprison using reflect equipment or skills should not send damage back to those outside.
Thanks to @admkakaroto!
This commit is contained in:
Aleos
2018-11-29 18:13:06 -05:00
committed by GitHub
parent a0d1087628
commit e02e85b65e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/battle.cpp
View File

@@ -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;