From 3ee49b98e4fd68de7b1f16b7951262f914a98384 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 15 Dec 2020 13:09:00 -0500 Subject: [PATCH] v0.9.1a: added a couple safety checks --- .../shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java | 2 +- .../com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 1ed3fd799..1ef97127a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -1048,7 +1048,7 @@ public class Hero extends Char { public void rest( boolean fullRest ) { spendAndNext( TIME_TO_REST ); - if (!fullRest) { + if (!fullRest && sprite != null) { sprite.showStatus( CharSprite.DEFAULT, Messages.get(this, "wait") ); } resting = fullRest; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java index 8674042af..9c5f6e437 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java @@ -269,7 +269,7 @@ public class Toolbar extends Component { if (lastEnabled != (Dungeon.hero.ready && Dungeon.hero.isAlive())) { lastEnabled = (Dungeon.hero.ready && Dungeon.hero.isAlive()); - for (Gizmo tool : members) { + for (Gizmo tool : members.toArray(new Gizmo[0])) { if (tool instanceof Tool) { ((Tool)tool).enable( lastEnabled ); }