From 7be250ae9cbfb98f215009479e23eea117505d7d Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 16 May 2025 14:23:56 -0400
Subject: [PATCH] v3.1.0: fixed a crash caused by platform rooms with new
 painter merges

---
 .../levels/rooms/standard/PlatformRoom.java                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java
index 8c89c1e65..5afb9c4b7 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java
@@ -49,7 +49,7 @@ public class PlatformRoom extends StandardRoom {
 	
 	@Override
 	public void merge(Level l, Room other, Rect merge, int mergeTerrain) {
-		if (mergeTerrain != Terrain.CHASM
+		if (mergeTerrain != Terrain.CHASM && connected.containsKey(other)
 				&& (other instanceof PlatformRoom || other instanceof ChasmRoom)){
 			super.merge(l, other, merge, Terrain.CHASM);
 			Painter.set(l, connected.get(other), Terrain.EMPTY_SP);