From 06018e6c9bbdc07d1ffb9e6494cb4a0b06220246 Mon Sep 17 00:00:00 2001
From: Adrien <mail.proton.crisply059@passmail.net>
Date: Thu, 16 Apr 2026 15:53:58 +0200
Subject: [PATCH] guard ResourceLocation.parse() against corrupted NBT in
 furniture reconnect

---
 .../tiedup/remake/network/NetworkEventHandler.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/tiedup/remake/network/NetworkEventHandler.java b/src/main/java/com/tiedup/remake/network/NetworkEventHandler.java
index 6ebc7f3..985e93a 100644
--- a/src/main/java/com/tiedup/remake/network/NetworkEventHandler.java
+++ b/src/main/java/com/tiedup/remake/network/NetworkEventHandler.java
@@ -286,10 +286,18 @@ public class NetworkEventHandler {
             return;
         }
 
-        // Resolve the dimension
+        // Resolve the dimension (guard against corrupted NBT)
+        ResourceLocation dimLoc;
+        try {
+            dimLoc = ResourceLocation.parse(dimStr);
+        } catch (net.minecraft.ResourceLocationException e) {
+            TiedUpMod.LOGGER.warn("Invalid dimension in furniture reconnect NBT: '{}', clearing", dimStr);
+            persistentData.remove("tiedup_locked_furniture");
+            return;
+        }
         ResourceKey<Level> dimKey = ResourceKey.create(
             net.minecraft.core.registries.Registries.DIMENSION,
-            ResourceLocation.parse(dimStr)
+            dimLoc
         );
 
         var server = player.getServer();