diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java index 06022d4f6..24bd75ae1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java @@ -80,8 +80,10 @@ public class SpellSprite extends Image { public void update() { super.update(); - x = target.sprite.center().x - SIZE / 2; - y = target.sprite.y - SIZE; + if (target.sprite != null) { + x = target.sprite.center().x - SIZE / 2; + y = target.sprite.y - SIZE; + } switch (phase) { case FADE_IN: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java index 207fc452d..72aef6bbc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java @@ -41,7 +41,7 @@ public class MageArmor extends ClassArmor { @Override public void doSpecial() { - for (Mob mob : Dungeon.level.mobs) { + for (Mob mob : Dungeon.level.mobs.toArray(new Mob[0])) { if (Dungeon.level.heroFOV[mob.pos]) { Buff.affect( mob, Burning.class ).reignite( mob ); Buff.prolong( mob, Roots.class, 3 );