From 8340ae731151ce3220c2e737ad5e0d889f3382b1 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Mon, 8 Jan 2024 00:15:19 -0600 Subject: [PATCH] Small fix to animations: still running when using render ticks when the game is paused --- src/main/java/noppes/npcs/client/ClientEventHandler.java | 2 +- src/main/java/noppes/npcs/mixin/MixinModelRenderer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java index 0307b5236..06e24ee67 100644 --- a/src/main/java/noppes/npcs/client/ClientEventHandler.java +++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java @@ -108,7 +108,7 @@ public class ClientEventHandler { ClientEventHandler.playerModel = null; } - if (data != null && data.isActive()) { + if (data != null && data.isActive() && !Minecraft.getMinecraft().isGamePaused()) { Animation animation = data.animation; if (data.isActive() && animation.currentFrame().useRenderTicks()) { animation.increaseTime(); diff --git a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java index ff9e21cf1..9df021671 100644 --- a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java +++ b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java @@ -155,7 +155,7 @@ public abstract class MixinModelRenderer { part.prevRotations[2] = part.prevRotations[2] * (1.0F - speed) + (this.rotateAngleZ * speed); } - if (animDataActive || (ClientEventHandler.renderingPlayer.getAge() - animData.finishedTime < 20)) { + if (animDataActive || (partType != EnumAnimationPart.HEAD && ClientEventHandler.renderingPlayer.getAge() - animData.finishedTime < 20)) { this.rotationPointX = originalPart.pivot[0] + part.prevPivots[0]; this.rotationPointY = originalPart.pivot[1] + part.prevPivots[1]; this.rotationPointZ = originalPart.pivot[2] + part.prevPivots[2];