diff --git a/Spigot-Server-Patches/Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/Don-t-change-the-Entity-Random-seed-for-squids.patch
index ed01673634..b4d3472401 100644
--- a/Spigot-Server-Patches/Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -5,16 +5,16 @@ Subject: [PATCH] Don't change the Entity Random seed for squids
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 58a902831..2d8cfb012 100644
+index 70b251210..0114d585b 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -0,0 +0,0 @@ public class EntitySquid extends EntityWaterAnimal {
      public EntitySquid(World world) {
-         super(world);
+         super(EntityTypes.SQUID, world);
          this.setSize(0.8F, 0.8F);
 -        this.random.setSeed((long) (1 + this.getId()));
 +        //this.random.setSeed((long) (1 + this.getId())); // Paper
-         this.bB = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
+         this.bI = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
      }
  
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index 466f89142d..92be296bd7 100644
--- a/Spigot-Server-Patches/Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -12,7 +12,7 @@ keep it vanilla in behavior
 a player may teleport away, and trigger instant despawn
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 89e878365..d6a1933ad 100644
+index 9dc86e90d..c03eaf1e4 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/Re-add-vanilla-entity-warnings-for-duplicates.patch
index b1b67163b2..18e0458eec 100644
--- a/Spigot-Server-Patches/Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -8,24 +8,24 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9fe5c4406..dd78a87b2 100644
+index d6d3ffa6f..2c5004e61 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
      private boolean j(Entity entity) {
          if (entity.dead) {
--            // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.a(entity)); // CraftBukkit
-+            WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.a(entity)); // CraftBukkit // Paper
+-            // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.P())); // CraftBukkit
++            WorldServer.a.warn("Tried to add entity {} but it was marked as removed already: " + entity); // CraftBukkit // Paper
              return false;
          } else {
              UUID uuid = entity.getUniqueID();
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-                     this.f.remove(entity1);
+                     this.g.remove(entity1);
                  } else {
                      if (!(entity instanceof EntityHuman)) {
--                        // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.a(entity1), uuid.toString()); // CraftBukkit
-+                        WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.a(entity1), uuid.toString()); // CraftBukkit // Paper
+-                        // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit
++                        WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit // Paper
 +                        WorldServer.a.error("Deleting duplicate entity {}", entity); // Paper
                          return false;
                      }
diff --git a/Spigot-Server-Patches/add-uuid-to-Entity.toString.patch b/Spigot-Server-Patches/add-uuid-to-Entity.toString.patch
index 386b4db556..67c0f76b66 100644
--- a/Spigot-Server-Patches/add-uuid-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/add-uuid-to-Entity.toString.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] add uuid to Entity.toString()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d03e7c24f..fe1ccba8d 100644
+index ea42800ae..93c34a260 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
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
--        return String.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getName(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)});
-+        return String.format("%s[\'%s\'/%d, uuid=\'%s\', l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getName(), Integer.valueOf(this.id), this.uniqueID.toString(), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)}); // Paper - add UUID
+-        return String.format(Locale.ROOT, "%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)});
++        return String.format(Locale.ROOT, "%s[\'%s\'/%d, uuid=\'%s\', l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.uniqueID.toString(), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)}); // Paper - add uuid
      }
  
      public boolean isInvulnerable(DamageSource damagesource) {