From a78a4147db3151863a41d21381cd71e23572c8eb Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Mon, 6 Jul 2020 15:18:10 +0100 Subject: [PATCH] Fix summon animation being stuck on frame 0 for permanent summoned creatures --- .../client/renderer/entity/layers/LayerSummonAnimation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerSummonAnimation.java b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerSummonAnimation.java index f17b0a30..c39a3a46 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerSummonAnimation.java +++ b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerSummonAnimation.java @@ -39,7 +39,7 @@ public class LayerSummonAnimation extends LayerTiled @Override public boolean shouldRender(T entity, float partialTicks){ return entity instanceof ISummonedCreature && ((ISummonedCreature)entity).hasAnimation() - && getFrameNumber(entity) < ANIMATION_TICKS; + && ((ISummonedCreature)entity).getLifetime() > 0 && getFrameNumber(entity) < ANIMATION_TICKS; } @Override @@ -81,7 +81,7 @@ public class LayerSummonAnimation extends LayerTiled private static boolean shouldHideMainModel(EntityLivingBase entity){ return entity instanceof ISummonedCreature && ((ISummonedCreature)entity).hasAnimation() - && (entity.ticksExisted < HIDE_MODEL_TICKS + && ((ISummonedCreature)entity).getLifetime() > 0 && (entity.ticksExisted < HIDE_MODEL_TICKS || ((ISummonedCreature)entity).getLifetime() - entity.ticksExisted < HIDE_MODEL_TICKS); }