From bc4db20ca7bad3e01862a81a6e338ac821d8cf11 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 26 May 2021 20:34:48 -0400
Subject: [PATCH] v0.9.3: added a couple safety checks to fix some crashes

---
 .../actors/hero/abilities/mage/WildMagic.java                 | 4 +++-
 .../shatteredpixeldungeon/levels/CavesBossLevel.java          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WildMagic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WildMagic.java
index 73ad0d02e..6f719aed6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WildMagic.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WildMagic.java
@@ -127,7 +127,9 @@ public class WildMagic extends ArmorAbility {
 				if (!wands.isEmpty()){
 					zapWand(wands, hero, target);
 				} else {
-					hero.buff(WildMagicTracker.class).detach();
+					if (hero.buff(WildMagicTracker.class) != null){
+						hero.buff(WildMagicTracker.class).detach();
+					}
 					Item.updateQuickslot();
 					Invisibility.dispel();
 					hero.spendAndNext(Actor.TICK);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
index 97aa01434..80593ed33 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
@@ -298,7 +298,7 @@ public class CavesBossLevel extends Level {
 		}
 		GameScene.updateMap();
 
-		customArenaVisuals.updateState();
+		if (customArenaVisuals != null) customArenaVisuals.updateState();
 
 		Dungeon.observe();