From 9d5cd04d4bcdb89b852f1deed0c21f1102bfc006 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 27 Nov 2024 21:50:12 +0100
Subject: [PATCH] Always update storage data

---
 .../rewriter/EntityPacketRewriter1_21_2.java              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
index 39ec3bac..7510aad4 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
@@ -478,6 +478,10 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
         final boolean relativeDeltaY = (relativeArguments & 1 << REL_DELTA_Y) != 0;
         final boolean relativeDeltaZ = (relativeArguments & 1 << REL_DELTA_Z) != 0;
 
+        // Update after having used its previous data
+        storage.setPosition(x, y, z);
+        storage.setRotation(yaw, pitch);
+
         // Movement
         if (relativeDeltaX && relativeDeltaY && relativeDeltaZ) {
             if (entityId != null && entityId != tracker(wrapper.user()).clientEntityId()) {
@@ -517,10 +521,6 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
                 "This will result in incorrect movement for the player. ");
             warned = true;
         }
-
-        // Update at the end
-        storage.setPosition(x, y, z);
-        storage.setRotation(yaw, pitch);
     }
 
     private int boatTypeFromEntityType(final EntityType type) {