From 9599d7a420af912ffa15aa30d398758e9b6b938f Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 17 Oct 2022 12:32:59 -0400 Subject: [PATCH] v1.4.2: added a few safety checks --- .../shatteredpixeldungeon/effects/SpellSprite.java | 6 +++--- .../shatteredpixeldungeon/ui/DangerIndicator.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) 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 ee200b5de..c207b5a7b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java @@ -83,13 +83,13 @@ public class SpellSprite extends Image { @Override public void update() { super.update(); - - if (target.sprite != null) { + + if (target != null && target.sprite != null) { x = target.sprite.center().x - SIZE / 2; y = target.sprite.y - SIZE; } - if (phase == null){ + if (phase == null || target == null){ return; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java index b3c73b3ed..c36525077 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java @@ -116,7 +116,9 @@ public class DangerIndicator extends Tag { QuickSlotButton.target(target); if (Dungeon.hero.canAttack(target)) AttackIndicator.target(target); - if (Dungeon.hero.curAction == null) Camera.main.panTo(target.sprite.center(), 5f); + if (Dungeon.hero.curAction == null && target.sprite != null) { + Camera.main.panTo(target.sprite.center(), 5f); + } } }