From 2d51ded57952ee2c77dc079710f10fd1e4a3ebf3 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 31 Mar 2022 15:06:37 -0400
Subject: [PATCH] v1.2.1: fixed a rare null pointer in Splash

---
 .../shatteredpixel/shatteredpixeldungeon/effects/Splash.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java
index ebf01ecd8..201bc59cd 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java
@@ -41,6 +41,7 @@ public class Splash {
 		}
 		
 		Emitter emitter = GameScene.emitter();
+		if (emitter == null) return;
 		emitter.pos( p );
 		
 		FACTORY.color = color;
@@ -56,6 +57,7 @@ public class Splash {
 		}
 		
 		Emitter emitter = GameScene.emitter();
+		if (emitter == null) return;
 		emitter.pos( p );
 		
 		FACTORY.color = color;
@@ -71,6 +73,7 @@ public class Splash {
 		}
 
 		Emitter emitter = GameScene.emitter();
+		if (emitter == null) return;
 		emitter.pos( p );
 
 		FACTORY.color = color;