From 6ebb77a1b748e8b1533a564450e7a529ae223d3f Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 4 Jul 2018 12:43:17 -0400 Subject: [PATCH] v0.7.0: fixed mirror image crashes with mage's staff --- .../shatteredpixeldungeon/items/weapon/melee/MagesStaff.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index 19ddbfbb3..308d7ee7f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -130,7 +130,8 @@ public class MagesStaff extends MeleeWeapon { @Override public int proc(Char attacker, Char defender, int damage) { - if (wand != null && Dungeon.hero.subClass == HeroSubClass.BATTLEMAGE) { + if (wand != null && + attacker instanceof Hero && ((Hero)attacker).subClass == HeroSubClass.BATTLEMAGE) { if (wand.curCharges < wand.maxCharges) wand.partialCharge += 0.33f; ScrollOfRecharging.charge((Hero)attacker); wand.onHit(this, attacker, defender, damage);