diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index b04e293e5..8a044f28b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -149,6 +149,7 @@ public abstract class Elemental extends Mob { spend( 1f ); Invisibility.dispel(this); + Char enemy = this.enemy; if (hit( this, enemy, true )) { rangedProc( enemy ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java index 0fa895b34..2efb78067 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java @@ -112,6 +112,7 @@ public abstract class Shaman extends Mob { spend( 1f ); Invisibility.dispel(this); + Char enemy = this.enemy; if (hit( this, enemy, true )) { if (Random.Int( 2 ) == 0) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java index ecf2c01cd..49fd1c7ad 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java @@ -105,6 +105,7 @@ public class Warlock extends Mob implements Callback { spend( TIME_TO_ZAP ); Invisibility.dispel(this); + Char enemy = this.enemy; if (hit( this, enemy, true )) { //TODO would be nice for this to work on ghost/statues too if (enemy == Dungeon.hero && Random.Int( 2 ) == 0) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java index 569cd20e2..b511260d2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java @@ -314,6 +314,7 @@ public abstract class YogFist extends Mob { spend( 1f ); Invisibility.dispel(this); + Char enemy = this.enemy; if (hit( this, enemy, true )) { Buff.affect( enemy, Roots.class, 3f ); @@ -471,6 +472,7 @@ public abstract class YogFist extends Mob { spend( 1f ); Invisibility.dispel(this); + Char enemy = this.enemy; if (hit( this, enemy, true )) { enemy.damage( Random.NormalIntRange(10, 20), new LightBeam() ); @@ -536,6 +538,7 @@ public abstract class YogFist extends Mob { spend( 1f ); Invisibility.dispel(this); + Char enemy = this.enemy; if (hit( this, enemy, true )) { enemy.damage( Random.NormalIntRange(10, 20), new DarkBolt() ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java index 0c36bf23c..ae9632984 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java @@ -331,6 +331,7 @@ public class WandOfWarding extends Wand { //always hits int dmg = Random.NormalIntRange( 2 + wandLevel, 8 + 4*wandLevel ); + Char enemy = this.enemy; enemy.damage( dmg, this ); if (enemy.isAlive()){ Wand.wandProc(enemy, wandLevel, 1);