diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 9ceb3d613..515b56ff0 100644
--- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 468a5e13fa789a116daae49b6ab304e5dfa6ee85..3154b1cb18b1cf97705ccd2e52bd87bd6cf5d8cf 100644
+index 24c858182f25496cc7254f7cf9e996b3bea1f9ec..45e9f585c3e522ecf94a6bc42cdc190e1a191a5c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -591,4 +591,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -605,4 +605,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+      * @return Whether the entity is invisible
       */
-     @NotNull
-     public EntityCategory getCategory();
+     public boolean isInvisible();
 +
 +    // Paper start
 +    /**
diff --git a/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch
index bf68165a2..cec33b7a7 100644
--- a/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a2bdecc8b27652460064126f8e5bb8d038f5d11a..1d4ddb01c3d8d4619276c6b8ebb2c7f290df7d8b 100644
+index 33fffda7c8b05cde3c95623937e7eb6c8b628ec6..879dec59f202ee95043bd7317a672cd59ab3bbbe 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -614,5 +614,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -628,5 +628,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);
diff --git a/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch
index 0727a365e..342ef584d 100644
--- a/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 1d4ddb01c3d8d4619276c6b8ebb2c7f290df7d8b..e0f77cf3a3aa8a741f0ee5c077ff56e80605be76 100644
+index 879dec59f202ee95043bd7317a672cd59ab3bbbe..8b89c0701dd557bcab0c05c1593354ee704b9fe4 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -12,6 +12,7 @@ import org.bukkit.attribute.Attributable;
@@ -17,7 +17,7 @@ index 1d4ddb01c3d8d4619276c6b8ebb2c7f290df7d8b..e0f77cf3a3aa8a741f0ee5c077ff56e8
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -628,5 +629,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -642,5 +643,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);
diff --git a/Spigot-API-Patches/0189-Entity-Jump-API.patch b/Spigot-API-Patches/0189-Entity-Jump-API.patch
index 2a36efb4a..084181051 100644
--- a/Spigot-API-Patches/0189-Entity-Jump-API.patch
+++ b/Spigot-API-Patches/0189-Entity-Jump-API.patch
@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 0624099fcd28c7f108131cb0f58d323818379838..d225a59f149cdc770ee3243f9604291c28f5a2ed 100644
+index 561db9d594633e3909fd6d69dad1dc2976928d58..a2f5639904881d9bef7d1550dbed810e4b17c8de 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -771,5 +771,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -785,5 +785,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
       */
      boolean isHandRaised();
diff --git a/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
index 82138f34c..6550b233c 100644
--- a/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index d225a59f149cdc770ee3243f9604291c28f5a2ed..5adf7501009c8570395c42b09662bbfff7d5fc14 100644
+index a2f5639904881d9bef7d1550dbed810e4b17c8de..9bf525b795ff1d88d2596b1f2bc787ce0df047bb 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -791,5 +791,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -805,5 +805,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param jumping entity jump state
       */
      void setJumping(boolean jumping);
diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
index f777ae259..000def4d7 100644
--- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
+++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
@@ -19,7 +19,7 @@ index b8868b86338ce0e89bc74eccccf714b910d7a4fe..9cb2f3b31921870ddba044840e99eb04
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d17f46801bc3df42a81e8738d53afb5249f30e53..d6ee588d8752a9c3561f1cc61c9dccce16f07207 100644
+index cf9b2c6675e6d875aea2eb66a3d91e86712a1b4d..8cd7c8d5d1a20239ffb3b064f8bd0b7a45cfc63f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -51,7 +51,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -31,7 +31,7 @@ index d17f46801bc3df42a81e8738d53afb5249f30e53..d6ee588d8752a9c3561f1cc61c9dccce
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -1668,12 +1668,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1677,12 +1677,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index 5ef32571c..2473f1000 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -80,10 +80,10 @@ index 3b3e94cff2c6def318864bb5b7baefcf9de2cae7..6bd9457ad5c9fb1c0f12ff345b531be0
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d6ee588d8752a9c3561f1cc61c9dccce16f07207..aaeb862fd93110bc19e0c2e212f67a19d5462dbb 100644
+index 8cd7c8d5d1a20239ffb3b064f8bd0b7a45cfc63f..cd7866f2251f68f24801eacc55800907f184537f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -175,7 +175,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -176,7 +176,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isChunkLoaded() {
@@ -92,7 +92,7 @@ index d6ee588d8752a9c3561f1cc61c9dccce16f07207..aaeb862fd93110bc19e0c2e212f67a19
      }
      // CraftBukkit end
  
-@@ -1669,6 +1669,23 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1678,6 +1678,23 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 52d62d4b3..2e6d5367a 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1004,7 +1004,7 @@ index 468d0cce2208bc21ec3d62590ac6e050a2037518..b5d1dbf889138699c877f13382557ce3
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index aaeb862fd93110bc19e0c2e212f67a19d5462dbb..0f26aacfec892709052b7c2684b553ffe2e16ff6 100644
+index cd7866f2251f68f24801eacc55800907f184537f..74277d79a845fb0a44298f42d626148616cb5a1d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -31,7 +31,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@@ -1015,15 +1015,15 @@ index aaeb862fd93110bc19e0c2e212f67a19d5462dbb..0f26aacfec892709052b7c2684b553ff
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -162,7 +161,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-     public boolean valid;
+@@ -163,7 +162,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
+     public boolean persistentInvisibility = false;
 -    public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -531,7 +529,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -532,7 +530,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -1031,7 +1031,7 @@ index aaeb862fd93110bc19e0c2e212f67a19d5462dbb..0f26aacfec892709052b7c2684b553ff
          if (this.noclip) {
              this.a(this.getBoundingBox().c(vec3d));
              this.recalcPosition();
-@@ -667,7 +664,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -668,7 +665,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.getMethodProfiler().exit();
          }
diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
index 017e3c197..72d67f1e5 100644
--- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
@@ -31,10 +31,10 @@ index 2e869004c8c6b8bfbb002fb4eda04519d50390c8..22eb89df768819f0a18f91b806b56ace
          this.b.setJumping(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0f26aacfec892709052b7c2684b553ffe2e16ff6..bf3173881a0884d105bca724f3c0b1323c355170 100644
+index 74277d79a845fb0a44298f42d626148616cb5a1d..f44048171d70f183f0bbdfb835211fba6da73cb4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1019,6 +1019,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1020,6 +1020,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain();
      }
  
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 07faa7672..471a84fc8 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -24,10 +24,10 @@ index 8ee2b9bb1bce698fce50ac1b3fc477fcafd0542c..d59b82b7bb1f6d1b231f4e394e0a67a3
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bf3173881a0884d105bca724f3c0b1323c355170..6b209c203def177e0a47eba2db8c6af87f4a2a96 100644
+index f44048171d70f183f0bbdfb835211fba6da73cb4..d8766f302ed6512d3b4e8bb6508a71e5c8910b54 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1756,6 +1756,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1765,6 +1765,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
index 3f0a82c6b..36b45f852 100644
--- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6b209c203def177e0a47eba2db8c6af87f4a2a96..b67092924515d0ea7e44f1ca3d0dbf711f647637 100644
+index d8766f302ed6512d3b4e8bb6508a71e5c8910b54..39ee76225bcb6b44050d41bc5da1dbc63cab1220 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1268,6 +1268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1269,6 +1269,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return MathHelper.c(f * f + f1 * f1 + f2 * f2);
      }
  
diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
index 9bcc6439d..c84a32f2a 100644
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b67092924515d0ea7e44f1ca3d0dbf711f647637..4fb746f50ca8e41f2eb3a9c312ee21dcd6d9096d 100644
+index 39ee76225bcb6b44050d41bc5da1dbc63cab1220..2d421709d9155d8112b779a077f959c60fe9dba7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -161,6 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-     public boolean valid;
+@@ -162,6 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
+     public boolean persistentInvisibility = false;
 +    public org.bukkit.Location origin; // Paper
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1536,6 +1537,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1540,6 +1541,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  this.bukkitEntity.storeBukkitValues(nbttagcompound);
              }
              // CraftBukkit end
@@ -28,8 +28,8 @@ index b67092924515d0ea7e44f1ca3d0dbf711f647637..4fb746f50ca8e41f2eb3a9c312ee21dc
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1653,6 +1659,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             this.getBukkitEntity().readBukkitValues(nbttagcompound);
+@@ -1662,6 +1668,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+             }
              // CraftBukkit end
  
 +            // Paper start - Restore the entity's origin location
@@ -42,7 +42,7 @@ index b67092924515d0ea7e44f1ca3d0dbf711f647637..4fb746f50ca8e41f2eb3a9c312ee21dc
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1714,6 +1727,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1723,6 +1736,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void saveData(NBTTagCompound nbttagcompound);
  
diff --git a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
index 706371372..c451048cb 100644
--- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
@@ -29,10 +29,10 @@ index d59b82b7bb1f6d1b231f4e394e0a67a3d154d7be..f7a0a33e49cadf9b2bd43f118c106937
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4fb746f50ca8e41f2eb3a9c312ee21dcd6d9096d..ed1339cf67abb895eb23c8a6fd5f10b6389e4224 100644
+index 2d421709d9155d8112b779a077f959c60fe9dba7..e9725b99fd0ce9a104bce07425b9c049cb4b3be6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -414,9 +414,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -415,9 +415,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.fallDistance *= 0.5F;
          }
  
@@ -49,7 +49,7 @@ index 4fb746f50ca8e41f2eb3a9c312ee21dcd6d9096d..ed1339cf67abb895eb23c8a6fd5f10b6
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -509,6 +516,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -510,6 +517,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFireTicks(0);
      }
  
diff --git a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
index dc57d3805..147fd1dc3 100644
--- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
@@ -21,10 +21,10 @@ index 62e793b71b313146b86b466421e7a5f894bef9df..cd47a4ca069df26969de3051c2aac805
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ed1339cf67abb895eb23c8a6fd5f10b6389e4224..f46c225596ae1b0319ea4340e67ce5d6e892cc7e 100644
+index e9725b99fd0ce9a104bce07425b9c049cb4b3be6..7cdb5c74ef3260917618fc0bfc393bcf933ffb7a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2514,7 +2514,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2527,7 +2527,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  double d4 = DimensionManager.a(this.world.getDimensionManager(), worldserver.getDimensionManager());
                  BlockPosition blockposition = new BlockPosition(MathHelper.a(this.locX() * d4, d0, d2), this.locY(), MathHelper.a(this.locZ() * d4, d1, d3));
                  // CraftBukkit start
diff --git a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
index e4892e660..48ea4bc77 100644
--- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
@@ -25,10 +25,10 @@ index abbf59bb91021821876a8960e8f77fac24457ec4..04430aae52205ee167662004e45c145b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f46c225596ae1b0319ea4340e67ce5d6e892cc7e..7876feb489a99286137c0608504d643c3319f1f2 100644
+index 7cdb5c74ef3260917618fc0bfc393bcf933ffb7a..ab4405638f56844a54d4dba08bef11e7f54c568d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2189,6 +2189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2198,6 +2198,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {
diff --git a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 474eb00fd..a2f353ae1 100644
--- a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e021e731b01ca78b086812fcf6f2ae8533df7e87..ddcd44bb181559858677bd127e875d830c10ec95 100644
+index 9f7334ae769438cdd77508000e7721f57b30e225..a81afaf47214dcb4452642a7e8f295eb94ca6501 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -678,4 +678,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
- 
-         throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot.");
+@@ -689,4 +689,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         getHandle().persistentInvisibility = invisible;
+         getHandle().setFlag(5, invisible);
      }
 +
 +    // Paper start
diff --git a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
index 84b708684..6caca87ae 100644
--- a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7876feb489a99286137c0608504d643c3319f1f2..268aca49b98ba02c25fde588240c4ddc19a5fe00 100644
+index ab4405638f56844a54d4dba08bef11e7f54c568d..db271592ada5cbb20d2a0745557c491d8a35f816 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index 7876feb489a99286137c0608504d643c3319f1f2..268aca49b98ba02c25fde588240c4ddc
      private CraftEntity bukkitEntity;
  
      public CraftEntity getBukkitEntity() {
-@@ -186,7 +201,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -187,7 +202,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.x = Vec3D.ORIGIN;
          this.am = 1.0F;
          this.an = 1.0F;
diff --git a/Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch
index 89d7fb31d..7327768cc 100644
--- a/Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch
@@ -32,10 +32,10 @@ index 05ea87a473228f5b386258fae3943f3f4561eaa6..ac76bdd7e1d91b0d242539c4495948cd
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 55b34a971fc47fad851e30d07f99091b98ec4a2e..2c99bdfed76faedecf8121bd29b3fde4e883fb3a 100644
+index 3fd27209ccbd582370287c29e1c8957aa9e25ae0..f5c760a8db6f509298f53df3538e7dd60f096b50 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2661,6 +2661,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2674,6 +2674,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bU() {
diff --git a/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch
index 230325c1e..daef3baee 100644
--- a/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2c99bdfed76faedecf8121bd29b3fde4e883fb3a..62f1da9addcfb30ab23dce8c755dcc3e9951e202 100644
+index f5c760a8db6f509298f53df3538e7dd60f096b50..e720917159089e80dc8589ef7345644b44409c3d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1946,6 +1946,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1955,6 +1955,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit
diff --git a/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch
index a957ac86f..112364633 100644
--- a/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch
@@ -27,10 +27,10 @@ index 255b4081314162cbe344b008158c6f4584795fb8..04ee0856a8c62e1afb438d4fddf40e60
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 62f1da9addcfb30ab23dce8c755dcc3e9951e202..8933a974da42a06cb0b382e3436d4bb077da0c27 100644
+index e720917159089e80dc8589ef7345644b44409c3d..cad87c5f4cea45233c6266794f6e4dd9fd2c1fd9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
diff --git a/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
index f37a83708..a0891da9c 100644
--- a/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8933a974da42a06cb0b382e3436d4bb077da0c27..d6085ac3895321bf2ed1eea0f138b478e195c5bf 100644
+index cad87c5f4cea45233c6266794f6e4dd9fd2c1fd9..5d3f402f06c5ed0816e9cce45904148c5fda0e0d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
@@ -16,7 +16,7 @@ index 8933a974da42a06cb0b382e3436d4bb077da0c27..d6085ac3895321bf2ed1eea0f138b478
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1575,6 +1576,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1579,6 +1580,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index 8933a974da42a06cb0b382e3436d4bb077da0c27..d6085ac3895321bf2ed1eea0f138b478
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1698,6 +1703,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1707,6 +1712,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (!originTag.isEmpty()) {
                  origin = new org.bukkit.Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
              }
diff --git a/Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch
index f8f02649b..1264f5a80 100644
--- a/Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch
@@ -48,10 +48,10 @@ index ddcaa435f87171bd3940089c30ba6eea73546e1f..7175a1146fbad4aa91f898a45415432b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3ee78da4090f36b34bd909e807715f7e9f31bcbf..a5bfed0ec551c3467fcccc7a99cfe0866cd5e644 100644
+index e99e8e6f889edfa889619a12f9bfa4bfbde9a5a1..2e146ec4ba0c6db67c558a48ce5ec60bc2ca337f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -699,5 +699,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -710,5 +710,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(int arrows) {
          getHandle().setArrowCount(arrows);
      }
diff --git a/Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch
index 1e577b330..8a0038c96 100644
--- a/Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -32,10 +32,10 @@ index 4c6c0b3b77b3cea9abf4a9e6dec4872201db7b7b..db84ddd62b627764ff5debc56095d37e
          return this.isHandRaised() ? this.activeItem.k() - this.dY() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a5bfed0ec551c3467fcccc7a99cfe0866cd5e644..fb77846b236a7279e91ec4d9aab3eef3fe67cd4c 100644
+index 2e146ec4ba0c6db67c558a48ce5ec60bc2ca337f..a91070c3674dc47e0019e642f0f76a3cf76b7387 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -709,5 +709,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -720,5 +720,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }
diff --git a/Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch
index 6f7659484..b7fe602f2 100644
--- a/Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d6085ac3895321bf2ed1eea0f138b478e195c5bf..98ecbd1089aeb6d0dc92801d59d01b6e20a4a7c3 100644
+index 5d3f402f06c5ed0816e9cce45904148c5fda0e0d..dd9588cfdb9ea6f50c08af829a533319680c7e59 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2423,7 +2423,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2436,7 +2436,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
diff --git a/Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch
index 2f34bfd2b..603942f11 100644
--- a/Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -51,10 +51,10 @@ index 3b3cae92513a85ba842d403c68f5a1fb8fde785d..5ee581d1634f44a98756c5d11def9c3d
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 91deb3a39cc9a28d96bcac8fe3f4bb68e1fb2003..015b74ba8792647d09e67152978bcb28c2e56b38 100644
+index ef375f3987c26d70ba3f88e53f458bdccb6fc1ae..e4afda074cdbbc4b1d81844fb60602392de8941c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -190,6 +190,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
diff --git a/Spigot-Server-Patches/0281-Improve-death-events.patch b/Spigot-Server-Patches/0281-Improve-death-events.patch
index 83339a410..b3dc8ccff 100644
--- a/Spigot-Server-Patches/0281-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0281-Improve-death-events.patch
@@ -27,10 +27,10 @@ index 6281f7900afab3ef1c9ba3c034b91cbfa1900f50..7f3401d5d7878e4a0f407e92bf110dbe
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 015b74ba8792647d09e67152978bcb28c2e56b38..9a3be0671275720821d8707e7e083027b7503aa5 100644
+index e4afda074cdbbc4b1d81844fb60602392de8941c..18a79f9c61c0263526cd632f032d17bdc6cb2139 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1450,6 +1450,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1451,6 +1451,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
      // CraftBukkit end
  
@@ -38,7 +38,7 @@ index 015b74ba8792647d09e67152978bcb28c2e56b38..9a3be0671275720821d8707e7e083027
      public void a(Entity entity, int i, DamageSource damagesource) {
          if (entity instanceof EntityPlayer) {
              CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2337,6 +2338,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2350,6 +2351,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fallDistance = 0.0F;
      }
  
diff --git a/Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch
index f0fe97e02..10c208b56 100644
--- a/Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9a3be0671275720821d8707e7e083027b7503aa5..4c96d3db6d0e97def4c04a4ec45cdab9d040fbe3 100644
+index 18a79f9c61c0263526cd632f032d17bdc6cb2139..52016eefd310a19297d6b16b73596aec3792aed5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2250,6 +2250,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2263,6 +2263,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
diff --git a/Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch
index 337b1b6d3..902c9d5a4 100644
--- a/Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4c96d3db6d0e97def4c04a4ec45cdab9d040fbe3..ca4a5c4dc435587525cf95ac8156cca877e935a7 100644
+index 52016eefd310a19297d6b16b73596aec3792aed5..82408036e833880aedb073e30bcb4444667639ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1944,12 +1944,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1953,12 +1953,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -41,7 +41,7 @@ index 4c96d3db6d0e97def4c04a4ec45cdab9d040fbe3..ca4a5c4dc435587525cf95ac8156cca8
          }
  
      }
-@@ -2004,7 +2007,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2013,7 +2016,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return true; // CraftBukkit
      }
  
@@ -53,7 +53,7 @@ index 4c96d3db6d0e97def4c04a4ec45cdab9d040fbe3..ca4a5c4dc435587525cf95ac8156cca8
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2014,7 +2020,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2023,7 +2029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) getBukkitEntity(),
@@ -62,7 +62,7 @@ index 4c96d3db6d0e97def4c04a4ec45cdab9d040fbe3..ca4a5c4dc435587525cf95ac8156cca8
                  );
                  // Suppress during worldgen
                  if (this.valid) {
-@@ -2028,7 +2034,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2037,7 +2043,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
              // Spigot start
diff --git a/Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch
index c03b68b19..06e5702d4 100644
--- a/Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch
@@ -46,10 +46,10 @@ index 02c09f39848399a86d46bd17569b4f01a7b5ab1f..ed9b2f9adfecdc6d1b9925579ec51065
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ca4a5c4dc435587525cf95ac8156cca877e935a7..f24f9177940549d81641a3d361710165d1c5d2d2 100644
+index 82408036e833880aedb073e30bcb4444667639ca..0d4d619d89f0803eac78db8f167f88fe32e1f597 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1416,6 +1416,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1417,6 +1417,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.c(f - 90.0F, f1);
      }
  
@@ -57,7 +57,7 @@ index ca4a5c4dc435587525cf95ac8156cca877e935a7..f24f9177940549d81641a3d361710165
      public final Vec3D j(float f) {
          if (f == 1.0F) {
              return new Vec3D(this.locX(), this.getHeadY(), this.locZ());
-@@ -2053,6 +2054,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2062,6 +2063,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.getPassengers().size() < 1;
      }
  
@@ -120,7 +120,7 @@ index e8e7532493c973ce10d94a41676859674fc4e6f6..50f342c5f6e1ee5865646af0327567d7
          return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative() && entity.world.getDifficulty() != EnumDifficulty.PEACEFUL;
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 94be9707abefeddcc495d8c0cbc9ed9737d6a56a..2cbd983d517f8e7a8c4138859a4eba0d7e1685ee 100644
+index 3ec331f51bb305a82d2a12423c28d1f2e8ab8365..2fccc6a8a3dcf96e8ec714c2f7fa2f62af60cb76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -221,6 +221,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch
index 7fe048571..6536ff432 100644
--- a/Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f24f9177940549d81641a3d361710165d1c5d2d2..88326c0fd9a84f988e63bbfbc84a159a49ae844e 100644
+index 0d4d619d89f0803eac78db8f167f88fe32e1f597..9b8ee66bea818a52b89acaf56d182b0ff7201d92 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -21,7 +21,7 @@ index f24f9177940549d81641a3d361710165d1c5d2d2..88326c0fd9a84f988e63bbfbc84a159a
      // Paper end
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-@@ -1582,6 +1583,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1586,6 +1587,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -31,7 +31,7 @@ index f24f9177940549d81641a3d361710165d1c5d2d2..88326c0fd9a84f988e63bbfbc84a159a
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
-@@ -1711,6 +1715,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1720,6 +1724,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch
index a03893ee4..5c94afa22 100644
--- a/Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch
@@ -93,10 +93,10 @@ index 5ee581d1634f44a98756c5d11def9c3d46fd53e9..8e3244fc5c6e5fff22857637b4ab5944
  
          int k = MathHelper.floor(entity.locY() / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 88326c0fd9a84f988e63bbfbc84a159a49ae844e..697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0 100644
+index 9b8ee66bea818a52b89acaf56d182b0ff7201d92..a1507eda803f15980dcd1aa8d5ec66dbe355736b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2691,6 +2691,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2704,6 +2704,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
diff --git a/Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch
index e3d9b7d04..592267d2e 100644
--- a/Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch
+++ b/Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0..64f4768d1f6c19fec39c8e8ffc6ddc30affebdbf 100644
+index a1507eda803f15980dcd1aa8d5ec66dbe355736b..3e05079cbf7693045d9e8d9acba79de757d913ac 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -163,7 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -26,7 +26,7 @@ index 697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0..64f4768d1f6c19fec39c8e8ffc6ddc30
      protected int portalTicks;
      protected BlockPosition ac;
      private boolean invulnerable;
-@@ -186,6 +186,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -187,6 +187,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
@@ -34,7 +34,7 @@ index 697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0..64f4768d1f6c19fec39c8e8ffc6ddc30
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
-@@ -575,6 +576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -576,6 +577,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.recalcPosition();
          } else {
              if (enummovetype == EnumMoveType.PISTON) {
@@ -42,7 +42,7 @@ index 697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0..64f4768d1f6c19fec39c8e8ffc6ddc30
                  vec3d = this.b(vec3d);
                  if (vec3d.equals(Vec3D.ORIGIN)) {
                      return;
-@@ -587,6 +589,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -588,6 +590,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  this.x = Vec3D.ORIGIN;
                  this.setMot(Vec3D.ORIGIN);
              }
@@ -56,7 +56,7 @@ index 697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0..64f4768d1f6c19fec39c8e8ffc6ddc30
  
              vec3d = this.a(vec3d, enummovetype);
              Vec3D vec3d1 = this.g(vec3d);
-@@ -1909,6 +1918,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1918,6 +1927,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          }
      }
  
@@ -64,7 +64,7 @@ index 697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0..64f4768d1f6c19fec39c8e8ffc6ddc30
      public void k(Entity entity) {
          this.a(entity, Entity::setPosition);
      }
-@@ -2709,6 +2719,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2722,6 +2732,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.ae;
      }
  
diff --git a/Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch
index bbc603c4b..a86cc6913 100644
--- a/Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch
+++ b/Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch
@@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 64f4768d1f6c19fec39c8e8ffc6ddc30affebdbf..87eea4f68c66af8bd0be0062b58a0408d57ee148 100644
+index 3e05079cbf7693045d9e8d9acba79de757d913ac..5138e2dfc4f3bd33741d8c254a1839dbf9b0177f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2621,6 +2621,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2634,6 +2634,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              BlockPosition blockposition1;
  
              if (flag1) {
diff --git a/Spigot-Server-Patches/0412-Entity-Jump-API.patch b/Spigot-Server-Patches/0412-Entity-Jump-API.patch
index cfdea1827..80720f6ad 100644
--- a/Spigot-Server-Patches/0412-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0412-Entity-Jump-API.patch
@@ -34,10 +34,10 @@ index ed8c0073f0c938c2ee8ed0dad2afda21a115b67d..01cc3d94d3fe1f82c94abdfcc92b0d3b
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2cbd983d517f8e7a8c4138859a4eba0d7e1685ee..e8f9d4845eadfa065981b9beb0165f431e89377d 100644
+index 2fccc6a8a3dcf96e8ec714c2f7fa2f62af60cb76..b8e29172a17ad7e30134ff8c63815c71ff1d19d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -778,5 +778,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -789,5 +789,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public boolean isHandRaised() {
          return getHandle().isHandRaised();
      }
diff --git a/Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 995550ade..9e1b202e8 100644
--- a/Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -32,10 +32,10 @@ index a224a04ee1bb9705166913ef1c66aa031d87c270..4132cd4c6f13cfa1c0cda43daaa908ff
              }
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 87eea4f68c66af8bd0be0062b58a0408d57ee148..28c3a8e5c09c3998e7e0d7ac9244dc8abcc6d69d 100644
+index 5138e2dfc4f3bd33741d8c254a1839dbf9b0177f..eaffc6ee2d677dd69f81a2822049a06ec0325149 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public long activatedTick = Integer.MIN_VALUE;
      public boolean isTemporarilyActive = false; // Paper
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
@@ -43,7 +43,7 @@ index 87eea4f68c66af8bd0be0062b58a0408d57ee148..28c3a8e5c09c3998e7e0d7ac9244dc8a
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1599,6 +1600,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1603,6 +1604,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
              }
@@ -53,7 +53,7 @@ index 87eea4f68c66af8bd0be0062b58a0408d57ee148..28c3a8e5c09c3998e7e0d7ac9244dc8a
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1724,6 +1728,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1733,6 +1737,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch
index fbb4c6ea8..94daf331e 100644
--- a/Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch
@@ -18,10 +18,10 @@ index 4c4e6e154e0db23662484d6aa03f1d762a48badb..893a835593af2ea95a50607c8c2f2cdb
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 36c5d5cf3d18dffcd1a87a7b88b99857a39cd9f9..5616234c2efee61316b8ad051f4cf5ce4e63448f 100644
+index da9f50f0e14a3294e63a2b45e1e4521187f8b4cc..6e0a236690663040b3f9e29684a1611ad45fedf0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1281,7 +1281,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1282,7 +1282,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.lastY = d1;
          this.lastZ = d4;
          this.setPosition(d3, d1, d4);
diff --git a/Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 51f261ed3..d6c6d55bc 100644
--- a/Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,10 +7,10 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5616234c2efee61316b8ad051f4cf5ce4e63448f..61633d5be6d16546b0780da7e726c9898c97ce10 100644
+index 6e0a236690663040b3f9e29684a1611ad45fedf0..063c5ce566644a59652dec9b306f9f9282560589 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1714,9 +1714,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1718,9 +1718,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      bworld = server.getWorld(worldName);
                  }
  
diff --git a/Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index b77bf1e31..d77292a1e 100644
--- a/Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 61633d5be6d16546b0780da7e726c9898c97ce10..79ef156b669cd11b9c4f5e281a71bc066557c8f0 100644
+index 063c5ce566644a59652dec9b306f9f9282560589..7df29df2d6023e549e1fba0b5b1d1c1abcf92f8b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1870,11 +1870,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1879,11 +1879,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof EntityLiving && !((EntityLiving) this).forceDrops) {
@@ -34,7 +34,7 @@ index 61633d5be6d16546b0780da7e726c9898c97ce10..79ef156b669cd11b9c4f5e281a71bc06
  
              entityitem.defaultPickupDelay();
              // CraftBukkit start
-@@ -2518,6 +2519,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2531,6 +2532,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      @Nullable
      public Entity teleportTo(WorldServer worldserver, BlockPosition location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index 61633d5be6d16546b0780da7e726c9898c97ce10..79ef156b669cd11b9c4f5e281a71bc06
          if (this.world instanceof WorldServer && !this.dead) {
              this.world.getMethodProfiler().enter("changeDimension");
              // CraftBukkit start
-@@ -2553,7 +2560,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2566,7 +2573,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      entity.bukkitEntity = this.getBukkitEntity();
  
                      if (this instanceof EntityInsentient) {
@@ -56,7 +56,7 @@ index 61633d5be6d16546b0780da7e726c9898c97ce10..79ef156b669cd11b9c4f5e281a71bc06
                      }
                      // CraftBukkit end
                  }
-@@ -2673,7 +2680,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2686,7 +2693,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean canPortal() {
diff --git a/Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch
index c99dc3ee6..482f60896 100644
--- a/Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 79ef156b669cd11b9c4f5e281a71bc066557c8f0..c440b17620adf74e44d73a8a325e68544077f71f 100644
+index 7df29df2d6023e549e1fba0b5b1d1c1abcf92f8b..00206668dfdae7195f3c1ad3447ac7d9e529564d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -205,6 +205,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -206,6 +206,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
      // CraftBukkit end
  
diff --git a/Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch
index 06abcdbac..7e6b897e2 100644
--- a/Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c440b17620adf74e44d73a8a325e68544077f71f..b55e99966c77fd47e2a2a532de6cda561610c2f8 100644
+index 00206668dfdae7195f3c1ad3447ac7d9e529564d..dcc950b89fcbb8f7f6abe56c06cdedf5367e37ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -388,7 +388,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -389,7 +389,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setPosition(double d0, double d1, double d2) {
          this.setPositionRaw(d0, d1, d2);
@@ -17,7 +17,7 @@ index c440b17620adf74e44d73a8a325e68544077f71f..b55e99966c77fd47e2a2a532de6cda56
          if (valid) ((WorldServer) world).chunkCheck(this); // CraftBukkit
      }
  
-@@ -2883,6 +2883,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2896,6 +2896,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return new AxisAlignedBB(vec3d, vec3d1);
      }
  
@@ -25,7 +25,7 @@ index c440b17620adf74e44d73a8a325e68544077f71f..b55e99966c77fd47e2a2a532de6cda56
      public void a(AxisAlignedBB axisalignedbb) {
          // CraftBukkit start - block invalid bounding boxes
          double minX = axisalignedbb.minX,
-@@ -3321,6 +3322,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3334,6 +3335,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void setPositionRaw(double d0, double d1, double d2) {
diff --git a/Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch
index 922f9dcb6..97a7a1ca1 100644
--- a/Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch
+++ b/Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b55e99966c77fd47e2a2a532de6cda561610c2f8..d16bdc6d44672e71ae37e2ae4530d97c4a10bfdd 100644
+index dcc950b89fcbb8f7f6abe56c06cdedf5367e37ca..d903460c32213fa2d5362671efc9e96b142daf9a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -816,7 +816,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -817,7 +817,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          AxisAlignedBB axisalignedbb = this.getBoundingBox();
          VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
          VoxelShape voxelshape = this.world.getWorldBorder().c();
diff --git a/Spigot-Server-Patches/0525-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0525-Add-entity-liquid-API.patch
index ab31fe4c0..31f98d959 100644
--- a/Spigot-Server-Patches/0525-Add-entity-liquid-API.patch
+++ b/Spigot-Server-Patches/0525-Add-entity-liquid-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d16bdc6d44672e71ae37e2ae4530d97c4a10bfdd..f9f6a57e4e07d94c01d6b559e8138404b78d31f3 100644
+index d903460c32213fa2d5362671efc9e96b142daf9a..3e6ccdd5b54dbe51d4ee9ec979cbc2d0f335be70 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1073,12 +1073,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1074,12 +1074,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inWater;
      }
  
@@ -23,7 +23,7 @@ index d16bdc6d44672e71ae37e2ae4530d97c4a10bfdd..f9f6a57e4e07d94c01d6b559e8138404
      private boolean k() {
          return this.world.getType(this.getChunkCoordinates()).a(Blocks.BUBBLE_COLUMN);
      }
-@@ -1092,6 +1093,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1093,6 +1094,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.k();
      }
  
@@ -31,7 +31,7 @@ index d16bdc6d44672e71ae37e2ae4530d97c4a10bfdd..f9f6a57e4e07d94c01d6b559e8138404
      public boolean aG() {
          return this.isInWater() || this.k();
      }
-@@ -1234,6 +1236,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1235,6 +1237,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.O == tag;
      }
  
diff --git a/Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch
index bd64039c6..ed2dbaf79 100644
--- a/Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 56f0d799ca80d877543ae43ba3c53d62bbce8133..7bac6fec57c92fb5025bd530ff1733faa36b377a 100644
+index 97cc5b6b8bf1f44804e2c0528b631c51c75ab325..9e9bdf9bc2e5c4d72d811fcb439628d946741324 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -793,5 +793,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -804,5 +804,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
      }
  
diff --git a/Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 1a0c5783b..9eeec3ced 100644
--- a/Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,10 +9,10 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f9f6a57e4e07d94c01d6b559e8138404b78d31f3..cfb14c54d648e6b8f83382601bd639056ebe2125 100644
+index 3e6ccdd5b54dbe51d4ee9ec979cbc2d0f335be70..abdc68fce1ebb70ab6a25188ec1773ccbb8f37a6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1315,6 +1315,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1316,6 +1316,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void setPositionRotation(double d0, double d1, double d2, float f, float f1) {
diff --git a/work/Bukkit b/work/Bukkit
index d75d8a38c..ccb9614e9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit d75d8a38c4baaa944290d524f27f9bea83770318
+Subproject commit ccb9614e9506fe08c159e1c566561bdacf03935d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index da9bb3ea9..f8d4da08e 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit da9bb3ea92c406be1ef4d35aecf092ec917fd6ca
+Subproject commit f8d4da08e17c3b6e7147af8a945301535329bba3
diff --git a/work/Spigot b/work/Spigot
index 2740d5aeb..17d78dbd1 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 2740d5aebd99bc6b79dc65e2491ae1fd85b64480
+Subproject commit 17d78dbd136932f09b61fced8a8c8439117d3e81