From 3f82c7459a255fa74a075cb41a41d45d04cef1f9 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 5 May 2023 09:46:49 -0400 Subject: [PATCH] Fix crash with Charm --- .../org/embeddedt/modernfix/entity/EntityRendererMap.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java b/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java index df280415..1f25f533 100644 --- a/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java +++ b/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java @@ -75,7 +75,9 @@ public class EntityRendererMap implements Map, EntityRenderer> if(renderer == null) throw new AssertionError("Returned entity renderer should never be null"); return renderer; - } catch(ExecutionException e) { + } catch (IllegalStateException e) { + return null; /* emulate value not being present if recursive load occurs */ + } catch (ExecutionException e) { throw new RuntimeException(e); } }