Catch invalid loot table resource location in saved houses

(Where are these coming from? not sure... house NBT does contain valid resource locations now)
TeamPneumatic · Oct 27, 2024 · ddcd138 · ddcd138
1 parent bd13a8f
commit ddcd138
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.../java/me/desht/pneumaticcraft/common/block/entity/utility/ReinforcedChestBlockEntity.java b/.../java/me/desht/pneumaticcraft/common/block/entity/utility/ReinforcedChestBlockEntity.java
@@ -25,6 +25,7 @@
 import me.desht.pneumaticcraft.common.registry.ModBlockEntityTypes;
 import me.desht.pneumaticcraft.common.registry.ModDataComponents;
 import me.desht.pneumaticcraft.common.util.ContainerWrappedItemHandler;
+import net.minecraft.ResourceLocationException;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.HolderLookup;
@@ -97,8 +98,14 @@ public void loadAdditional(CompoundTag tag, HolderLookup.Provider provider) {
         super.loadAdditional(tag, provider);
 
         if (tag.contains(NBT_LOOT_TABLE, Tag.TAG_STRING)) {
-            lootTable = ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.parse(tag.getString(NBT_LOOT_TABLE)));
-            lootTableSeed = tag.getLong(NBT_LOOT_TABLE_SEED);
+            try {
+                lootTable = ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.parse(tag.getString(NBT_LOOT_TABLE)));
+                lootTableSeed = tag.getLong(NBT_LOOT_TABLE_SEED);
+                setChanged();
+            } catch (ResourceLocationException e) {
+                lootTable = null;
+                lootTableSeed = 0L;
+            }
         } else {
             inventory.deserializeNBT(provider, tag.getCompound(NBT_ITEMS));
         }

diff --git a/src/main/resources/data/pneumaticcraft/structure/village/mechanic_house_plains.nbt b/src/main/resources/data/pneumaticcraft/structure/village/mechanic_house_plains.nbt