diff --git a/Spigot-Server-Patches/MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/MC-111480-Start-Entity-ID-s-at-1.patch
index 421c2213cc..714589449e 100644
--- a/Spigot-Server-Patches/MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/MC-111480-Start-Entity-ID-s-at-1.patch
@@ -7,16 +7,16 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fce677f9f6..9b5f7fcf72 100644
+index 91408ce597..67df79e311 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
-     private static final List<ItemStack> b = Collections.emptyList();
-     private static final AxisAlignedBB c = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
-     private static double f = 1.0D;
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+     private static final List<ItemStack> a = Collections.emptyList();
+     private static final AxisAlignedBB b = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
+     private static double c = 1.0D;
 -    private static int entityCount;
 +    private static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1
+     private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
      private int id;
-     public boolean i; public boolean blocksEntitySpawning() { return i; } // Paper - OBFHELPER
-     public final List<Entity> passengers;
+     public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
 --
\ No newline at end of file