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

Corrected reflected damage applying twice (#3115)

Browse Source 
* Fixes #2920.
* Follow up to 333f0dd.
* Corrected trap behavior reflect and slightly reverted previous commit.
Thanks to @Badarosk0.
This commit is contained in:
Aleos 2018-05-17 23:10:27 -04:00 committed by GitHub
parent 12c01b0b40
commit c4eae4b361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/battle.cpp
View File

@ -6843,7 +6843,7 @@ int64 battle_calc_return_damage(struct block_list* bl, struct block_list *src, i
ssc = status_get_sc(src);
if (flag & BF_SHORT) {//Bounces back part of the damage.
if ( sd && sd->bonus.short_weapon_damage_return ) {
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;
rdamage = i64max(rdamage,1);
} else if( status_reflect && sc && sc->count ) {