From 51aa07e01e7c18ddf273723ec9aae08b3e979eed Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 7 Dec 2021 15:06:58 +0100 Subject: [PATCH] Revert "Fix spectator hand jumping when rotating across 0 yaw boundary" (fixes #601) This reverts commit 411eaa4ca8bb5f4975d90e94ed79fc0573fd5e81. The given solution does not work in old versions because those did not use `getYaw` for hand rendering. Even worse, their headYaw does wrap around and it does it in a different way than their yaw value, giving a worse result than without this commit. --- .../com/replaymod/replay/camera/CameraEntity.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java index 09716e7e..079f9740 100644 --- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java +++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java @@ -22,7 +22,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.decoration.ItemFrameEntity; import net.minecraft.entity.player.PlayerEntity; @@ -249,14 +248,6 @@ public class CameraEntity this.lastRenderX = to.lastRenderX; this.lastRenderY = to.lastRenderY + yOffset; this.lastRenderZ = to.lastRenderZ; - if (to instanceof LivingEntity) { - LivingEntity toLiving = (LivingEntity) to; - this.headYaw = toLiving.headYaw; - this.prevHeadYaw = toLiving.prevHeadYaw; - } else { - this.headYaw = to.yaw; - this.prevHeadYaw = to.prevYaw; - } updateBoundingBox(); } @@ -265,7 +256,7 @@ public class CameraEntity public float getYaw(float tickDelta) { Entity view = this.client.getCameraEntity(); if (view != null && view != this) { - return this.prevHeadYaw + (this.headYaw - this.prevHeadYaw) * tickDelta; + return this.prevYaw + (this.yaw - this.prevYaw) * tickDelta; } return super.getYaw(tickDelta); } @@ -712,7 +703,7 @@ public class CameraEntity this.lastRenderYaw = this.renderYaw; this.lastRenderPitch = this.renderPitch; this.renderPitch = this.renderPitch + (this.pitch - this.renderPitch) * 0.5f; - this.renderYaw = this.renderYaw + (this.headYaw - this.renderYaw) * 0.5f; + this.renderYaw = this.renderYaw + (this.yaw - this.renderYaw) * 0.5f; } public boolean canSpectate(Entity e) {