From 9d584d13d20b03093b4f61ab1dda94411a7b108a Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sat, 8 Jun 2024 16:41:45 -0400
Subject: [PATCH] Make blockstate model loader more resilient

---
 .../perf/dynamic_resources/BlockStateModelLoaderMixin.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
index b681d0c1..aa773429 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
@@ -56,8 +56,11 @@ public abstract class BlockStateModelLoaderMixin implements IBlockStateModelLoad
                 ModernFix.LOGGER.error("Exception filtering states on {}", location, e);
                 filteredStates = null;
             }
-            this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());
-            filteredStates = null;
+            try {
+                this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());
+            } finally {
+                filteredStates = null;
+            }
         }
     }