konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed rare cases of WoL incorrectly taking hero kill credit

Browse Source
This commit is contained in:
Evan Debenham
2023-02-06 14:06:56 -05:00
parent 3e4209d621
commit e677ada33b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java
+6 -7
View File
@@ -82,18 +82,17 @@ public class WandOfLightning extends DamageWand {
continue; continue;
} }
wandProc(ch, chargesPerCast()); wandProc(ch, chargesPerCast());
if (ch == curUser) { if (ch == curUser && ch.isAlive()) {
ch.damage(Math.round(damageRoll() * multipler * 0.5f), this); ch.damage(Math.round(damageRoll() * multipler * 0.5f), this);
if (!curUser.isAlive()) {
Badges.validateDeathFromFriendlyMagic();
Dungeon.fail( getClass() );
GLog.n(Messages.get(this, "ondeath"));
}
} else { } else {
ch.damage(Math.round(damageRoll() * multipler), this); ch.damage(Math.round(damageRoll() * multipler), this);
} }
} }
if (!curUser.isAlive()) {
Badges.validateDeathFromFriendlyMagic();
Dungeon.fail( getClass() );
GLog.n(Messages.get(this, "ondeath"));
}
} }
@Override @Override