diff --git a/Spigot-Server-Patches/Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/Entity-Tracking-Improvements.patch
index 6c52308648..3d08a9e952 100644
--- a/Spigot-Server-Patches/Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/Entity-Tracking-Improvements.patch
@@ -19,7 +19,7 @@ index b6356966a..583cee415 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 638b54c1e..28a0ea034 100644
+index b3aa57d19..2b8501143 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -0,0 +0,0 @@ public class EntityTrackerEntry {
diff --git a/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch
index d406aa687b..d2e544875d 100644
--- a/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Send absolute position the first time an entity is seen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index dd6c84b4a..a12a42c32 100644
+index dd6c84b4a..de0cf6b73 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -0,0 +0,0 @@ public class EntityTrackerEntry {
@@ -46,9 +46,10 @@ index dd6c84b4a..a12a42c32 100644
                          if ((!flag1 || !flag2) && !(this.tracker instanceof EntityArrow)) {
                              if (flag1) {
 @@ -0,0 +0,0 @@ public class EntityTrackerEntry {
+                 }
  
                  if (packet1 != null) {
-                     this.broadcast((Packet) packet1);
+-                    this.broadcast((Packet) packet1);
 +                    // Paper start - ensure fresh viewers get an absolute position on their first update,
 +                    // since we can't be certain what position they received in the spawn packet.
 +                    if (packet1 instanceof PacketPlayOutEntityTeleport) {