diff --git a/patches/unapplied/server/Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/Fix-entity-tracker-desync-when-new-players-are-added.patch
similarity index 64%
rename from patches/unapplied/server/Fix-entity-tracker-desync-when-new-players-are-added.patch
rename to patches/server/Fix-entity-tracker-desync-when-new-players-are-added.patch
index dae2a7e4b7..5b2e457776 100644
--- a/patches/unapplied/server/Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/Fix-entity-tracker-desync-when-new-players-are-added.patch
@@ -60,21 +60,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              int j;
  
 @@ -0,0 +0,0 @@ public class ServerEntity {
-                 boolean flag4 = false;
-                 boolean flag5 = false;
+                 long i1 = this.positionCodec.encodeZ(vec3d);
+                 boolean flag6 = k < -32768L || k > 32767L || l < -32768L || l > 32767L || i1 < -32768L || i1 > 32767L;
  
--                if (!(this.entity instanceof net.minecraft.world.entity.decoration.HangingEntity) || this.tickCount > 0 || this.entity instanceof AbstractArrow) { // Paper - Always update position to fix first-tick teleports
-+                if (this.forceStateResync || !(this.entity instanceof net.minecraft.world.entity.decoration.HangingEntity) || this.tickCount > 0 || this.entity instanceof AbstractArrow) { // Paper - Always update position to fix first-tick teleports
-                     long k = this.positionCodec.encodeX(vec3d);
-                     long l = this.positionCodec.encodeY(vec3d);
-                     long i1 = this.positionCodec.encodeZ(vec3d);
-                     boolean flag6 = k < -32768L || k > 32767L || l < -32768L || l > 32767L || i1 < -32768L || i1 > 32767L;
- 
--                    if (!flag6 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.onGround()&& !(io.papermc.paper.configuration.GlobalConfiguration.get().collisions.sendFullPosForHardCollidingEntities && this.entity.hardCollides())) { // Paper - send full pos for hard colliding entities to prevent collision problems due to desync
-+                    if (!this.forceStateResync && !flag6 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.onGround()&& !(io.papermc.paper.configuration.GlobalConfiguration.get().collisions.sendFullPosForHardCollidingEntities && this.entity.hardCollides())) { // Paper - send full pos for hard colliding entities to prevent collision problems due to desync
-                         if ((!flag2 || !flag3) && !(this.entity instanceof AbstractArrow)) {
-                             if (flag2) {
-                                 packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.onGround());
+-                if (!flag6 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.onGround()) {
++                if (!this.forceStateResync && !flag6 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.onGround()) { // Paper - fix desync when a player is added to the tracker
+                     if ((!flag2 || !flag3) && !(this.entity instanceof AbstractArrow)) {
+                         if (flag2) {
+                             packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.onGround());
 @@ -0,0 +0,0 @@ public class ServerEntity {
              }