From f27c548dff3f653c9d963258baf3b1cba49b0dae Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Sat, 24 Feb 2024 16:52:28 -0600 Subject: [PATCH] Fixed head interpolating incorrectly when going into an animation. --- .../java/noppes/npcs/mixin/MixinModelRenderer.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java index 5a3becff4..53fb3f200 100644 --- a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java +++ b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java @@ -232,14 +232,16 @@ public abstract class MixinModelRenderer { part.prevRotations[2] = part.prevRotations[2] * (1.0F - speed) + (this.rotateAngleZ * speed); } - if (animDataActive || (partType != EnumAnimationPart.HEAD - && ClientEventHandler.renderingPlayer.getAge() - animData.finishedTime < 20)) { + if (animDataActive || + 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]; - this.rotateAngleX = part.prevRotations[0]; - this.rotateAngleY = part.prevRotations[1]; - this.rotateAngleZ = part.prevRotations[2]; + if (animDataActive || partType != EnumAnimationPart.HEAD) { + this.rotateAngleX = part.prevRotations[0]; + this.rotateAngleY = part.prevRotations[1]; + this.rotateAngleZ = part.prevRotations[2]; + } } } else { this.rotateAngleZ += part.prevRotations[2];