fix reload crash

IAFEnvoy · Jan 19, 2025 · 19c88d3 · 19c88d3
1 parent b07ea81
commit 19c88d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...ain/java/com/iafenvoy/iceandfire/render/model/animator/IceAndFireTabulaModelAnimator.java b/...ain/java/com/iafenvoy/iceandfire/render/model/animator/IceAndFireTabulaModelAnimator.java
@@ -60,6 +60,7 @@ public void rotate(ModelAnimator animator, AdvancedModelBox model, float x, floa
     }
 
     public void moveToPose(TabulaModel<T> model, TabulaModel<T> modelTo) {
+        if (model == null || modelTo == null) return;
         for (AdvancedModelBox cube : model.getCubes().values()) {
             AdvancedModelBox cubeTo = modelTo.getCube(cube.boxName);
             if (!this.isRotationEqual(this.baseModel.getCube(cube.boxName), cubeTo)) {

diff --git a/...ain/java/com/iafenvoy/iceandfire/render/model/animator/SeaSerpentTabulaModelAnimator.java b/...ain/java/com/iafenvoy/iceandfire/render/model/animator/SeaSerpentTabulaModelAnimator.java
@@ -27,6 +27,7 @@ public void setRotationAngles(TabulaModel<EntitySeaSerpent> model, EntitySeaSerp
         if (prevIndex < 0) prevIndex = 3;
         TabulaModel<EntitySeaSerpent> prevPosition = resolve(this.swimPose[prevIndex].getModelId());
         TabulaModel<EntitySeaSerpent> currentPosition = resolve(this.swimPose[currentIndex].getModelId());
+        if (prevPosition == null || currentPosition == null) return;
         float partialTicks = MinecraftClient.getInstance().getTickDelta();
         float delta = ((entity.swimCycle) / 10.0F) % 1.0F + (partialTicks / 10.0F);
         // AdvancedModelBox[] tailParts = {model.getCube("Tail1"), model.getCube("Tail2"), model.getCube("Tail3"), model.getCube("Tail4"), model.getCube("Tail5"), model.getCube("Tail6")};