Updated Upstream (CraftBukkit/Spigot) (#9598)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
b76ceb4f5 PR-1235: Move EntityType return to base Entity class
e795d7490 SPIGOT-7458: Exception when Entity CommandSender executes Vanilla command
46c7fc3b1 SPIGOT-7452: Player#openSign cannot edit
d91e5aa0b SPIGOT-7447: Rewrite --forceUpgrade to minimise diff and properly handle CraftBukkit world layout
921ae06d6 Revert "SPIGOT-7447: Fix --forceUpgrade"

Spigot Changes:
94e187b5 Rebuild patches
3bce7935 SPIGOT-7091: Update bungeecord-chat

354 files changed, 442 insertions, 477 deletions

diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 0dc8757ff4..e053d76551 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -27,10 +27,10 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..232cc8fafb1d7d9730cf2f58777e8977995ec28b
+index 0000000000000000000000000000000000000000..c2e5d8006420aab5a60e5aaa188223aeb0396483
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,85 @@
+@@ -0,0 +1,86 @@
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -42,12 +42,13 @@ index 0000000000000000000000000000000000000000..232cc8fafb1d7d9730cf2f58777e8977
 +}
 +
 +val annotationsVersion = "24.0.1"
++val bungeeCordChatVersion = "1.20-R0.1"
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
 +    api("com.google.guava:guava:31.1-jre")
 +    api("com.google.code.gson:gson:2.10")
-+    api("net.md-5:bungeecord-chat:1.16-R0.4")
++    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    api("org.yaml:snakeyaml:2.0")
 +    api("org.joml:joml:1.10.5")
 +
@@ -101,7 +102,7 @@ index 0000000000000000000000000000000000000000..232cc8fafb1d7d9730cf2f58777e8977
 +        "https://guava.dev/releases/31.1-jre/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
-+        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
++        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +    )
 +    options.tags("apiNote:a:API Note:")
 +
@@ -118,7 +119,7 @@ index 0000000000000000000000000000000000000000..232cc8fafb1d7d9730cf2f58777e8977
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index c513b14a874045c14968c9f157621b3e18c3add1..0000000000000000000000000000000000000000
+index 068987ca1171857fc9996d645e775448a09f0feb..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,270 +0,0 @@
@@ -179,7 +180,7 @@ index c513b14a874045c14968c9f157621b3e18c3add1..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>net.md-5</groupId>
 -            <artifactId>bungeecord-chat</artifactId>
--            <version>1.16-R0.4</version>
+-            <version>1.20-R0.1</version>
 -            <type>jar</type>
 -            <scope>compile</scope>
 -        </dependency>
@@ -320,7 +321,7 @@ index c513b14a874045c14968c9f157621b3e18c3add1..00000000000000000000000000000000
 -                        <link>https://guava.dev/releases/31.1-jre/api/docs/</link>
 -                        <link>https://javadoc.io/doc/org.yaml/snakeyaml/2.0/</link>
 -                        <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/24.0.1/</link>
--                        <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
+-                        <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.20-R0.1/</link>
 -                    </links>
 -                    <tags>
 -                        <tag>
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index 75258f5655..f151804243 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 232cc8fafb1d7d9730cf2f58777e8977995ec28b..3faf250d59eeefb8477a6e1454914bdd88ff11d6 100644
+index c2e5d8006420aab5a60e5aaa188223aeb0396483..ffd1c792b0e0fe1ed3da85cf933202c5193734ce 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,15 +17,27 @@ dependencies {
-     api("net.md-5:bungeecord-chat:1.16-R0.4")
+@@ -18,15 +18,27 @@ dependencies {
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
      api("org.yaml:snakeyaml:2.0")
      api("org.joml:joml:1.10.5")
 +    // Paper start
@@ -37,16 +37,16 @@ index 232cc8fafb1d7d9730cf2f58777e8977995ec28b..3faf250d59eeefb8477a6e1454914bdd
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
      testImplementation("junit:junit:4.13.2")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -67,7 +79,7 @@ tasks.withType<Javadoc> {
+@@ -68,7 +80,7 @@ tasks.withType<Javadoc> {
      options.links(
          "https://guava.dev/releases/31.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
-         "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
+         "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
      )
      options.tags("apiNote:a:API Note:")
-@@ -83,3 +95,14 @@ tasks.withType<Javadoc> {
+@@ -84,3 +96,14 @@ tasks.withType<Javadoc> {
          }
      }
  }
diff --git a/patches/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch
index f1ab647991..efe33b457a 100644
--- a/patches/api/0003-Test-changes.patch
+++ b/patches/api/0003-Test-changes.patch
@@ -13,10 +13,10 @@ Co-authored-by: Riley Park <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3faf250d59eeefb8477a6e1454914bdd88ff11d6..4a5f1737910c1c87838baf01366f20c814a39a8f 100644
+index ffd1c792b0e0fe1ed3da85cf933202c5193734ce..b38a9f4d628fa639e5d2b7dcd5a63f0bf6b8330b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -37,6 +37,7 @@ dependencies {
+@@ -38,6 +38,7 @@ dependencies {
      compileOnlyApi(checkerQual)
      testCompileOnly(checkerQual)
      // Paper end
diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
index caffa5647e..e8baa9e798 100644
--- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4a5f1737910c1c87838baf01366f20c814a39a8f..3dec6ab39000edd3e90d1bf734d24cc779ce0e3b 100644
+index b38a9f4d628fa639e5d2b7dcd5a63f0bf6b8330b..19720f73cb8454d6ddd8d75e7d08556d61436505 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -21,6 +21,7 @@ dependencies {
+@@ -22,6 +22,7 @@ dependencies {
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
      }
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index f40fd834ac..6236a285c3 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -7,13 +7,13 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3dec6ab39000edd3e90d1bf734d24cc779ce0e3b..cbab63d2f3b045f6193f5a3422ae4b5509d3003b 100644
+index 19720f73cb8454d6ddd8d75e7d08556d61436505..82310336813b5c2d7c6f708839cb6f3928293445 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -8,13 +8,26 @@ java {
-     withJavadocJar()
- }
+@@ -10,12 +10,24 @@ java {
  
+ val annotationsVersion = "24.0.1"
+ val bungeeCordChatVersion = "1.20-R0.1"
 +val adventureVersion = "4.14.0"
 +val apiAndDocs: Configuration by configurations.creating {
 +    attributes {
@@ -26,19 +26,17 @@ index 3dec6ab39000edd3e90d1bf734d24cc779ce0e3b..cbab63d2f3b045f6193f5a3422ae4b55
 +configurations.api {
 +    extendsFrom(apiAndDocs)
 +}
-+
- val annotationsVersion = "24.0.1"
  
  dependencies {
      // api dependencies are listed transitively to API consumers
      api("com.google.guava:guava:31.1-jre")
      api("com.google.code.gson:gson:2.10")
--    api("net.md-5:bungeecord-chat:1.16-R0.4")
-+    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper
+-    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
++    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
      api("org.yaml:snakeyaml:2.0")
      api("org.joml:joml:1.10.5")
      // Paper start
-@@ -22,6 +35,13 @@ dependencies {
+@@ -23,6 +35,13 @@ dependencies {
          isTransitive = false // includes junit
      }
      api("it.unimi.dsi:fastutil:8.5.6")
@@ -52,19 +50,19 @@ index 3dec6ab39000edd3e90d1bf734d24cc779ce0e3b..cbab63d2f3b045f6193f5a3422ae4b55
      // Paper end
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-@@ -82,10 +102,26 @@ tasks.withType<Javadoc> {
+@@ -83,10 +102,26 @@ tasks.withType<Javadoc> {
          "https://guava.dev/releases/31.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
--        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
+-        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +        // Paper start
-+        //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
++        // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // don't link to bungee chat
 +        "https://jd.advntr.dev/api/$adventureVersion/",
 +        "https://jd.advntr.dev/text-minimessage/$adventureVersion/",
 +        "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
 +        "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
 +        "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
-+        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/"
++        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
 +        // Paper end
      )
      options.tags("apiNote:a:API Note:")
diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
index 06c31e75a8..82c35e3924 100644
--- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,12 +14,12 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 22b65c3ad4ed6e19b88a51a2e001f0e5846d9ae6..149f9088fe806467656e8b1c4157df60fda69ba7 100644
+index 8c93ff28273ef9ddce2fb7a62ac50701fa3cd9a2..8045f92ffdfb4164bcbef99c41359590c45f9006 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,6 +9,8 @@ java {
- }
- 
+@@ -11,6 +11,8 @@ java {
+ val annotationsVersion = "24.0.1"
+ val bungeeCordChatVersion = "1.20-R0.1"
  val adventureVersion = "4.14.0"
 +val slf4jVersion = "1.8.0-beta4"
 +val log4jVersion = "2.17.1"
@@ -35,14 +35,12 @@ index 22b65c3ad4ed6e19b88a51a2e001f0e5846d9ae6..149f9088fe806467656e8b1c4157df60
  
      implementation("org.ow2.asm:asm:9.4")
      implementation("org.ow2.asm:asm-commons:9.4")
-@@ -112,7 +116,9 @@ tasks.withType<Javadoc> {
-         "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
+@@ -113,6 +117,8 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
--        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/"
-+        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
+         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
 +        "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
-+        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/"
++        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
          // Paper end
      )
      options.tags("apiNote:a:API Note:")
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index b13beb23c7..3d4391fce8 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -7370,10 +7370,10 @@ index 8adac67a9315186d1ef453eae827ea7f69856f7a..153143b06fc088f3142a8fa17f153d8a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bcf8d0316386cbf4d90b73f7530acbcf554be55d..61304b316985462e898a1b80f872b716a33207c6 100644
+index b5544bbfcf4449bdf588a14a9afe518f272e8261..5e8ec70a58c047969a144355782da58aee44b288 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1175,4 +1175,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1186,4 +1186,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 4894cd850f..d14ab492d1 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -3264,7 +3264,7 @@ index 0beb96dc896f63003e1b1ae458b73902bdbe648a..102eb86bad3000f258775ac06ecd1a6d
      public String getCustomName() {
          EnchantmentTableBlockEntity enchant = this.getSnapshot();
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 8ea2349ffcfa55bd20343edd4551aa26c88901a6..a19504cf5c98b4d8070dc1ffe322b84e1896d84a 100644
+index bd43440fcbcf461fb8ca94b96cd256f392efeb84..5af30bff1bfdf09daa585071f2ec1fe04db3609f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -27,6 +27,23 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
@@ -3291,7 +3291,7 @@ index 8ea2349ffcfa55bd20343edd4551aa26c88901a6..a19504cf5c98b4d8070dc1ffe322b84e
      @Override
      public String[] getLines() {
          return this.front.getLines();
-@@ -120,6 +137,20 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
+@@ -121,6 +138,20 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
          ((CraftPlayer) player).getHandle().openTextEdit(handle, Side.FRONT == side);
      }
  
@@ -3558,18 +3558,18 @@ index f6c614bb1184f9c79121f64a2a030bf3f094b671..e8334e2264510f5101e80b4f130e7ae1
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
          return this.target;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 61304b316985462e898a1b80f872b716a33207c6..11645e01924b4a66aa4f425c8962a000be761912 100644
+index 5e8ec70a58c047969a144355782da58aee44b288..672153a664b7b48bfb18d12efc271e296b5aa428 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -202,6 +202,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-     protected Entity entity;
+@@ -206,6 +206,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+     private final EntityType entityType;
      private EntityDamageEvent lastDamageEvent;
      private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftEntity.DATA_TYPE_REGISTRY);
 +    protected net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
  
      public CraftEntity(final CraftServer server, final Entity entity) {
          this.server = server;
-@@ -853,6 +854,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -864,6 +865,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().getVehicle().getBukkitEntity();
      }
  
@@ -3602,7 +3602,7 @@ index 61304b316985462e898a1b80f872b716a33207c6..11645e01924b4a66aa4f425c8962a000
      @Override
      public void setCustomName(String name) {
          // sane limit for name length
-@@ -932,6 +959,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -943,6 +970,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public String getName() {
          return CraftChatMessage.fromComponent(this.getHandle().getName());
      }
@@ -3655,10 +3655,10 @@ index 3421498e8e5fe2e22d6b31d9cf6b3337553e1c5f..abe978078270a45f7e77eb2b8a99309f
          player.initMenu(container);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa96d52315 100644
+index 10fa80df3ae2406f34af669f89d087b15ad1d71b..66fb6aeb49b7e93d2a4d9b5ce7f1a7d68f571cf5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-@@ -65,6 +65,13 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
+@@ -59,6 +59,13 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
          return CraftChatMessage.fromComponent(this.getHandle().getCommandBlock().getName());
      }
  
@@ -3673,7 +3673,7 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa
      public boolean isOp() {
          return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9e884e903f877f8fef036307142cee3b574e829b..498fb1db3091013cbd58aabf8361f961c8a3e755 100644
+index 7b134da717f510a8718a19bd61560a532a074dc8..5afd9ccf2eef614da52ec82d3972a49722e46321 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -294,14 +294,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3879,7 +3879,7 @@ index 9e884e903f877f8fef036307142cee3b574e829b..498fb1db3091013cbd58aabf8361f961
      public void addChannel(String channel) {
          Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
          channel = StandardMessenger.validateAndCorrectChannel(channel);
-@@ -2097,6 +2178,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2092,6 +2173,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
      }
  
@@ -3892,7 +3892,7 @@ index 9e884e903f877f8fef036307142cee3b574e829b..498fb1db3091013cbd58aabf8361f961
      @Override
      public int getPing() {
          return this.getHandle().latency;
-@@ -2147,6 +2234,252 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2142,6 +2229,252 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  
@@ -4146,10 +4146,10 @@ index 9e884e903f877f8fef036307142cee3b574e829b..498fb1db3091013cbd58aabf8361f961
      private final Player.Spigot spigot = new Player.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java
-index 1cd2af11e8fd43ebc9fd5e0dfc53ac2de4532399..7bfb83d3ac38c5c270d77d9794a55a363ac6302b 100644
+index 5725b0281ac53a2354b233223259d6784353bc6e..9ef939b76d06874b856e0c850addb364146f5a00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java
-@@ -38,6 +38,17 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay {
+@@ -32,6 +32,17 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay {
      public void setText(String text) {
          this.getHandle().setText(CraftChatMessage.fromString(text, true)[0]);
      }
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch
index 0c6b3dba6c..a030247e4e 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@@ -1846,10 +1846,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 498fb1db3091013cbd58aabf8361f961c8a3e755..cf87f197d860567746dcae2a15946fed0b1a1d85 100644
+index 5afd9ccf2eef614da52ec82d3972a49722e46321..f76db40188007b6ab475d259b4cbe0c7ef804677 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2555,6 +2555,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2550,6 +2550,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              CraftPlayer.this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, position == net.md_5.bungee.api.ChatMessageType.ACTION_BAR));
          }
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch
index 9876f7d4a6..1301c7a2ab 100644
--- a/patches/server/0030-Player-affects-spawning-API.patch
+++ b/patches/server/0030-Player-affects-spawning-API.patch
@@ -137,10 +137,10 @@ index be6e3e21ad62da01e5e2dd78e300cbc8efdbeb42..ea98625fe7c00743b8df74a24e6d4b75
          for(Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3b1dbfe6f03e62ac9e12066d41516de157f99719..d5f858f07a0b93e439acf676f4c5eefa61f50db0 100644
+index 49ca3592012cca981b96434c9807440672a8c165..2b84eca45352db88fb58a981b5caf67b88c92e9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2234,8 +2234,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2229,8 +2229,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return this.getHandle().locale;
diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/server/0032-Only-refresh-abilities-if-needed.patch
index 046893c840..1665d97c4f 100644
--- a/patches/server/0032-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0032-Only-refresh-abilities-if-needed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5f858f07a0b93e439acf676f4c5eefa61f50db0..bd570b123d571437e8b2af8c1e68e0d5d66ee37b 100644
+index 2b84eca45352db88fb58a981b5caf67b88c92e9e..1486d48e3c710ec733cd7cc6c07fb6e11d1e1d93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1909,12 +1909,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1904,12 +1904,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/server/0033-Entity-Origin-API.patch
index e31ff43a11..a627a0b031 100644
--- a/patches/server/0033-Entity-Origin-API.patch
+++ b/patches/server/0033-Entity-Origin-API.patch
@@ -25,7 +25,7 @@ index 995be2fd84ce343d7430d9658f91868e653da43d..4af495424d60632b770cd1cb02157bbc
  
          public void onTrackingEnd(Entity entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index adef9ffbc7a42172d88004209b8a745254b58757..87dce3470b544d9095c9bb2fd54b79553212a122 100644
+index 48ac0559e32a1b6b26a00978cf9ef6a1c13e674b..98933377d46b2dd69d5d477e7f1d6ddff96ee2b4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -312,7 +312,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -132,10 +132,10 @@ index 415b8822f0dfb14d49bccb2a10ac04025891ddf7..89fd5d6b373d2705dccc2f22663048f4
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 11645e01924b4a66aa4f425c8962a000be761912..003690e2f347821d28517b816115cc92ea5d0bd6 100644
+index 672153a664b7b48bfb18d12efc271e296b5aa428..1ccaf59479dce7b913037f232bb37bdbc75b98a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1245,5 +1245,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1256,5 +1256,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
          return ret;
      }
diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
index c26fe860cd..6879989dba 100644
--- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1ef48b8415242942f00c6a76faa1de2865e11358..bcf0d4cfbfbae254bc74ad6389af372a8aa319be 100644
+index 1136a3fe673680fcaca9b9768543ffada040153f..f157646156a659d0b87b1f72fd0d1d06d66bc543 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1853,7 +1853,7 @@ public class ServerPlayer extends Player {
@@ -30,10 +30,10 @@ index 1ef48b8415242942f00c6a76faa1de2865e11358..bcf0d4cfbfbae254bc74ad6389af372a
          this.locale = packet.language;
          // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bd570b123d571437e8b2af8c1e68e0d5d66ee37b..f5e4713bd9f6d0661f4e8d45c0b7cfffcb2bce57 100644
+index 1486d48e3c710ec733cd7cc6c07fb6e11d1e1d93..f5b05eb97f059cfb4d6d22d0a180c5fd8a203f66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2234,8 +2234,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2229,8 +2229,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/server/0058-Add-velocity-warnings.patch
index ddd530562c..6a695ac86e 100644
--- a/patches/server/0058-Add-velocity-warnings.patch
+++ b/patches/server/0058-Add-velocity-warnings.patch
@@ -17,10 +17,10 @@ index a4d530e81a319ea53122760e352083b9708f9f04..81758ba9193fad39a291c635c41d2cdb
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 003690e2f347821d28517b816115cc92ea5d0bd6..fa2a6f44a1c25fb6c9a19e83e7eddb2c8d28a320 100644
+index 1ccaf59479dce7b913037f232bb37bdbc75b98a8..5a307e3bf2fc48a74e8c42372f3422fd32224133 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -465,10 +465,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -471,10 +471,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public void setVelocity(Vector velocity) {
          Preconditions.checkArgument(velocity != null, "velocity");
          velocity.checkFinite();
diff --git a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index ecb763b1fc..60b0112218 100644
--- a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -7,7 +7,7 @@ Upstream added methods for this, original methods are now
 deprecated
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 27830b5909660038a51ef7fc4ca78d9df64f562a..96095cc107d161cad7401725eb70f08203deac9a 100644
+index b3fcbc3f5f0f8e9ca53fce85a4b86d4c292765df..bba6bce470a11c792bb2edc2171021437e2c9704 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -267,9 +267,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -27,7 +27,7 @@ index 27830b5909660038a51ef7fc4ca78d9df64f562a..96095cc107d161cad7401725eb70f082
      }
  
      @Override
-@@ -788,4 +794,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -783,4 +789,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().persistentInvisibility = invisible;
          this.getHandle().setSharedFlag(5, invisible);
      }
diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/server/0065-Complete-resource-pack-API.patch
index e1dea6c95b..9c8ede1409 100644
--- a/patches/server/0065-Complete-resource-pack-API.patch
+++ b/patches/server/0065-Complete-resource-pack-API.patch
@@ -23,7 +23,7 @@ index c69a2da951af082b8dc90baf35b7e020ffda0b5e..cad7df80d4914b533ce9db1a10b5923b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3ec282a272257996fad17c3ac23b334aca344bb0..87c597ad5e7cc76db7a5da4e3d97e044ce9f8594 100644
+index 4045038fbe2dac5c5e18e3cdd68ce16ac3691b97..df91d5f9161e9bf65556191a3079ae0f008ab698 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -189,6 +189,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -37,7 +37,7 @@ index 3ec282a272257996fad17c3ac23b334aca344bb0..87c597ad5e7cc76db7a5da4e3d97e044
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2357,6 +2361,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2352,6 +2356,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index a9bb4ac32a..d2add6dbf5 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,10 +44,10 @@ index d8ecc90465dfc54319d7f2478979e9aaee42f5a2..45a93601ff9ec79db0ceefb92eecfc97
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 87c597ad5e7cc76db7a5da4e3d97e044ce9f8594..875784e3d1d89c8fd5e4e3f9cec2e37c93e17570 100644
+index df91d5f9161e9bf65556191a3079ae0f008ab698..a6d9dcf8487c63a0469f5fec27bef131b444942a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2154,6 +2154,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2149,6 +2149,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
index 126eaea0ca..0d64d483c8 100644
--- a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -750,10 +750,10 @@ index 982adacb361b0590799dc68f9b7c13c7195627fd..e49eece9bff3a53469673d03a7bbf8f9
      public CraftLootable(World world, T tileEntity) {
          super(world, tileEntity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java
-index ae07db69b11b993b50782c94aa5c45b97d949612..06a96f027f90fd5bf05de72c8722ff5a81608b66 100644
+index 9ba61f791c0ca9b283c0f1f30f12600c4e49a4cb..c332e8504b96a4437325b5a64430c97c5afb6b4b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java
-@@ -11,8 +11,7 @@ import org.bukkit.entity.EntityType;
+@@ -10,8 +10,7 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
  import org.bukkit.inventory.Inventory;
  import org.bukkit.loot.LootTable;
  
@@ -763,7 +763,7 @@ index ae07db69b11b993b50782c94aa5c45b97d949612..06a96f027f90fd5bf05de72c8722ff5a
      private final Inventory inventory;
  
      public CraftChestBoat(CraftServer server, ChestBoat entity) {
-@@ -66,7 +65,7 @@ public class CraftChestBoat extends CraftBoat implements org.bukkit.entity.Chest
+@@ -60,7 +59,7 @@ public class CraftChestBoat extends CraftBoat implements org.bukkit.entity.Chest
          return this.getHandle().getLootTableSeed();
      }
  
@@ -773,10 +773,10 @@ index ae07db69b11b993b50782c94aa5c45b97d949612..06a96f027f90fd5bf05de72c8722ff5a
          this.getHandle().setLootTable(newKey);
          this.getHandle().setLootTableSeed(seed);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index eb21b8457774d5ac765fa9008157cb29d9b72509..abf58bef2042a9efba5a78fd7f97339deceaa780 100644
+index fd42f0b20132d08039ca7735d31a61806a6b07dc..b1a708de6790bbe336202b13ab862ced78de084f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-@@ -8,7 +8,7 @@ import org.bukkit.entity.minecart.StorageMinecart;
+@@ -7,7 +7,7 @@ import org.bukkit.entity.minecart.StorageMinecart;
  import org.bukkit.inventory.Inventory;
  
  @SuppressWarnings("deprecation")
@@ -786,10 +786,10 @@ index eb21b8457774d5ac765fa9008157cb29d9b72509..abf58bef2042a9efba5a78fd7f97339d
  
      public CraftMinecartChest(CraftServer server, MinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index 34b8f103625f087bb725bed595dd9c30f4a6f70c..ee9648739fb39c5842063d7442df6eb5c9336d7f 100644
+index ec3ab12442b7371e16059b902f71e573f0bc9816..3ba7e8ef1035e1de2c195b6919fe57aee398af51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-@@ -7,7 +7,7 @@ import org.bukkit.entity.EntityType;
+@@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.inventory.CraftInventory;
  import org.bukkit.entity.minecart.HopperMinecart;
  import org.bukkit.inventory.Inventory;
  
diff --git a/patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 5ecdd621ee..d2bc28f615 100644
--- a/patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -31,10 +31,10 @@ index af6a2e8c4ce41aaf55b645c37f809c2de7ea780a..be7ed906b4a5a8ffda87ecf66f967061
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 47ca72e264950dd950f037a21bb0ad6cc1700751..06cedeea447f53d100e32a6eba6f83b4719cb231 100644
+index 76536f0d700fb4b120ffef066588e305013a5a66..fc3b98746a558b3ad6c89543170225bdae1e63ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-@@ -228,4 +228,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
+@@ -222,4 +222,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
      public boolean hasEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
          return (this.getHandle().disabledSlots & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).getFilterFlag() + lockType.ordinal() * 8)) != 0;
      }
diff --git a/patches/server/0122-Firework-API-s.patch b/patches/server/0122-Firework-API-s.patch
index 16b867bd75..b5fa1b6e64 100644
--- a/patches/server/0122-Firework-API-s.patch
+++ b/patches/server/0122-Firework-API-s.patch
@@ -76,10 +76,10 @@ index 5cafb6f0b507127665393741b372286da098d603..7c627d27300247db9122ab2081049345
                  if (!user.getAbilities().instabuild) {
                      itemStack.shrink(1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 59d5c314711b4ec239e5bcb4272b11ed72705c5a..c242f654c88ca1773429348939d3bb2ffae3768c 100644
+index 437fd93bf0de2b4fd74b5f94d0b931ed10f2b6ec..7417e3d51497fe7e62e108d83ee4b70942972144 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-@@ -135,4 +135,11 @@ public class CraftFirework extends CraftProjectile implements Firework {
+@@ -129,4 +129,11 @@ public class CraftFirework extends CraftProjectile implements Firework {
      public void setShotAtAngle(boolean shotAtAngle) {
          this.getHandle().getEntityData().set(FireworkRocketEntity.DATA_SHOT_AT_ANGLE, shotAtAngle);
      }
diff --git a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 70925137ab..93b1b52f6e 100644
--- a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -337,10 +337,10 @@ index 8e1d70bbc433780f264dde137aa7f37e7f6362cd..3dd759d030411420f93eb5ac51f2087e
              entity = net.minecraft.world.entity.EntityType.LIGHTNING_BOLT.create(world);
              entity.moveTo(location.getX(), location.getY(), location.getZ());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 40713228b149b4532fcee3a54bbe63e161318258..84899284703baeb04bfc79251941265d52ac07e8 100644
+index 4907d61b0254919e137c4f92e0dbeb2d61a906f6..26c795983515580b30b5ef8c701faa95ab1aea8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-@@ -19,6 +19,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
+@@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
          this.getHandle().value = value;
      }
  
diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/server/0135-Item-canEntityPickup.patch
index 5859d9186f..560d54993d 100644
--- a/patches/server/0135-Item-canEntityPickup.patch
+++ b/patches/server/0135-Item-canEntityPickup.patch
@@ -33,10 +33,10 @@ index 23c51152288d9616673ef544a09dd816dff44cf6..2d1b8d6e490e1dcde801feaae2518a59
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index d08869c92f15a63f857d88e506f744f5ff9eb15e..5f36b0fd12ccd0e7ec9a7f61c56f08307844935f 100644
+index 4fbbc3c76d49c31aadd957ad3a30d479f6c99c15..66e69cb13e2d82acc0a2398625766a49bc701a09 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -66,6 +66,18 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -65,6 +65,18 @@ public class CraftItem extends CraftEntity implements Item {
          }
      }
  
diff --git a/patches/server/0144-Entity-fromMobSpawner.patch b/patches/server/0144-Entity-fromMobSpawner.patch
index b36c3e9bb5..35d4a08d99 100644
--- a/patches/server/0144-Entity-fromMobSpawner.patch
+++ b/patches/server/0144-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 019f02d4c0f44155ae248fa04403a174fde65e51..841bcf08ae46911537f9567a450b130d2f6fbc59 100644
+index ca46bea3799e1bc962debe742ea75f4d7f4ab771..4c8ad4e6ed90d5ba25100abfd2f334a3d1e46288 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -388,6 +388,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -49,10 +49,10 @@ index 7ae0465091db8e8061737bf93884afa3db49feeb..5d6403fa27521860a69a707dc4358b01
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
                              continue;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index fa2a6f44a1c25fb6c9a19e83e7eddb2c8d28a320..83bde3f87e0861fdfd01f843ccae285b1748619a 100644
+index 5a307e3bf2fc48a74e8c42372f3422fd32224133..02277fc7e48e03d749edb7ec1c3f045dca900615 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1290,5 +1290,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1301,5 +1301,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          //noinspection ConstantConditions
          return originVector.toLocation(world);
      }
diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
index 239906049f..b4b5be158a 100644
--- a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
@@ -4,18 +4,6 @@ Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add openSign method to HumanEntity
 
 
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index a19504cf5c98b4d8070dc1ffe322b84e1896d84a..f1ba0fd5d17fb1a26cf09848d4125ecfab39eddb 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-@@ -134,6 +134,7 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
-             return;
-         }
- 
-+        handle.setAllowedPlayerEditor(player.getUniqueId()); // Paper
-         ((CraftPlayer) player).getHandle().openTextEdit(handle, Side.FRONT == side);
-     }
- 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 index 2f5704b19148f390402c0823030806ba96860286..74f1af3dccddf52965e5c91277be3592649e8cfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0190-Enderman.teleportRandomly.patch
index 3db423abec..d5a1395578 100644
--- a/patches/server/0190-Enderman.teleportRandomly.patch
+++ b/patches/server/0190-Enderman.teleportRandomly.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 3121e0cef159493d6282e53d3a4ee3e4288ce5e1..fe829a74e23442c93bb5565589e8f33300ea01e1 100644
+index 0e13edd23016a6ffe6492de322e1d675137e3c9e..cb161c3d1a08d9c143201040018664298e98eafe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-@@ -18,6 +18,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
+@@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
          super(server, entity);
      }
  
diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/server/0203-Fix-CraftEntity-hashCode.patch
index a1ed33d54c..69456c5942 100644
--- a/patches/server/0203-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0203-Fix-CraftEntity-hashCode.patch
@@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 83bde3f87e0861fdfd01f843ccae285b1748619a..9614a0bd83139e8d62f60fe04f017e0cb0f828c9 100644
+index 02277fc7e48e03d749edb7ec1c3f045dca900615..185b3af59bf72244bbbfc46c3336e4f7f14e73a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -830,14 +830,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -841,14 +841,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
          final CraftEntity other = (CraftEntity) obj;
diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
index 78e602ba0d..3fa09e2eb9 100644
--- a/patches/server/0206-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
@@ -35,10 +35,10 @@ index b2dc7a83d475c0fcdaec8d1e11bf5bdaac39acdf..de63f8883ae2786030cb9e5a5fb72fad
          return this.isShiftKeyDown();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 303b066aa9dcdb82e7f67160e8ac901374138465..00d4e95cee47ee9a6932a8a8ab18d45d7d5e001d 100644
+index 24d13be4a5a6cd9d8d9f46c089fd23baa6da954d..4ea0b3423ad08c7645afdf1eabc66fdf299e3ef5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -815,5 +815,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -810,5 +810,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(final int arrows) {
          this.getHandle().setArrowCount(arrows);
      }
diff --git a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
index c4a44d3236..d001e5abe6 100644
--- a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,10 +6,10 @@ 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/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 00d4e95cee47ee9a6932a8a8ab18d45d7d5e001d..2139f10af54f0a2e2101145fa7b21a3b1af4b9a2 100644
+index 4ea0b3423ad08c7645afdf1eabc66fdf299e3ef5..f79118891ca87515cbcea8b798e434cb57bbe494 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -825,5 +825,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -820,5 +820,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }
diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/server/0212-RangedEntity-API.patch
index 2f5d687138..48ffa5b24e 100644
--- a/patches/server/0212-RangedEntity-API.patch
+++ b/patches/server/0212-RangedEntity-API.patch
@@ -57,12 +57,12 @@ index db6ad6eea8fa6f2755bbb0e1325df8bda98e708a..5ff566186431440c25a26900aba14e4a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
-index 34cb8062168258bfd168826ceeb2fde669f6d1a8..03e2acd4829da449a471b0fa1a311e74aee114d3 100644
+index b91d0841b7189d560150d41877e4a0bdea161539..14b575254171f66b8792033c93cf5a325a42b467 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
-@@ -4,7 +4,7 @@ import org.bukkit.craftbukkit.CraftServer;
+@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Drowned;
- import org.bukkit.entity.EntityType;
  
 -public class CraftDrowned extends CraftZombie implements Drowned {
 +public class CraftDrowned extends CraftZombie implements Drowned, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.Drowned> { // Paper
@@ -70,11 +70,11 @@ index 34cb8062168258bfd168826ceeb2fde669f6d1a8..03e2acd4829da449a471b0fa1a311e74
      public CraftDrowned(CraftServer server, net.minecraft.world.entity.monster.Drowned entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-index 59b866e54e0d7e1dd8815ffa85275e36271113da..bbf7189a0fc9921e7a6007494f91229d9fba0846 100644
+index 995c77ee53347328bfd0ad66fcc1b39589967476..5b2af80e584977683cd39e6f440e65a76e929be9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-@@ -4,7 +4,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
+@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Illusioner;
  
 -public class CraftIllusioner extends CraftSpellcaster implements Illusioner {
@@ -83,10 +83,10 @@ index 59b866e54e0d7e1dd8815ffa85275e36271113da..bbf7189a0fc9921e7a6007494f91229d
      public CraftIllusioner(CraftServer server, net.minecraft.world.entity.monster.Illusioner entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 92e48f89f8eef4c1110ff6dadea2f436e0b82d21..5500d5768bb22f70b99aa28cf4541b4871e12139 100644
+index dfd4cf1e613b7ccf3ad986f8e0d783593a411194..9986ac517e11b076a29a8c8e3f480ec286fa5825 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -9,7 +9,7 @@ import org.bukkit.entity.Llama;
+@@ -8,7 +8,7 @@ import org.bukkit.entity.Llama;
  import org.bukkit.entity.Llama.Color;
  import org.bukkit.inventory.LlamaInventory;
  
@@ -96,10 +96,10 @@ index 92e48f89f8eef4c1110ff6dadea2f436e0b82d21..5500d5768bb22f70b99aa28cf4541b48
      public CraftLlama(CraftServer server, net.minecraft.world.entity.animal.horse.Llama entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-index 27763d1eca832abda76c8b3c22595cbaf9b1fe45..aeda5fc001fe4ce55ee467240b275b6050a29f98 100644
+index 83ab9f7c2bcd3e1bac0324030f182bc303e22cad..8b9695de6e3411cbcc2f97e4a4e243ec1d1dd076 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-@@ -13,7 +13,7 @@ import org.bukkit.entity.EntityType;
+@@ -12,7 +12,7 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
  import org.bukkit.entity.Piglin;
  import org.bukkit.inventory.Inventory;
  
@@ -109,10 +109,10 @@ index 27763d1eca832abda76c8b3c22595cbaf9b1fe45..aeda5fc001fe4ce55ee467240b275b60
      public CraftPiglin(CraftServer server, net.minecraft.world.entity.monster.piglin.Piglin entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java
-index 06786fba1fef36e8fc3d0f5650160123f728a6d1..beea227855f0b978e655efc298024120df8f4945 100644
+index d82cea48d9baeaba4dfa32540dcc9ca73651608b..2638c341bc02f201f7ab17fdebcdbdf3a7ec05bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java
-@@ -6,7 +6,7 @@ import org.bukkit.entity.EntityType;
+@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.inventory.CraftInventory;
  import org.bukkit.entity.Pillager;
  import org.bukkit.inventory.Inventory;
  
@@ -122,11 +122,11 @@ index 06786fba1fef36e8fc3d0f5650160123f728a6d1..beea227855f0b978e655efc298024120
      public CraftPillager(CraftServer server, net.minecraft.world.entity.monster.Pillager entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index 6a82d567d96a42bfea0e38afb4e8de13eb3ad5a2..659e2959c5330e4764ea1edc7f8de9f464f9ff52 100644
+index cb9efd2fa886d721a802d1c644d9b2c7e6eb948a..5d2e0fb911265f1184de5434464378ffba98d379 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
+@@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.SnowGolem;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Snowman;
  
 -public class CraftSnowman extends CraftGolem implements Snowman {
@@ -135,11 +135,11 @@ index 6a82d567d96a42bfea0e38afb4e8de13eb3ad5a2..659e2959c5330e4764ea1edc7f8de9f4
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index 5fbb06e28d5c797cfb6859ce7ef05ba00949f690..eada1f0ff10d4c00f82a6f4411fe18b7184e9901 100644
+index 399b045478d93b2b85b0b25c2dec427dc6a45166..5024a102fe71d7013bc809bb4140763bd4c466e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-@@ -4,7 +4,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
+@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Witch;
  
 -public class CraftWitch extends CraftRaider implements Witch {
@@ -148,10 +148,10 @@ index 5fbb06e28d5c797cfb6859ce7ef05ba00949f690..eada1f0ff10d4c00f82a6f4411fe18b7
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 10ba8c3f9c2c84b573d77da4919324df6292ab9d..f9c3a14bf4674f21ed32f6dc2a4296a935dd2b6d 100644
+index 2536d59a01e3557678125e26ace9676d7aec6099..83353863e0c58995d3699d5f812d38cae056f695 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-@@ -10,7 +10,7 @@ import org.bukkit.entity.EntityType;
+@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.boss.CraftBossBar;
  import org.bukkit.entity.LivingEntity;
  import org.bukkit.entity.Wither;
  
diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/server/0216-Vex-get-setSummoner-API.patch
index 61ba4a29fe..f0dff217b9 100644
--- a/patches/server/0216-Vex-get-setSummoner-API.patch
+++ b/patches/server/0216-Vex-get-setSummoner-API.patch
@@ -9,10 +9,10 @@ Allow setting the vex's summoner
 Co-authored-by: BillyGalbreath <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index ba8f9d96029aa26e097abb56963261aa707ef645..50b07045cd17a7576a436c64662ad039d4aa2132 100644
+index bf9e23702d30838770d612d7644713f6510497be..c4f7216c7ca7a49048fcf5240ef2a8f80e843f1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-@@ -19,6 +19,19 @@ public class CraftVex extends CraftMonster implements Vex {
+@@ -18,6 +18,19 @@ public class CraftVex extends CraftMonster implements Vex {
          return (net.minecraft.world.entity.monster.Vex) super.getHandle();
      }
  
diff --git a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch b/patches/server/0226-Allow-disabling-armour-stand-ticking.patch
index 25ee029470..ff92f7be81 100644
--- a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/server/0226-Allow-disabling-armour-stand-ticking.patch
@@ -123,10 +123,10 @@ index a59381646031a1a99c98c8c6ad9de7efc96b774a..719f68f96e58ddcdd3592131c691d212
  
      public Rotations getHeadPose() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 06cedeea447f53d100e32a6eba6f83b4719cb231..82b9ee993b0d2e7e0685231f7bad2b85756ec959 100644
+index fc3b98746a558b3ad6c89543170225bdae1e63ba..f4d46cd34fb97ebbf2e95d905d315b93add958b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-@@ -238,5 +238,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
+@@ -232,5 +232,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
      public void setCanMove(boolean move) {
          getHandle().canMove = move;
      }
diff --git a/patches/server/0227-SkeletonHorse-Additions.patch b/patches/server/0227-SkeletonHorse-Additions.patch
index 09786150d8..27538378de 100644
--- a/patches/server/0227-SkeletonHorse-Additions.patch
+++ b/patches/server/0227-SkeletonHorse-Additions.patch
@@ -65,10 +65,10 @@ index ea98625fe7c00743b8df74a24e6d4b75df4189a5..66a5783e2a83c75ca46d1fd6f97d9de7
      default Player getNearestPlayer(Entity entity, double maxDistance) {
          return this.getNearestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e42dfd154f05130ff26f4d47d6817a1a561bfd54..78bc77d9cc5797fa8edd189167bb60b75b7f920e 100644
+index 1a631ab092bbd03d24a09e22992bb16c825e7043..bba6dcac6df4841561cf39b9ea0fc116f57a901b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-@@ -50,4 +50,16 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
+@@ -44,4 +44,16 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
      public void setTrapTime(int trapTime) {
          this.getHandle().trapTime = trapTime;
      }
diff --git a/patches/server/0229-Implement-Expanded-ArmorStand-API.patch b/patches/server/0229-Implement-Expanded-ArmorStand-API.patch
index 646e0ab722..bce62779d9 100644
--- a/patches/server/0229-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/server/0229-Implement-Expanded-ArmorStand-API.patch
@@ -14,10 +14,10 @@ public net.minecraft.world.entity.decoration.ArmorStand isDisabled(Lnet/minecraf
 Co-authored-by: SoSeDiK <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 82b9ee993b0d2e7e0685231f7bad2b85756ec959..f80cafe3544c7e6c3c29073ba6539783adf6666c 100644
+index f4d46cd34fb97ebbf2e95d905d315b93add958b8..273f3c029f878c8a30e4f0911d79195c023d3442 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-@@ -239,6 +239,147 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
+@@ -233,6 +233,147 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
          getHandle().canMove = move;
      }
  
diff --git a/patches/server/0242-Slime-Pathfinder-Events.patch b/patches/server/0242-Slime-Pathfinder-Events.patch
index 1acba54894..3777b95865 100644
--- a/patches/server/0242-Slime-Pathfinder-Events.patch
+++ b/patches/server/0242-Slime-Pathfinder-Events.patch
@@ -145,12 +145,12 @@ index 476a9b2db5deac803f1cb3c2cbe88b69cc3da8e5..30779b817db6f8e392036b4ec66e1c5c
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index a5b3b08bbac2149e5de8e2933efaad65c4f13b12..743af3b71f2d007290fa4e4da85973b491d95135 100644
+index d4891e026c5ccc3d75d5b455661ab641b9d4a3b5..9b219beb8922bf0701e538bcf874f0eb922f60bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-@@ -34,4 +34,16 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
-     public EntityType getType() {
-         return EntityType.SLIME;
+@@ -28,4 +28,16 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
+     public String toString() {
+         return "CraftSlime";
      }
 +
 +    // Paper start
diff --git a/patches/server/0246-Add-PhantomPreSpawnEvent.patch b/patches/server/0246-Add-PhantomPreSpawnEvent.patch
index 4109cb52be..d0dd39defb 100644
--- a/patches/server/0246-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0246-Add-PhantomPreSpawnEvent.patch
@@ -72,12 +72,12 @@ index 61ba99d99cc4e7782450ee6aa8b6c87b1a42cb3a..94ee9c399f59e0198b4d9bc2a4255e8b
                                                      groupdataentity = entityphantom.finalizeSpawn(world, difficultydamagescaler, MobSpawnType.NATURAL, groupdataentity, (CompoundTag) null);
                                                      world.addFreshEntityWithPassengers(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index ac43323a391c380458e741ba8a809c02f8b2903c..1ebb83fe98f573d0a982397096d4dba7249aef4b 100644
+index 0359c161448941f1b9fdac545a5c47a68f19b760..305a635b049741ac5e2670060c6818cb2c07e5ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -34,4 +34,11 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
-     public EntityType getType() {
-         return EntityType.PHANTOM;
+@@ -28,4 +28,11 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
+     public String toString() {
+         return "CraftPhantom";
      }
 +
 +    // Paper start
diff --git a/patches/server/0247-Add-More-Creeper-API.patch b/patches/server/0247-Add-More-Creeper-API.patch
index 54515a5898..850909dc61 100644
--- a/patches/server/0247-Add-More-Creeper-API.patch
+++ b/patches/server/0247-Add-More-Creeper-API.patch
@@ -38,12 +38,12 @@ index 17ce05e7f9d2615be28a095ef6d3126885df8771..7fe90ebc8eced53f72c7f935e4074507
  
      public boolean canDropMobsSkull() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index ea9dc2219cdff3976796e4848b0faa278656be63..63a8188010f045d5c17a1ecb63e8081ec86c2960 100644
+index e9a9154804bf2b26f4c613e81819e1cf448b76d0..6ccb32786b3abe1109dcc2d083cd231b70d8c6b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-@@ -94,4 +94,16 @@ public class CraftCreeper extends CraftMonster implements Creeper {
-     public EntityType getType() {
-         return EntityType.CREEPER;
+@@ -88,4 +88,16 @@ public class CraftCreeper extends CraftMonster implements Creeper {
+     public String toString() {
+         return "CraftCreeper";
      }
 +
 +    // Paper start
diff --git a/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
index 792ebf40e7..10f54f82b6 100644
--- a/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8fdeca08259f9da144ff3c7dd0a9d1335f8d3fbe..977fa9972f72f803363238dd2aeb26aaa02e7972 100644
+index ef566466afb9665824e3f5c5c16a411cdf1abadc..b440d2ff504ca84516da21ca604b8c72f2582a33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2832,6 +2832,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2827,6 +2827,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0252-Improve-death-events.patch b/patches/server/0252-Improve-death-events.patch
index b13e9071b9..5dac0b7d16 100644
--- a/patches/server/0252-Improve-death-events.patch
+++ b/patches/server/0252-Improve-death-events.patch
@@ -392,10 +392,10 @@ index 719f68f96e58ddcdd3592131c691d21263c81915..a35a0952ce8e1fc42e92734786d531c7
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 977fa9972f72f803363238dd2aeb26aaa02e7972..aeed267256671627eb121f9d062cd99ba34bc81c 100644
+index b440d2ff504ca84516da21ca604b8c72f2582a33..cd1937e8b66f6229ab1dc39576641a67aa127bc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2332,7 +2332,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2327,7 +2327,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void sendHealthUpdate() {
          FoodData foodData = this.getHandle().getFoodData();
diff --git a/patches/server/0267-Turtle-API.patch b/patches/server/0267-Turtle-API.patch
index f510a062bb..27129d8957 100644
--- a/patches/server/0267-Turtle-API.patch
+++ b/patches/server/0267-Turtle-API.patch
@@ -60,10 +60,10 @@ index 3a3f5e567fdefad6887e42c8e9147194ae0c4d89..fd6ce6e8a3a7c889276e06fb427e0d17
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 96462a29551c301d3c80029cab2bec3839914237..d3546fb082a56b4ce077ded5d25909e15f7eb593 100644
+index fac0317ff945db991e761ac8973f0d3d41ade26b..d44e6f4bb682d18c1497eee9fb2802f2bda6e840 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-@@ -34,4 +34,31 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
+@@ -28,4 +28,31 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
      public boolean isLayingEgg() {
          return this.getHandle().isLayingEgg();
      }
diff --git a/patches/server/0270-Add-more-Witch-API.patch b/patches/server/0270-Add-more-Witch-API.patch
index 3e1ba61773..7fd4790d82 100644
--- a/patches/server/0270-Add-more-Witch-API.patch
+++ b/patches/server/0270-Add-more-Witch-API.patch
@@ -60,12 +60,12 @@ index df024c3108df807772fc487f5c59004a59938bf2..701f6bf1d558cf0ec4bc1abb9e1f66d9
      public SoundEvent getCelebrateSound() {
          return SoundEvents.WITCH_CELEBRATE;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index eada1f0ff10d4c00f82a6f4411fe18b7184e9901..9039db1a72009342063d4db08e18e6aee18836e8 100644
+index 5024a102fe71d7013bc809bb4140763bd4c466e7..0acb96ae2102ab6af4b5610254ab3a1408ed9822 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-@@ -3,6 +3,13 @@ package org.bukkit.craftbukkit.entity;
+@@ -2,6 +2,13 @@ package org.bukkit.craftbukkit.entity;
+ 
  import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
  import org.bukkit.entity.Witch;
 +// Paper start
 +import com.destroystokyo.paper.entity.CraftRangedEntity;
@@ -77,7 +77,7 @@ index eada1f0ff10d4c00f82a6f4411fe18b7184e9901..9039db1a72009342063d4db08e18e6ae
  
  public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.Witch> { // Paper
      public CraftWitch(CraftServer server, net.minecraft.world.entity.monster.Witch entity) {
-@@ -28,4 +35,23 @@ public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.
+@@ -22,4 +29,23 @@ public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.
      public boolean isDrinkingPotion() {
          return this.getHandle().isDrinkingPotion();
      }
diff --git a/patches/server/0285-Add-more-Zombie-API.patch b/patches/server/0285-Add-more-Zombie-API.patch
index 47ee4744f5..52e2b083ce 100644
--- a/patches/server/0285-Add-more-Zombie-API.patch
+++ b/patches/server/0285-Add-more-Zombie-API.patch
@@ -69,10 +69,10 @@ index 86dc8bdfdc4eabef2266f3409366b373fb0ae13d..fed8b065172f40a2a5c251f46303fc4d
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 9e249a194980796248d07481df2cd04e80f079d8..1e0154f2d06b0cc5bc58ec2de98cbdce1346da35 100644
+index 47ee56a5623e0ebd4263ef9b9b92434a26a08311..1e303c3686e2fe4e05efe5a630dd2c1cb0f9edea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-@@ -93,6 +93,42 @@ public class CraftZombie extends CraftMonster implements Zombie {
+@@ -87,6 +87,42 @@ public class CraftZombie extends CraftMonster implements Zombie {
      @Override
      public void setAgeLock(boolean b) {
      }
diff --git a/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
index 912450c912..13edbabacd 100644
--- a/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c87cfe7deca4d0d5ef834d92d553082ccfb4697..9d6a37092022db1fd53531d1670ab5b46903e93f 100644
+index 24f9f3e5de710dd294d9d9ab054f9c84d1798be7..53444591285041a3ca93d5c96a7278bcab952742 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2879,6 +2879,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2874,6 +2874,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetAttackStrengthTicker();
      }
diff --git a/patches/server/0300-Entity-getEntitySpawnReason.patch b/patches/server/0300-Entity-getEntitySpawnReason.patch
index 2f9efd909c..90e5f345a8 100644
--- a/patches/server/0300-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0300-Entity-getEntitySpawnReason.patch
@@ -59,7 +59,7 @@ index e038240042366e1c491c04016982c91c91ee86cd..cccaf594392a0283f00986f182cc89d5
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7507ab77d379533196e27aaf1ad28632292bffb2..e8c4d27cd8403776873d8a492a61023d60ad158c 100644
+index dee47ff97e4f08154866d7628c3588a42f9892b9..0f40361ebfe64fae828f577529200e40e94b0e05 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -234,6 +234,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -120,10 +120,10 @@ index a9be524edb03c51300bc45d424fcf87c7491a8c0..a08c2dee792da1a54005f0a65a9eefab
                          // CraftBukkit start
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9614a0bd83139e8d62f60fe04f017e0cb0f828c9..e237320b2703a1281fab47f24516e8b7d83677be 100644
+index 185b3af59bf72244bbbfc46c3336e4f7f14e73a8..4dc676f29f04ba8d52b2fe3778347d2c2f46eebe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1296,5 +1296,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1307,5 +1307,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean fromMobSpawner() {
          return getHandle().spawnedViaMobSpawner;
      }
diff --git a/patches/server/0349-Entity-Jump-API.patch b/patches/server/0349-Entity-Jump-API.patch
index 8238fe1d73..1d0f28d381 100644
--- a/patches/server/0349-Entity-Jump-API.patch
+++ b/patches/server/0349-Entity-Jump-API.patch
@@ -48,10 +48,10 @@ index 02f962eed1d85e8c532264f63666d26401d6a8f2..c245acdbaa84cc795e341ed042a0d8d9
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 5a721647807f455e73e862a1244520787ebee76d..65fbc8b10c536f3258a455950263bd97dd6e30e3 100644
+index 2913ad431b09a75106115257729960f8ba1637f4..f0457dd3d179dab3e164279f30690058549e530a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -911,5 +911,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -906,5 +906,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public org.bukkit.inventory.EquipmentSlot getHandRaised() {
          return getHandle().getUsedItemHand() == net.minecraft.world.InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND;
      }
diff --git a/patches/server/0384-Villager-Restocks-API.patch b/patches/server/0384-Villager-Restocks-API.patch
index c424a6d1fe..87278ca4a8 100644
--- a/patches/server/0384-Villager-Restocks-API.patch
+++ b/patches/server/0384-Villager-Restocks-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Villager Restocks API
 public net.minecraft.world.entity.npc.Villager numberOfRestocksToday
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index de8eec8d0294f2eb5ae73e060df9805758b9881d..0c92bbe9900a9d598ad90f2ba12808c776ba8f04 100644
+index 0f12be424a9868c7c34174f92b503cd63399df19..6160f2c2886569b4400080d11beca399ef002ea0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -91,6 +91,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
+@@ -85,6 +85,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
          this.getHandle().setVillagerXp(experience);
      }
  
diff --git a/patches/server/0393-Add-villager-reputation-API.patch b/patches/server/0393-Add-villager-reputation-API.patch
index 0b402ed019..570f87c373 100644
--- a/patches/server/0393-Add-villager-reputation-API.patch
+++ b/patches/server/0393-Add-villager-reputation-API.patch
@@ -57,10 +57,10 @@ index a28f359202e6502c6ea5e9c918ec0b3e9a3fca61..76dffb2705e5207db96895f82f1c7c56
  
      static record GossipEntry(UUID target, GossipType type, int value) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index 0c92bbe9900a9d598ad90f2ba12808c776ba8f04..6f7977b492ce01e7cda7872c42bd7f2386d3e745 100644
+index 6160f2c2886569b4400080d11beca399ef002ea0..b27b9001b8eb74c713e6766f0919110432775a2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -17,6 +17,13 @@ import org.bukkit.entity.Villager;
+@@ -16,6 +16,13 @@ import org.bukkit.entity.Villager;
  import org.bukkit.entity.ZombieVillager;
  import org.bukkit.event.entity.CreatureSpawnEvent;
  
@@ -74,7 +74,7 @@ index 0c92bbe9900a9d598ad90f2ba12808c776ba8f04..6f7977b492ce01e7cda7872c42bd7f23
  public class CraftVillager extends CraftAbstractVillager implements Villager {
  
      public CraftVillager(CraftServer server, net.minecraft.world.entity.npc.Villager entity) {
-@@ -146,4 +153,45 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
+@@ -140,4 +147,45 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
      public static VillagerProfession bukkitToNmsProfession(Profession bukkit) {
          return BuiltInRegistries.VILLAGER_PROFESSION.get(CraftNamespacedKey.toMinecraft(bukkit.getKey()));
      }
diff --git a/patches/server/0415-Improve-Arrow-API.patch b/patches/server/0415-Improve-Arrow-API.patch
index b2c31e3793..a6dc061557 100644
--- a/patches/server/0415-Improve-Arrow-API.patch
+++ b/patches/server/0415-Improve-Arrow-API.patch
@@ -9,10 +9,10 @@ to set the arrow's "noclip" status
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index ce6291f2ccfb1ea3c069dd9f053446413894d743..d443b171191d150eed62d000a1079ede6bcf9052 100644
+index e734cdb23f6289ac1cf3494f8efd2cae0562657e..5056ec1ad51be9209591d34d32d256c350feed63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-@@ -100,6 +100,23 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
+@@ -99,6 +99,23 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
          this.getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal());
      }
  
diff --git a/patches/server/0433-Add-entity-liquid-API.patch b/patches/server/0433-Add-entity-liquid-API.patch
index b9499300da..42e5037e27 100644
--- a/patches/server/0433-Add-entity-liquid-API.patch
+++ b/patches/server/0433-Add-entity-liquid-API.patch
@@ -8,10 +8,10 @@ public net.minecraft.world.entity.Entity isInRain()Z
 public net.minecraft.world.entity.Entity isInBubbleColumn()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index e237320b2703a1281fab47f24516e8b7d83677be..c480cddf693ec9f42b0e8a8aec3cc7828e337312 100644
+index 4dc676f29f04ba8d52b2fe3778347d2c2f46eebe..5052432652c2e7f09a233e267bece5fb1e3e3bf1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1301,5 +1301,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1312,5 +1312,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() {
          return getHandle().spawnReason;
      }
diff --git a/patches/server/0448-Brand-support.patch b/patches/server/0448-Brand-support.patch
index 0523269f6c..d0ff6bc97c 100644
--- a/patches/server/0448-Brand-support.patch
+++ b/patches/server/0448-Brand-support.patch
@@ -56,10 +56,10 @@ index a3d7f9cc074ce83815938a77c6119af95790d7e7..6f43de26f3d757dc14572c2d42dd8b66
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9ad4a64420a49a13549d7c2ab414bfa08fa84b75..3daaaff22ce54fa84c999d81ff6138ab50144d54 100644
+index 2e09a49d52cbd23d3181d41a0540d11a3bd80fca..d5f03bd485403fd2222bba0dbbf37e438b99ef28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2996,6 +2996,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2991,6 +2991,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
index b52d3e8533..3fd0b25510 100644
--- a/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0449-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 6819e9ba64e5083ec37c50c274990311336d7b7f..cf17cb842212af53d70b8dced4dcbc04dac6a41d 100644
+index 5e874253a150bda008d8da29691ddeaad0fee1de..4bb7c18bcf5c551fa5121745938a9fa76d2a7173 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -925,5 +925,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -920,5 +920,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              ((Mob) getHandle()).getJumpControl().jump();
          }
      }
diff --git a/patches/server/0460-Add-more-Evoker-API.patch b/patches/server/0460-Add-more-Evoker-API.patch
index 0fce1f166a..742d85985e 100644
--- a/patches/server/0460-Add-more-Evoker-API.patch
+++ b/patches/server/0460-Add-more-Evoker-API.patch
@@ -8,7 +8,7 @@ public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/
 public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/Sheep;
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
-index 91d07e6996e315734689ea25336992b0ed21cf25..7e861636710aa44ed36e7f20c6320dabb809c35d 100644
+index 93ffe2ac37b03aa289881f5f12c7aa7f1d835eda..b66dd5c5c5d98c9285e0d0a4ad4b99a66419f732 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
 @@ -1,5 +1,6 @@
@@ -17,8 +17,8 @@ index 91d07e6996e315734689ea25336992b0ed21cf25..7e861636710aa44ed36e7f20c6320dab
 +import net.minecraft.world.entity.animal.Sheep;
  import net.minecraft.world.entity.monster.SpellcasterIllager;
  import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
-@@ -35,4 +36,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
+ import org.bukkit.entity.Evoker;
+@@ -29,4 +30,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
      public void setCurrentSpell(Evoker.Spell spell) {
          this.getHandle().setIsCastingSpell(spell == null ? SpellcasterIllager.IllagerSpell.NONE : SpellcasterIllager.IllagerSpell.byId(spell.ordinal()));
      }
diff --git a/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index b9058e61ed..e0e7770780 100644
--- a/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -69,10 +69,10 @@ index 369298dfd437c1c83801f3d4ba63484ee1b969fe..ae2b95f53e875716489821dc9b0a3a35
                          if (entity instanceof Mob) {
                              Mob entityinsentient = (Mob) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c480cddf693ec9f42b0e8a8aec3cc7828e337312..4002311a4f8a0b137f743a0a1ded52587719765b 100644
+index 5052432652c2e7f09a233e267bece5fb1e3e3bf1..efa3402b776551cddbfcab834740cdd75f65178d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -574,7 +574,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -580,7 +580,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
  
          // entity.setLocation() throws no event, and so cannot be cancelled
diff --git a/patches/server/0470-Entity-isTicking.patch b/patches/server/0470-Entity-isTicking.patch
index d1a3ffc59c..cfd12d32e2 100644
--- a/patches/server/0470-Entity-isTicking.patch
+++ b/patches/server/0470-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b8f49e7b8727c757950a74c834eed4871de0e4ce..a0718a0cc2ed15a5350b1ee77747d93c6a92048d 100644
+index 71d2557e6e244384042ce3b13cc6e3008227399d..73a2ddf2806ea1e1826d553b7d13cf4d58be43fc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4438,5 +4438,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -19,10 +19,10 @@ index b8f49e7b8727c757950a74c834eed4871de0e4ce..a0718a0cc2ed15a5350b1ee77747d93c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 4002311a4f8a0b137f743a0a1ded52587719765b..702987ef563db2e0819771e8c3be822e4644ee3f 100644
+index efa3402b776551cddbfcab834740cdd75f65178d..2a0299d5dcafb9659ffd66fe2cc12843208a7408 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1336,5 +1336,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1347,5 +1347,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isInLava() {
          return getHandle().isInLava();
      }
diff --git a/patches/server/0487-Item-no-age-no-player-pickup.patch b/patches/server/0487-Item-no-age-no-player-pickup.patch
index 0a59edc058..6501bec6d6 100644
--- a/patches/server/0487-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0487-Item-no-age-no-player-pickup.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Item no age & no player pickup
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 5f36b0fd12ccd0e7ec9a7f61c56f08307844935f..27e961653dc66fbe8d5421eef04260b91ca410f4 100644
+index 66e69cb13e2d82acc0a2398625766a49bc701a09..ff6868ab31cec208045353c842f20ca31191bc0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -10,6 +10,12 @@ import org.bukkit.entity.Item;
+@@ -9,6 +9,12 @@ import org.bukkit.entity.Item;
  import org.bukkit.inventory.ItemStack;
  
  public class CraftItem extends CraftEntity implements Item {
@@ -21,7 +21,7 @@ index 5f36b0fd12ccd0e7ec9a7f61c56f08307844935f..27e961653dc66fbe8d5421eef04260b9
      private final ItemEntity item;
  
      public CraftItem(CraftServer server, Entity entity, ItemEntity item) {
-@@ -76,6 +82,26 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -75,6 +81,26 @@ public class CraftItem extends CraftEntity implements Item {
      public void setCanMobPickup(boolean canMobPickup) {
          item.canMobPickup = canMobPickup;
      }
diff --git a/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index e9679947e5..0a051370d4 100644
--- a/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3100aab6abf3a973b2e37efc7c1a86d9fdbe7b3c..85a341d99c90d4d4f4ce09d4e1b407c6575309f6 100644
+index 5179e70d91bdbf2f466e15ade3466f30e8a3fe2d..4a363ffbf6ee527b1eaea00e41b3387cb31e70a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2525,7 +2525,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2520,7 +2520,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null) {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
diff --git a/patches/server/0495-Add-LivingEntity-clearActiveItem.patch b/patches/server/0495-Add-LivingEntity-clearActiveItem.patch
index 4651be5e46..7f1162da57 100644
--- a/patches/server/0495-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0495-Add-LivingEntity-clearActiveItem.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index cf17cb842212af53d70b8dced4dcbc04dac6a41d..d7e36c2f44303b5ca053e3a7d5fbf18bb02e1ddb 100644
+index 4bb7c18bcf5c551fa5121745938a9fa76d2a7173..fa6b00e3055224a53eb6ec93431d70df27b6c6d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -892,6 +892,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -887,6 +887,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().getUseItem().asBukkitMirror();
      }
  
diff --git a/patches/server/0498-More-lightning-API.patch b/patches/server/0498-More-lightning-API.patch
index f3cc50d6cc..50620fb3ad 100644
--- a/patches/server/0498-More-lightning-API.patch
+++ b/patches/server/0498-More-lightning-API.patch
@@ -8,10 +8,10 @@ public net.minecraft.world.entity.LightningBolt life
 public net.minecraft.world.entity.LightningBolt flashes
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-index f7991ff14ef9cda0327b8621bf615b49cffd7ac5..e515e819774bfb31ec03f05a5502921e66f2b0e2 100644
+index a244385cc0c297d018e860d0b6e4570084d9d0e7..dbb435ec7a930c3b410fc4311f7eb0a4d2faa987 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-@@ -45,4 +45,38 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
+@@ -39,4 +39,38 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0507-Expose-LivingEntity-hurt-direction.patch b/patches/server/0507-Expose-LivingEntity-hurt-direction.patch
index f287602b71..c7e1090f6c 100644
--- a/patches/server/0507-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0507-Expose-LivingEntity-hurt-direction.patch
@@ -18,7 +18,7 @@ index a8731cf957da9aad7ed6f5d372500bc34afd32ca..b36492efc3d6338e0099988c1ff31e72
      public boolean affectsSpawning = true;
      // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index b0d2038cf2622c8ee7f810026ed735ff954d7ad0..a8aa176b8afd45fada9529d4d0b92000299faf1b 100644
+index f4cda5fbf12c59dc1ecec4aac6719837444382e2..8d1bbc1ac3dbc10e940a0715ebfa1d5a2674b303 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -126,6 +126,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -36,10 +36,10 @@ index b0d2038cf2622c8ee7f810026ed735ff954d7ad0..a8aa176b8afd45fada9529d4d0b92000
      public int getSleepTicks() {
          return this.getHandle().sleepCounter;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d7e36c2f44303b5ca053e3a7d5fbf18bb02e1ddb..9a8802a893013c32480e463c1959e56ecab4e50c 100644
+index fa6b00e3055224a53eb6ec93431d70df27b6c6d1..eae5d75cd93416235690196cf2c88e7a17e1b97a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -937,5 +937,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -932,5 +932,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
          getHandle().take(((CraftItem) item).getHandle(), quantity);
      }
diff --git a/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index f9e803f989..b55ce8ee32 100644
--- a/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement API to get Material from Boats and Minecarts
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-index b2639e15d7b9f7068dcba3a3b80f5a6a897f0de9..dd7076938b04d4b36e3360a883bae81ced455fda 100644
+index ff83b62207652903334e3c2631f22a6456788fe2..d7d54df20984352d84ffb9f7b7da583c34587b85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-@@ -80,6 +80,13 @@ public class CraftBoat extends CraftVehicle implements Boat {
+@@ -79,6 +79,13 @@ public class CraftBoat extends CraftVehicle implements Boat {
          this.getHandle().landBoats = workOnLand;
      }
  
diff --git a/patches/server/0521-Zombie-API-breaking-doors.patch b/patches/server/0521-Zombie-API-breaking-doors.patch
index 0b6d0327e3..da4c6d2dce 100644
--- a/patches/server/0521-Zombie-API-breaking-doors.patch
+++ b/patches/server/0521-Zombie-API-breaking-doors.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Zombie API - breaking doors
 public net.minecraft.world.entity.monster.Zombie supportsBreakDoorGoal()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 1e0154f2d06b0cc5bc58ec2de98cbdce1346da35..9f4da46dce54fe4207e24b49402fe0d3fa548e29 100644
+index 1e303c3686e2fe4e05efe5a630dd2c1cb0f9edea..ed211b123354ece21dd8beae7192a26727f5124f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-@@ -128,6 +128,11 @@ public class CraftZombie extends CraftMonster implements Zombie {
+@@ -122,6 +122,11 @@ public class CraftZombie extends CraftMonster implements Zombie {
      public void setShouldBurnInDay(boolean shouldBurnInDay) {
          getHandle().setShouldBurnInDay(shouldBurnInDay);
      }
diff --git a/patches/server/0554-living-entity-allow-attribute-registration.patch b/patches/server/0554-living-entity-allow-attribute-registration.patch
index b08ad5de90..bb7fc5b061 100644
--- a/patches/server/0554-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0554-living-entity-allow-attribute-registration.patch
@@ -41,10 +41,10 @@ index 233e372ba5d785352c9ac12dac37395bac63315c..0e61caa5c9f21788fbeaa90ed75d23e1
          return BuiltInRegistries.ATTRIBUTE.get(CraftNamespacedKey.toMinecraft(attribute.getKey()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9a8802a893013c32480e463c1959e56ecab4e50c..04816027a7affebb6b3a8e4d1988d56a3d071312 100644
+index eae5d75cd93416235690196cf2c88e7a17e1b97a..918a938732cd08756f8498c5422f4475fd3b531d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -715,6 +715,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -710,6 +710,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().craftAttributes.getAttribute(attribute);
      }
  
diff --git a/patches/server/0555-fix-dead-slime-setSize-invincibility.patch b/patches/server/0555-fix-dead-slime-setSize-invincibility.patch
index 91a270bc9e..82acef5e68 100644
--- a/patches/server/0555-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0555-fix-dead-slime-setSize-invincibility.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] fix dead slime setSize invincibility
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index 743af3b71f2d007290fa4e4da85973b491d95135..c580922c64f0e26177494fb87ecd0c1d086c5ef9 100644
+index 9b219beb8922bf0701e538bcf874f0eb922f60bb..2b1211ee410a0246195053ad041eaa131f859bcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-@@ -17,7 +17,7 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
+@@ -16,7 +16,7 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
  
      @Override
      public void setSize(int size) {
diff --git a/patches/server/0557-Expose-Tracked-Players.patch b/patches/server/0557-Expose-Tracked-Players.patch
index 35f7177f1c..7508d57dbc 100644
--- a/patches/server/0557-Expose-Tracked-Players.patch
+++ b/patches/server/0557-Expose-Tracked-Players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 702987ef563db2e0819771e8c3be822e4644ee3f..d3eaf054b1815003934e7f2d904a05a5d8abc3a5 100644
+index 2a0299d5dcafb9659ffd66fe2cc12843208a7408..fa31c69a84acd20c23f6d466fb0fb36eb4209206 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1341,5 +1341,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1352,5 +1352,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isTicking() {
          return getHandle().isTicking();
      }
diff --git a/patches/server/0594-Add-more-WanderingTrader-API.patch b/patches/server/0594-Add-more-WanderingTrader-API.patch
index 9e5ed86cee..c46d758e8c 100644
--- a/patches/server/0594-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0594-Add-more-WanderingTrader-API.patch
@@ -33,10 +33,10 @@ index 65592c41b1519eff77ccd7ddd3c885058f3ed138..2e7de2378e01aed514e237029d6d64e7
          this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
          this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-index 65b052567d1d855021d7273672b4354aba0a42a4..fa7107593b20e0151d8d67104e4a92dcc697d461 100644
+index 758eb33c565999e6321b96ff0f733478ffbbd9cc..4a6700d7d2f40cf516054e2e3d09049f1ce4fd17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-@@ -34,4 +34,26 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
+@@ -28,4 +28,26 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
      public void setDespawnDelay(int despawnDelay) {
          this.getHandle().setDespawnDelay(despawnDelay);
      }
diff --git a/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 45fefcead5..1e99a5d4c4 100644
--- a/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -110,10 +110,10 @@ index 5ff566186431440c25a26900aba14e4adb642031..5beaa2bb0d58fe477ce8d2de8b77600d
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 1ebb83fe98f573d0a982397096d4dba7249aef4b..6b71f8b373ef524f5df16023b773e92249bb2532 100644
+index 305a635b049741ac5e2670060c6818cb2c07e5ab..9304e201db1ec96d0916aa8ea781f3e4bc7991e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -40,5 +40,15 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
+@@ -34,5 +34,15 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
      public java.util.UUID getSpawningEntity() {
          return getHandle().getSpawningEntity();
      }
diff --git a/patches/server/0605-More-Enchantment-API.patch b/patches/server/0605-More-Enchantment-API.patch
index 6e3b652e1b..cfea07c2f9 100644
--- a/patches/server/0605-More-Enchantment-API.patch
+++ b/patches/server/0605-More-Enchantment-API.patch
@@ -66,10 +66,10 @@ index 57decf4156f176ebcc988478c17856cbc555c5e4..3d0ce0803e1da8a2681a3cb41096ac94
  
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 04816027a7affebb6b3a8e4d1988d56a3d071312..af4d84e35c8f28589edbac9824d8a5770c60552b 100644
+index 918a938732cd08756f8498c5422f4475fd3b531d..dcc7c8efe0b9d6b57841d8318499d490a3f7aa73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -954,5 +954,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -949,5 +949,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setHurtDirection(float hurtDirection) {
          throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
      }
diff --git a/patches/server/0626-Line-Of-Sight-Changes.patch b/patches/server/0626-Line-Of-Sight-Changes.patch
index d605e46e7b..3c056db6c6 100644
--- a/patches/server/0626-Line-Of-Sight-Changes.patch
+++ b/patches/server/0626-Line-Of-Sight-Changes.patch
@@ -19,7 +19,7 @@ index b9a2da15a49b1ddfd550ea26091990d495664484..80a59b869c898e40083607db5aa92115
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 5a17e89435a02c9b25e0891b83e82b2ed1ff8ee5..bb383c090ea6948a19cf8609b76ba517689b1562 100644
+index 42b6369015cdfea983b1489f7b99428eaa8c62a5..76195cfe2be5931401fd66454013b829ddf265ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -992,5 +992,16 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -40,10 +40,10 @@ index 5a17e89435a02c9b25e0891b83e82b2ed1ff8ee5..bb383c090ea6948a19cf8609b76ba517
      // 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 af4d84e35c8f28589edbac9824d8a5770c60552b..afcf10fa6a4446698cd00ac94dded0f61297880c 100644
+index dcc7c8efe0b9d6b57841d8318499d490a3f7aa73..92578adeab74b53e2001262986f883913aa15f05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -588,6 +588,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -583,6 +583,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().hasLineOfSight(((CraftEntity) other).getHandle());
      }
  
diff --git a/patches/server/0631-Missing-Entity-API.patch b/patches/server/0631-Missing-Entity-API.patch
index a22fe2b530..fa9d2f734f 100644
--- a/patches/server/0631-Missing-Entity-API.patch
+++ b/patches/server/0631-Missing-Entity-API.patch
@@ -359,7 +359,7 @@ index 61d4877b4f74362e38104bfeacb7d66534ad798e..454dd67920826b8b62c2654abfd43fc0
      @Override
      protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index bb383c090ea6948a19cf8609b76ba517689b1562..49d6ae8465397c4210a6f9599d14008518c30cd0 100644
+index 76195cfe2be5931401fd66454013b829ddf265ff..2732b952ab18b49f72efcc22facef4f9b2b4fa4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -828,14 +828,19 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -430,10 +430,10 @@ index 3f1f4d65525562b3117fdc21c8a7f535b12c3c46..90a989c7c9de6f9ba55ab640761915e9
 +    // Paper end - Horse API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
-index 3034a3902a946162f48840682d434e554de4eae9..c73a9c930c6fa3a7b85986048dca8dc11aa05238 100644
+index 710176514a55ff6de87d29ed90f4e14c080a2ac7..00201cf495355939a4f35306b0e7b130c07e5c02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
-@@ -228,4 +228,17 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
+@@ -222,4 +222,17 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
              this.getHandle().setOwner(null);
          }
      }
@@ -452,10 +452,10 @@ index 3034a3902a946162f48840682d434e554de4eae9..c73a9c930c6fa3a7b85986048dca8dc1
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java
-index 3b960a832df1fe496ea036962083f1ac507a7db7..e405488ba5e0159ff84a72fac1d2da6e9c45238e 100644
+index f049fd8b8fdfca6e64010741d000a2e3efddc83b..7592ecac3d0893974d9d22ce40c50f1008ab9695 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java
-@@ -33,4 +33,25 @@ public class CraftBat extends CraftAmbient implements Bat {
+@@ -27,4 +27,25 @@ public class CraftBat extends CraftAmbient implements Bat {
      public void setAwake(boolean state) {
          this.getHandle().setResting(!state);
      }
@@ -482,10 +482,10 @@ index 3b960a832df1fe496ea036962083f1ac507a7db7..e405488ba5e0159ff84a72fac1d2da6e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java
-index 099c2422d03ebb6ee36f5c93f4cfad5acd2fdeeb..e222a6ab6afbc43a3d358a79855a818b0e481fdb 100644
+index 86ad6073a130100258908d3f2c93c54e21e998f3..17608e0e8cc5288905d2e42ae1429f7d947511fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java
-@@ -92,4 +92,42 @@ public class CraftBee extends CraftAnimals implements Bee {
+@@ -86,4 +86,42 @@ public class CraftBee extends CraftAnimals implements Bee {
      public void setCannotEnterHiveTicks(int ticks) {
          this.getHandle().setStayOutOfHiveCountdown(ticks);
      }
@@ -529,10 +529,10 @@ index 099c2422d03ebb6ee36f5c93f4cfad5acd2fdeeb..e222a6ab6afbc43a3d358a79855a818b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
-index d2531a2a323be74169324a5cb2c558655c380ea6..273a062090f4c6f6ffd5a4238623b32af497f6b6 100644
+index 566da8f88d9ee76baf41e5a4cdf0b73fd424c6b9..533a339a2c7369475f1a66ae2c8bb1df04914614 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
-@@ -50,4 +50,25 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
+@@ -44,4 +44,25 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
      public void setCollarColor(DyeColor color) {
          this.getHandle().setCollarColor(net.minecraft.world.item.DyeColor.byId(color.getWoolData()));
      }
@@ -559,13 +559,14 @@ index d2531a2a323be74169324a5cb2c558655c380ea6..273a062090f4c6f6ffd5a4238623b32a
 +    // Paper End - More cat api
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
-index 178328042ad62f32ca2ae14a6bcf2b694418eb8c..fd87f979ee207dac13e4028d76bdd40911509e56 100644
+index c2c653e269330b8494eca98e9cf5a4abb79a6933..5e0b611db52452c00bf3cd2fc07dd713f238a581 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
-@@ -24,4 +24,25 @@ public class CraftChicken extends CraftAnimals implements Chicken {
-     public EntityType getType() {
-         return EntityType.CHICKEN;
+@@ -18,4 +18,26 @@ public class CraftChicken extends CraftAnimals implements Chicken {
+     public String toString() {
+         return "CraftChicken";
      }
++
 +    // Paper start
 +    @Override
 +    public boolean isChickenJockey() {
@@ -589,12 +590,12 @@ index 178328042ad62f32ca2ae14a6bcf2b694418eb8c..fd87f979ee207dac13e4028d76bdd409
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java
-index fb4b3d30eded561f526dbd2daa74e49149eb55ac..801ed8241cad4ac890a6d99cd19a3dd7490d9339 100644
+index fa0bf7db880063427ba12df1df1c72240fff93e9..63e6b07e3b159c74d9ef17be20b5ab43d07f0f5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java
-@@ -4,7 +4,7 @@ import org.bukkit.craftbukkit.CraftServer;
+@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Cod;
- import org.bukkit.entity.EntityType;
  
 -public class CraftCod extends CraftFish implements Cod {
 +public class CraftCod extends io.papermc.paper.entity.PaperSchoolableFish implements Cod { // Paper - School Fish API
@@ -602,10 +603,10 @@ index fb4b3d30eded561f526dbd2daa74e49149eb55ac..801ed8241cad4ac890a6d99cd19a3dd7
      public CraftCod(CraftServer server, net.minecraft.world.entity.animal.Cod entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index fe829a74e23442c93bb5565589e8f33300ea01e1..57704564acc11ea688026aad8be4e612e36803ff 100644
+index cb161c3d1a08d9c143201040018664298e98eafe..92eb829161079c4a96447698aee58cc6e7cbd29f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-@@ -41,6 +41,28 @@ public class CraftEnderman extends CraftMonster implements Enderman {
+@@ -40,6 +40,28 @@ public class CraftEnderman extends CraftMonster implements Enderman {
          this.getHandle().setCarriedBlock(blockData == null ? null : ((CraftBlockData) blockData).getState());
      }
  
@@ -635,10 +636,10 @@ index fe829a74e23442c93bb5565589e8f33300ea01e1..57704564acc11ea688026aad8be4e612
      public EnderMan getHandle() {
          return (EnderMan) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-index 04976616da8c85b1278dad33ff05554aa74a6b33..75c7645fb5732c43d1da15181cf5c7ee4c3ecd6c 100644
+index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee892a27c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-@@ -34,4 +34,15 @@ public class CraftEndermite extends CraftMonster implements Endermite {
+@@ -28,4 +28,15 @@ public class CraftEndermite extends CraftMonster implements Endermite {
      public void setPlayerSpawned(boolean playerSpawned) {
          // Nop
      }
@@ -655,10 +656,10 @@ index 04976616da8c85b1278dad33ff05554aa74a6b33..75c7645fb5732c43d1da15181cf5c7ee
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d3eaf054b1815003934e7f2d904a05a5d8abc3a5..02dc40b6f7b82ce503c33fb4af26cbb20c9d5b7a 100644
+index fa31c69a84acd20c23f6d466fb0fb36eb4209206..e29e1af97c1d50603135723a7a16fc1806718ca2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -227,10 +227,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -233,10 +233,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
                      else { return new CraftSquid(server, (Squid) entity); }
                  }
                  else if (entity instanceof AbstractFish) {
@@ -679,10 +680,10 @@ index d3eaf054b1815003934e7f2d904a05a5d8abc3a5..02dc40b6f7b82ce503c33fb4af26cbb2
                      else { return new CraftFish(server, (AbstractFish) entity); }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
-index 007b69c201672483103397c945634d7518f5861c..9e5c9b1c4299986b2fae7e191d7661549376a331 100644
+index 08911b340c45f0b6d4657bfe46f0b153997e4d49..6149067a14b950e727d3387055016a19e55c0fc6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
-@@ -119,4 +119,41 @@ public class CraftFox extends CraftAnimals implements Fox {
+@@ -113,4 +113,41 @@ public class CraftFox extends CraftAnimals implements Fox {
      public boolean isFaceplanted() {
          return this.getHandle().isFaceplanted();
      }
@@ -725,10 +726,10 @@ index 007b69c201672483103397c945634d7518f5861c..9e5c9b1c4299986b2fae7e191d766154
 +    // Paper end - Add more fox behavior API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
-index 9e7a9520737f56a20a130b624ae66f3ee90fa3e7..814cded47a04c25391575af036f53dc409121813 100644
+index 24938472b7898c4111a1f7244b207fd32fcf6e80..3adcf36c7b4beb0f752f91b7333593a610ec118c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
-@@ -34,4 +34,17 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
+@@ -28,4 +28,17 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
      public void setCharging(boolean flag) {
          this.getHandle().setCharging(flag);
      }
@@ -747,12 +748,12 @@ index 9e7a9520737f56a20a130b624ae66f3ee90fa3e7..814cded47a04c25391575af036f53dc4
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 5500d5768bb22f70b99aa28cf4541b4871e12139..4d7a2c4c1001aefe9fcd4be8dbcb414f721bfff9 100644
+index 9986ac517e11b076a29a8c8e3f480ec286fa5825..0ad16ee7b33582d214dab41eeee378d52c8e38ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -64,4 +64,36 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
-     public EntityType getType() {
-         return EntityType.LLAMA;
+@@ -58,4 +58,36 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
+     public String toString() {
+         return "CraftLlama";
      }
 +
 +    // Paper start
@@ -788,10 +789,10 @@ index 5500d5768bb22f70b99aa28cf4541b4871e12139..4d7a2c4c1001aefe9fcd4be8dbcb414f
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index ee9648739fb39c5842063d7442df6eb5c9336d7f..67fe56cc4c2af24f6bd883c6e14851019b0b9523 100644
+index 3ba7e8ef1035e1de2c195b6919fe57aee398af51..fbabf86510c582e372b0b1ac5585c7287734c985 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-@@ -39,4 +39,20 @@ public final class CraftMinecartHopper extends CraftMinecartContainer implements
+@@ -33,4 +33,20 @@ public final class CraftMinecartHopper extends CraftMinecartContainer implements
      public void setEnabled(boolean enabled) {
          ((MinecartHopper) getHandle()).setEnabled(enabled);
      }
@@ -813,10 +814,10 @@ index ee9648739fb39c5842063d7442df6eb5c9336d7f..67fe56cc4c2af24f6bd883c6e1485101
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
-index 383c6d464e8077eeb900d61baa6a02f15a818b01..20eaa3424428b8b30fd15591b660983cb7fc4375 100644
+index de54d45d1764228bdbfb5a73173b551f25440898..3e0049c2442c5941e02da0b0fb643784746cb2a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
-@@ -28,6 +28,38 @@ public class CraftMushroomCow extends CraftCow implements MushroomCow {
+@@ -27,6 +27,38 @@ public class CraftMushroomCow extends CraftCow implements MushroomCow {
          this.getHandle().setVariant(net.minecraft.world.entity.animal.MushroomCow.MushroomType.values()[variant.ordinal()]);
      }
  
@@ -856,10 +857,10 @@ index 383c6d464e8077eeb900d61baa6a02f15a818b01..20eaa3424428b8b30fd15591b660983c
      public String toString() {
          return "CraftMushroomCow";
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
-index ff9f711b83a8ea1bf4135751a9ba865224bce787..1f6dcad764240e15083731d017f9bb1c5c84622f 100644
+index 5467e4a74b70ff57b49d9e6bc686c493178f8511..56f9630dbe5d18d5ec33dc85f6531723022d6a3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
-@@ -46,6 +46,32 @@ public class CraftPanda extends CraftAnimals implements Panda {
+@@ -40,6 +40,32 @@ public class CraftPanda extends CraftAnimals implements Panda {
      public void setHiddenGene(Gene gene) {
          this.getHandle().setHiddenGene(CraftPanda.toNms(gene));
      }
@@ -893,10 +894,10 @@ index ff9f711b83a8ea1bf4135751a9ba865224bce787..1f6dcad764240e15083731d017f9bb1c
      @Override
      public boolean isRolling() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 6b71f8b373ef524f5df16023b773e92249bb2532..63e31c237dc3cf37a5e06c1cf3f030c9f1df3d38 100644
+index 9304e201db1ec96d0916aa8ea781f3e4bc7991e6..8338effd39b1709dbe578e247710a8e58d83e3aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -50,5 +50,25 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
+@@ -44,5 +44,25 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
      public void setShouldBurnInDay(boolean shouldBurnInDay) {
          getHandle().setShouldBurnInDay(shouldBurnInDay);
      }
@@ -923,10 +924,10 @@ index 6b71f8b373ef524f5df16023b773e92249bb2532..63e31c237dc3cf37a5e06c1cf3f030c9
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-index aeda5fc001fe4ce55ee467240b275b6050a29f98..48d0a4e42e1b90d1323784d1284acabfe9497dd6 100644
+index 8b9695de6e3411cbcc2f97e4a4e243ec1d1dd076..f69c81e801569deae8a2536a1a57767cd2e3897f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-@@ -90,4 +90,15 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.dest
+@@ -84,4 +84,15 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.dest
      public String toString() {
          return "CraftPiglin";
      }
@@ -943,12 +944,12 @@ index aeda5fc001fe4ce55ee467240b275b6050a29f98..48d0a4e42e1b90d1323784d1284acabf
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
-index da1488c9cae53bd554727c850da2192adda2478a..30a0eac179c86b0fe94a2a40b5bfcd3eee01e53b 100644
+index bf216a7b5438a16f1f50fa6d2fb67eebe1408ad3..3c4cbde06c768912332edf57768eabe082e47345 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
-@@ -23,4 +23,16 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear {
-     public EntityType getType() {
-         return EntityType.POLAR_BEAR;
+@@ -17,4 +17,16 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear {
+     public String toString() {
+         return "CraftPolarBear";
      }
 +
 +    // Paper start
@@ -964,10 +965,10 @@ index da1488c9cae53bd554727c850da2192adda2478a..30a0eac179c86b0fe94a2a40b5bfcd3e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-index beeff3c0ce623973f7be523957a2856bba397421..3cd6052ae1e2db15d26157679506ba63a9a59a2f 100644
+index 3c86feb0fea21d37e0c5175776a3d7844272e911..1a1dfb9e5164f9962059ebf11a9c3334a1987153 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
-@@ -36,4 +36,15 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
+@@ -30,4 +30,15 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
      public void setRabbitType(Type type) {
          this.getHandle().setVariant(net.minecraft.world.entity.animal.Rabbit.Variant.values()[type.ordinal()]);
      }
@@ -984,10 +985,10 @@ index beeff3c0ce623973f7be523957a2856bba397421..3cd6052ae1e2db15d26157679506ba63
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
-index 796b784d7a50e3a4aea5c67b7cd16d288ed392b0..84899714b96a7ed31ceee10373a62c37cab2ad2a 100644
+index cae59f77c704a5b9515dc4917ed5fdc89631ecfb..09796ce15658e3f7c223a265a547a51ee729ed40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java
-@@ -24,4 +24,35 @@ public class CraftRavager extends CraftRaider implements Ravager {
+@@ -18,4 +18,35 @@ public class CraftRavager extends CraftRaider implements Ravager {
      public String toString() {
          return "CraftRavager";
      }
@@ -1024,11 +1025,11 @@ index 796b784d7a50e3a4aea5c67b7cd16d288ed392b0..84899714b96a7ed31ceee10373a62c37
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java
-index f27a451f2e2343ab66c8cae24053fd1b6a0ea086..c888415f9b4f19db69667525e37279ab8be794f6 100644
+index b8140aa25a25870259b5644091c6643da1e14b54..d4d8ce60098c74508e2de9541bf6534988779764 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java
-@@ -4,7 +4,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
+@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Salmon;
  
 -public class CraftSalmon extends CraftFish implements Salmon {
@@ -1037,10 +1038,10 @@ index f27a451f2e2343ab66c8cae24053fd1b6a0ea086..c888415f9b4f19db69667525e37279ab
      public CraftSalmon(CraftServer server, net.minecraft.world.entity.animal.Salmon entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java
-index 1dfd4d92dfcb55d26fc5e9adfd1df3fbc9f02ca0..43c2d820d164d36a28c4920d70aea2fe5096763a 100644
+index 0e23bb2d8754a4124126803a6bbca22129d32381..730a25ef2fe934f64f65c21e4e007cf1dbab8bf2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java
-@@ -34,4 +34,15 @@ public class CraftTadpole extends CraftFish implements org.bukkit.entity.Tadpole
+@@ -28,4 +28,15 @@ public class CraftTadpole extends CraftFish implements org.bukkit.entity.Tadpole
      public void setAge(int age) {
          this.getHandle().age = age;
      }
@@ -1057,12 +1058,12 @@ index 1dfd4d92dfcb55d26fc5e9adfd1df3fbc9f02ca0..43c2d820d164d36a28c4920d70aea2fe
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-index bf5b2fd6676c4430578db4cc6c603c501cc5e349..832981b07ef5c633ef00a382f56798ee87eec0df 100644
+index 2d1fcbbaba2b88f2c19ae7553d89e50b30cf6581..c628594b981f276acae7b9337100d811f919631b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-@@ -37,4 +37,27 @@ public class CraftTrident extends CraftArrow implements Trident {
-     public EntityType getType() {
-         return EntityType.TRIDENT;
+@@ -31,4 +31,27 @@ public class CraftTrident extends CraftArrow implements Trident {
+     public String toString() {
+         return "CraftTrident";
      }
 +
 +    // Paper start
@@ -1089,10 +1090,10 @@ index bf5b2fd6676c4430578db4cc6c603c501cc5e349..832981b07ef5c633ef00a382f56798ee
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java
-index ee84a90772381f7cfe864642c860880b827d25ea..4352af0a76ce4a4cd4afbea96f4851ef2b64ac7d 100644
+index 9982d94f19d0f201840653c227f1875c83de0723..d1d932dd27cff00e0ab69443a58715e3cbc1e57c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java
-@@ -8,7 +8,7 @@ import org.bukkit.entity.EntityType;
+@@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.TropicalFish;
  import org.bukkit.entity.TropicalFish.Pattern;
  
@@ -1102,10 +1103,10 @@ index ee84a90772381f7cfe864642c860880b827d25ea..4352af0a76ce4a4cd4afbea96f4851ef
      public CraftTropicalFish(CraftServer server, net.minecraft.world.entity.animal.TropicalFish entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 50b07045cd17a7576a436c64662ad039d4aa2132..bcfca66c7b99b9d514fe850d6cc6abd7e36ccaf7 100644
+index c4f7216c7ca7a49048fcf5240ef2a8f80e843f1c..6079581ba2eef8ac9272d0bbbf77e31f593edf0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-@@ -30,6 +30,26 @@ public class CraftVex extends CraftMonster implements Vex {
+@@ -29,6 +29,26 @@ public class CraftVex extends CraftMonster implements Vex {
      public void setSummoner(org.bukkit.entity.Mob summoner) {
          getHandle().setOwner(summoner == null ? null : ((CraftMob) summoner).getHandle());
      }
@@ -1133,10 +1134,10 @@ index 50b07045cd17a7576a436c64662ad039d4aa2132..bcfca66c7b99b9d514fe850d6cc6abd7
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
-index 20e11bb0ae8949988b3499ad85016379fbe83218..7d63e9b8c92da089886ce9118bea07077f0541cd 100644
+index d83c0e08610fff76f7bce1103acfa48be674c018..3c14554a6a657223441eee97258734ea05965bc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
-@@ -70,13 +70,20 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager {
+@@ -64,13 +64,20 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager {
  
      @Override
      public void setConversionTime(int time) {
@@ -1159,10 +1160,10 @@ index 20e11bb0ae8949988b3499ad85016379fbe83218..7d63e9b8c92da089886ce9118bea0707
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-index fa7107593b20e0151d8d67104e4a92dcc697d461..f9a3d060ff4da6047d11f2b024d144572c513399 100644
+index 4a6700d7d2f40cf516054e2e3d09049f1ce4fd17..fd6ac99dae7e54b90f2b0e01430ac6db9410ccd4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-@@ -55,5 +55,25 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
+@@ -49,5 +49,25 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
      public boolean canDrinkMilk() {
          return getHandle().canDrinkMilk;
      }
@@ -1189,10 +1190,10 @@ index fa7107593b20e0151d8d67104e4a92dcc697d461..f9a3d060ff4da6047d11f2b024d14457
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-index 08c55cb00c8ff3c39dd99c64227d5d60abee2a51..6ecdc4bf1f6b8f0363e667135ba463433be5c0fb 100644
+index 360c971f73a85e3841063dee9bc1da2ddfda4dae..46e3cc146a4b109c4baaf94f42d825646abade68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-@@ -43,6 +43,13 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
+@@ -37,6 +37,13 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
          return this.getHandle().getAngerManagement().getActiveAnger(((CraftEntity) entity).getHandle());
      }
  
@@ -1207,10 +1208,10 @@ index 08c55cb00c8ff3c39dd99c64227d5d60abee2a51..6ecdc4bf1f6b8f0363e667135ba46343
      public void increaseAnger(Entity entity, int increase) {
          Preconditions.checkArgument(entity != null, "Entity cannot be null");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index f9c3a14bf4674f21ed32f6dc2a4296a935dd2b6d..1477c2c04d8f5c5639ce94808fe2a7029cedaeb2 100644
+index 83353863e0c58995d3699d5f812d38cae056f695..5a97c92f9b044d8ab7bd3346ceb464455a09046e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-@@ -73,4 +73,36 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
+@@ -67,4 +67,36 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
  
          this.getHandle().setInvulnerableTicks(ticks);
      }
diff --git a/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
index 22293dd5c1..71e04b67ea 100644
--- a/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
@@ -32,10 +32,10 @@ index ee6bbe96503e9205349e9a5c411dc60dd952ec9e..e48706e2fefc39fcce3c65f629153fdc
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-index e45c1bfb1b8e0cd8f7b9ab5b655d33dd4da1b151..e3688e941d9b63b5319faf9370b8f75e0e5828ae 100644
+index c0c917b928a648206ff6fd53f13fbe3bcb0cdda7..18712bfd46d3852bc1210c8f0dea7e9af3e55b4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-@@ -38,8 +38,15 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal {
+@@ -32,8 +32,15 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal {
  
      @Override
      public void setTargetLocation(Location location) {
diff --git a/patches/server/0663-More-CommandBlock-API.patch b/patches/server/0663-More-CommandBlock-API.patch
index 3cbd2436d3..08e4be7648 100644
--- a/patches/server/0663-More-CommandBlock-API.patch
+++ b/patches/server/0663-More-CommandBlock-API.patch
@@ -68,10 +68,10 @@ index c4ea6760f489e6171f9e6e170160b932597f842f..245a9b062a0033a39fd42f3ff9435019
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-index f9863e138994f6c7a7975a852f106faa96d52315..b709a1d909c189f60d0c3aa97b4b96623e7c1db0 100644
+index 66fb6aeb49b7e93d2a4d9b5ce7f1a7d68f571cf5..2534abcdce426189ac15e0659ab62840b3d54762 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-@@ -14,7 +14,7 @@ import org.bukkit.permissions.PermissionAttachment;
+@@ -13,7 +13,7 @@ import org.bukkit.permissions.PermissionAttachment;
  import org.bukkit.permissions.PermissionAttachmentInfo;
  import org.bukkit.plugin.Plugin;
  
@@ -80,7 +80,7 @@ index f9863e138994f6c7a7975a852f106faa96d52315..b709a1d909c189f60d0c3aa97b4b9662
      private final PermissibleBase perm = new PermissibleBase(this);
  
      public CraftMinecartCommand(CraftServer server, MinecartCommandBlock entity) {
-@@ -70,6 +70,17 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
+@@ -64,6 +64,17 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
      public [email protected] Component name() {
          return io.papermc.paper.adventure.PaperAdventure.asAdventure(this.getHandle().getCommandBlock().getName());
      }
diff --git a/patches/server/0674-Goat-ram-API.patch b/patches/server/0674-Goat-ram-API.patch
index 3bdb40bb53..95e706b0af 100644
--- a/patches/server/0674-Goat-ram-API.patch
+++ b/patches/server/0674-Goat-ram-API.patch
@@ -25,10 +25,10 @@ index cf56577ca3de81d3e44eb6f65ff9890011666ac5..a3a5dbaed7a7647249747154ac0c024b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
-index 9142b132f045af55b6bb436a39a9ca416bcfc698..e4be28b130e35ea263f85b3157898cd3a7e80561 100644
+index 65fcb36e849da6949c123a6f3672b485036f368e..2c21de478bff9cdf13ba46cd041831d54c11e924 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
-@@ -54,4 +54,11 @@ public class CraftGoat extends CraftAnimals implements Goat {
+@@ -48,4 +48,11 @@ public class CraftGoat extends CraftAnimals implements Goat {
      public void setScreaming(boolean screaming) {
          this.getHandle().setScreamingGoat(screaming);
      }
diff --git a/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
index 8e3234eecc..fdfbb9ce2b 100644
--- a/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 304f7c1fe35e18f6331de02a3db2b8c84e22eaa2..d28c3834aeefc8ab553c366a037549f46fb7cfc3 100644
+index f7a97ac4eb851f35275cfeb4717f0f69dda4336e..0d2506350e2c57044bf7c751627b6e0d76077e82 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2138,6 +2138,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -27,10 +27,10 @@ index 304f7c1fe35e18f6331de02a3db2b8c84e22eaa2..d28c3834aeefc8ab553c366a037549f4
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 02dc40b6f7b82ce503c33fb4af26cbb20c9d5b7a..5fad5dbc0815ec3ee86a3fb34fe0c68bb4c33bcc 100644
+index e29e1af97c1d50603135723a7a16fc1806718ca2..f96144b6ee8b4d1d114e38bb933dd3072191574c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1360,5 +1360,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1371,5 +1371,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
          return set;
      }
diff --git a/patches/server/0677-Vanilla-command-permission-fixes.patch b/patches/server/0677-Vanilla-command-permission-fixes.patch
index 4f690751a2..5dd38d933e 100644
--- a/patches/server/0677-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0677-Vanilla-command-permission-fixes.patch
@@ -51,10 +51,10 @@ index 14c78028ff51fff6f24174ae16b7c42d34d6041a..7592b592a541912f729d6b99f455cd87
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 8b93fe406ea94919b4129566764f7efe43b3330d..b26ac7192e532be94a57a70e12270272034fd5ef 100644
+index e396079645332b1982d2368b8f97ec9ff377c8ce..45e85f252acd72800956cc2a120564256d2de797 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -87,7 +87,23 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+@@ -88,7 +88,23 @@ public final class VanillaCommandWrapper extends BukkitCommand {
      }
  
      public static String getPermission(CommandNode<CommandSourceStack> vanillaCommand) {
diff --git a/patches/server/0728-Add-root-admin-user-detection.patch b/patches/server/0727-Add-root-admin-user-detection.patch
index bc171867c0..bc171867c0 100644
--- a/patches/server/0728-Add-root-admin-user-detection.patch
+++ b/patches/server/0727-Add-root-admin-user-detection.patch
diff --git a/patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
deleted file mode 100644
index f082107a26..0000000000
--- a/patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Fri, 10 Sep 2021 15:49:12 -0700
-Subject: [PATCH] VanillaCommandWrapper didnt account for entity senders
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index b26ac7192e532be94a57a70e12270272034fd5ef..bd45d59cbfe877717b90221fbb8d03d266958984 100644
---- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -64,8 +64,10 @@ public final class VanillaCommandWrapper extends BukkitCommand {
-     }
- 
-     public static CommandSourceStack getListener(CommandSender sender) {
--        if (sender instanceof Player) {
--            return ((CraftPlayer) sender).getHandle().createCommandSourceStack();
-+        // Paper start - account for other entity command senders
-+        if (sender instanceof org.bukkit.craftbukkit.entity.CraftEntity craftEntity) {
-+            return craftEntity.getHandle().createCommandSourceStack();
-+        // Paper end
-         }
-         if (sender instanceof BlockCommandSender) {
-             return ((CraftBlockCommandSender) sender).getWrapper();
diff --git a/patches/server/0729-Always-allow-item-changing-in-Fireball.patch b/patches/server/0728-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0729-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0728-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0729-don-t-attempt-to-teleport-dead-entities.patch
index 34f97a6fed..e5807e0901 100644
--- a/patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0729-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e6ec85bb667cf1c7618402bfc2e6fc194706c368..ba65d8898aa198d598189fc40ad7dd080daba35a 100644
+index 61a3f7984e798191c74e85a514ca1ecde70e03ba..f1d9b75eae4d42c02974c8bface6d73cb1e58182 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0730-Prevent-excessive-velocity-through-repeated-crits.patch
index 568f5ba069..568f5ba069 100644
--- a/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0730-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0731-Remove-client-side-code-using-deprecated-for-removal.patch
index 573119e335..573119e335 100644
--- a/patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0731-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0732-Fix-removing-recipes-from-RecipeIterator.patch
index 50c8cae9c0..50c8cae9c0 100644
--- a/patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0732-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0733-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 27f890cda2..6b43fb005b 100644
--- a/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0733-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -18,7 +18,7 @@ index 97da8896865ff0bdd4fe8f2155b0830b42051bb1..9ca897d92c5bdd2764d114c74d64c776
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 57d3249c8b18f34245389b1f828e927becafc10c..485ed6cfdb2bb0c06dd639f6cad26cd3112c618d 100644
+index e7c0d214abbad1f300049f790ae54e7ea488e150..24f0d61a2fa9ac95dd26443a978209b53baf10b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -338,7 +338,10 @@ public class ServerEntity {
diff --git a/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0734-Hide-unnecessary-itemmeta-from-clients.patch
index ee0b7d16fb..ee0b7d16fb 100644
--- a/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0734-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0736-Fix-Spigot-growth-modifiers.patch b/patches/server/0735-Fix-Spigot-growth-modifiers.patch
index 47946c5054..47946c5054 100644
--- a/patches/server/0736-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0735-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0736-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0736-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0738-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0737-Add-PlayerItemFrameChangeEvent.patch
index 6214bdbdef..6214bdbdef 100644
--- a/patches/server/0738-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0737-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0739-Optimize-HashMapPalette.patch b/patches/server/0738-Optimize-HashMapPalette.patch
index 52a28a4fd3..52a28a4fd3 100644
--- a/patches/server/0739-Optimize-HashMapPalette.patch
+++ b/patches/server/0738-Optimize-HashMapPalette.patch
diff --git a/patches/server/0740-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0739-Allow-delegation-to-vanilla-chunk-gen.patch
index d3760b7cf2..d3760b7cf2 100644
--- a/patches/server/0740-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0739-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0740-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 0794c185b3..1342972879 100644
--- a/patches/server/0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0740-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..3d2fa2466fe40e0b9d7749498684587a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5aa34babd53900fb5f7cf973628751ecec64172d..ea3dfa9cd06e4a44ee819ed4a203779e4c10bbd9 100644
+index 52dba7fad11a7280137ade67983e594487e20891..50f6a044385c22336e799efe471ab65e7196aaa6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -461,7 +461,7 @@ public class ServerPlayer extends Player {
@@ -1215,7 +1215,7 @@ index ffa831673805201932c36b814f4439f3bb5c4c04..64e40e3caa85bff9382a483237301a8f
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ba65d8898aa198d598189fc40ad7dd080daba35a..f0971946e3683733d5f12888263ebe2996aa0df0 100644
+index f1d9b75eae4d42c02974c8bface6d73cb1e58182..23194249ab0add8cf2cbea190d3c6aee606b10a1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1210,9 +1210,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0742-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0741-Optimise-collision-checking-in-player-move-packet-ha.patch
index d938d49277..d938d49277 100644
--- a/patches/server/0742-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0741-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0743-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0742-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 78d359b1d9..78d359b1d9 100644
--- a/patches/server/0743-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0742-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0744-Add-more-Campfire-API.patch b/patches/server/0743-Add-more-Campfire-API.patch
index da279b0a50..da279b0a50 100644
--- a/patches/server/0744-Add-more-Campfire-API.patch
+++ b/patches/server/0743-Add-more-Campfire-API.patch
diff --git a/patches/server/0745-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0744-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 0246c3f0d5..0246c3f0d5 100644
--- a/patches/server/0745-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0744-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0746-Fix-tripwire-state-inconsistency.patch b/patches/server/0745-Fix-tripwire-state-inconsistency.patch
index eba71d4136..eba71d4136 100644
--- a/patches/server/0746-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0745-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0747-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0746-Forward-CraftEntity-in-teleport-command.patch
index 4563508d1d..c5f58fd05a 100644
--- a/patches/server/0747-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0746-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0a8868609535754a318c3c845c9821a5e8c09b65..3164ba33d61a1969df3d42849d593a8de867a8ee 100644
+index 23194249ab0add8cf2cbea190d3c6aee606b10a1..d441db38210b15c6fae5a1632f4e2372c7a04b7c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3444,6 +3444,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0748-Improve-scoreboard-entries.patch b/patches/server/0747-Improve-scoreboard-entries.patch
index 441d410c2b..441d410c2b 100644
--- a/patches/server/0748-Improve-scoreboard-entries.patch
+++ b/patches/server/0747-Improve-scoreboard-entries.patch
diff --git a/patches/server/0749-Entity-powdered-snow-API.patch b/patches/server/0748-Entity-powdered-snow-API.patch
index 0df0028dcc..e16a39f67d 100644
--- a/patches/server/0749-Entity-powdered-snow-API.patch
+++ b/patches/server/0748-Entity-powdered-snow-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Entity powdered snow API
 public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5fad5dbc0815ec3ee86a3fb34fe0c68bb4c33bcc..fbc18be64e71be2215059c34afd8129138dc4dff 100644
+index f96144b6ee8b4d1d114e38bb933dd3072191574c..d976796c6e80d8abc5c110bdefc09f63cfc4a60a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1370,5 +1370,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1381,5 +1381,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entity.setRot(location.getYaw(), location.getPitch());
          return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason);
      }
@@ -22,10 +22,10 @@ index 5fad5dbc0815ec3ee86a3fb34fe0c68bb4c33bcc..fbc18be64e71be2215059c34afd81291
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-index 90f34d75f99f31f5c98c499df209979a03e23191..1737857424c5da885c46f39502cafd2a670d3be7 100644
+index 956ddd955e6f9b2f02ef05b0e95150c9c90c3107..16e6325a944c1eb21dd5a3835aa8a00d238e7b5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-@@ -51,4 +51,11 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
+@@ -45,4 +45,11 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
      public SkeletonType getSkeletonType() {
         return SkeletonType.NORMAL;
      }
diff --git a/patches/server/0750-Add-API-for-item-entity-health.patch b/patches/server/0749-Add-API-for-item-entity-health.patch
index 66df625d46..5dddc23e86 100644
--- a/patches/server/0750-Add-API-for-item-entity-health.patch
+++ b/patches/server/0749-Add-API-for-item-entity-health.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add API for item entity health
 public net.minecraft.world.entity.item.ItemEntity health
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 27e961653dc66fbe8d5421eef04260b91ca410f4..e9946edf568db010e4ccb9fe7755709ed7b8310f 100644
+index ff6868ab31cec208045353c842f20ca31191bc0a..d160db37a3b7ef44b6de8fef209eeccef46c3a95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -102,6 +102,21 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -101,6 +101,21 @@ public class CraftItem extends CraftEntity implements Item {
       public void setWillAge(boolean willAge) {
          item.age = willAge ? 0 : NO_AGE_TIME;
       }
diff --git a/patches/server/0751-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0750-Fix-entity-type-tags-suggestions-in-selectors.patch
index 0eceb810df..0eceb810df 100644
--- a/patches/server/0751-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0750-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0752-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0751-Configurable-max-block-light-for-monster-spawning.patch
index baf913d352..baf913d352 100644
--- a/patches/server/0752-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0751-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0753-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0752-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index d4f3ab6d9f..d6fa3ac350 100644
--- a/patches/server/0753-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0752-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
@@ -27,7 +27,7 @@ Co-authored-by: Zach Brown <[email protected]>
 Co-authored-by: Madeline Miller <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 9b3d253c4224410719bf778a4688fce13c12069d..ee316f2474e43c1e644632772e9eb9cc181756c6 100644
+index 8125c334c54d41ad731bbc3481662b0cf0afee51..58d1f76544d7a8d196f75438579266664e5d7404 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -146,15 +146,15 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0754-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0753-Load-effect-amplifiers-greater-than-127-correctly.patch
index 2b10cf2e71..2b10cf2e71 100644
--- a/patches/server/0754-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0753-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0755-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0754-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0755-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0754-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0756-Fix-bees-aging-inside-hives.patch b/patches/server/0755-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0756-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0755-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0757-Bucketable-API.patch b/patches/server/0756-Bucketable-API.patch
index 3dd4d8263f..795b1844e3 100644
--- a/patches/server/0757-Bucketable-API.patch
+++ b/patches/server/0756-Bucketable-API.patch
@@ -42,12 +42,12 @@ index 0000000000000000000000000000000000000000..c4eee682f5b8cd82f71f92f0549f39b7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
-index 2947298fe69aa8330d4fe399bf2441c367e8bd80..a82acbbe62bf6aa497e627587e2f3b9be2fbf487 100644
+index e730292edca4624400bdb89d555922c5f61db7a5..cbfca242f820d238b112f8ce64e9de8398c48a1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
-@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
+@@ -4,7 +4,7 @@ import com.google.common.base.Preconditions;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Axolotl;
- import org.bukkit.entity.EntityType;
  
 -public class CraftAxolotl extends CraftAnimals implements Axolotl {
 +public class CraftAxolotl extends CraftAnimals implements Axolotl, io.papermc.paper.entity.PaperBucketable { // Paper - Bucketable API
diff --git a/patches/server/0758-Validate-usernames.patch b/patches/server/0757-Validate-usernames.patch
index 762960d87e..762960d87e 100644
--- a/patches/server/0758-Validate-usernames.patch
+++ b/patches/server/0757-Validate-usernames.patch
diff --git a/patches/server/0759-Make-water-animal-spawn-height-configurable.patch b/patches/server/0758-Make-water-animal-spawn-height-configurable.patch
index 9e90672eb5..9e90672eb5 100644
--- a/patches/server/0759-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0758-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0759-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 63f9d7fecc..63f9d7fecc 100644
--- a/patches/server/0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0759-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0761-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0760-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0761-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0760-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0762-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0761-Add-new-overload-to-PersistentDataContainer-has.patch
index 7bec9a60ef..7bec9a60ef 100644
--- a/patches/server/0762-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0761-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0763-Multiple-Entries-with-Scoreboards.patch b/patches/server/0762-Multiple-Entries-with-Scoreboards.patch
index 2a4558b8f3..2a4558b8f3 100644
--- a/patches/server/0763-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0762-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0764-Reset-placed-block-on-exception.patch b/patches/server/0763-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0764-Reset-placed-block-on-exception.patch
+++ b/patches/server/0763-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0765-Add-configurable-height-for-slime-spawn.patch b/patches/server/0764-Add-configurable-height-for-slime-spawn.patch
index 65b8d6d80d..65b8d6d80d 100644
--- a/patches/server/0765-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0764-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0766-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0765-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index f2c95ba6c0..f2c95ba6c0 100644
--- a/patches/server/0766-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0765-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0767-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0766-Fix-xp-reward-for-baby-zombies.patch
index 399ad48f22..399ad48f22 100644
--- a/patches/server/0767-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0766-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0768-Kick-on-main-for-illegal-chat.patch b/patches/server/0767-Kick-on-main-for-illegal-chat.patch
index 08406201d7..08406201d7 100644
--- a/patches/server/0768-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0767-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0769-Multi-Block-Change-API-Implementation.patch b/patches/server/0768-Multi-Block-Change-API-Implementation.patch
index 39356fab74..a1607cdb8c 100644
--- a/patches/server/0769-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0768-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 56418e69c8872f99efced7ca504274697db65eaa..aca87ca2bb08716ab9c5e00f8735b10e33a36373 100644
+index 0e753ae3a5db5406d779371bcb5c791bdf93c261..488b92974ac42b08478c0afd9b6115afe4996dc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -889,6 +889,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0770-Fix-NotePlayEvent.patch b/patches/server/0769-Fix-NotePlayEvent.patch
index 5104743fbe..5104743fbe 100644
--- a/patches/server/0770-Fix-NotePlayEvent.patch
+++ b/patches/server/0769-Fix-NotePlayEvent.patch
diff --git a/patches/server/0771-Freeze-Tick-Lock-API.patch b/patches/server/0770-Freeze-Tick-Lock-API.patch
index 54685abe12..e6c96e1f15 100644
--- a/patches/server/0771-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0770-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 602f0ea9a0a077df7dd4b8964d442cfaca25d37e..5aed3f18ef7464e1fa6f6ee69fad72d524356af0 100644
+index d441db38210b15c6fae5a1632f4e2372c7a04b7c..ceddbc2e0fdec358bd7776af264df33696ecbd6d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -59,10 +59,10 @@ index f306c9e8f46d80d4c4fdc671e3754b3faff72fa2..1822382211b512f88c3e94258bbb6cb2
  
              if (this.isInPowderSnow && this.canFreeze()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index fbc18be64e71be2215059c34afd8129138dc4dff..cc72d960d9a5f9481ec2214b1549a344907a68da 100644
+index d976796c6e80d8abc5c110bdefc09f63cfc4a60a..f61d3cd3cdbfe17f6818fbbb163f80ba3de50ca1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -663,6 +663,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -669,6 +669,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().isFullyFrozen();
      }
  
diff --git a/patches/server/0772-Dolphin-API.patch b/patches/server/0771-Dolphin-API.patch
index 9fd01d6fb1..e971f87322 100644
--- a/patches/server/0772-Dolphin-API.patch
+++ b/patches/server/0771-Dolphin-API.patch
@@ -5,14 +5,15 @@ Subject: [PATCH] Dolphin API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
-index 938e141f161acf5de5d3361382b514caea02c6fb..18623159932df2dd5e43133b4396b43731693780 100644
+index af432f9a1d255a56c31c3b97aeb4457d17f37e3e..f93f8f6509b12eb9b1e07c829278bb0822dd7988 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
-@@ -24,4 +24,34 @@ public class CraftDolphin extends CraftWaterMob implements Dolphin {
-     public EntityType getType() {
-         return EntityType.DOLPHIN;
+@@ -18,4 +18,36 @@ public class CraftDolphin extends CraftWaterMob implements Dolphin {
+     public String toString() {
+         return "CraftDolphin";
      }
 +
++    // Paper start - Missing Dolphin API
 +    @Override
 +    public int getMoistness() {
 +        return this.getHandle().getMoistnessLevel();
@@ -42,4 +43,5 @@ index 938e141f161acf5de5d3361382b514caea02c6fb..18623159932df2dd5e43133b4396b437
 +    public void setTreasureLocation(org.bukkit.Location location) {
 +        this.getHandle().setTreasurePos(io.papermc.paper.util.MCUtil.toBlockPosition(location));
 +    }
++    // Paper end - Missing Dolphin API
  }
diff --git a/patches/server/0773-More-PotionEffectType-API.patch b/patches/server/0772-More-PotionEffectType-API.patch
index 15d2f7a5ec..15d2f7a5ec 100644
--- a/patches/server/0773-More-PotionEffectType-API.patch
+++ b/patches/server/0772-More-PotionEffectType-API.patch
diff --git a/patches/server/0774-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0773-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 839a5f95d4..839a5f95d4 100644
--- a/patches/server/0774-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0773-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0775-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0774-API-for-creating-command-sender-which-forwards-feedb.patch
index 63b75b6f2b..894f7a6032 100644
--- a/patches/server/0775-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0774-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -161,10 +161,10 @@ index eaff8df6c8c12c64e005a68a02e2e35ed88f757c..1c638a4b1f2c841928d8b2a7ae43e4eb
          if (this instanceof CraftBlockCommandSender) {
              if (ServerCommandSender.blockPermInst == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index bd45d59cbfe877717b90221fbb8d03d266958984..eb20ac9d0e70c48c2c671109b7706c56ff0f10f6 100644
+index 45e85f252acd72800956cc2a120564256d2de797..c3742b6c4abea173b38307048091fc56bd5051d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -84,6 +84,11 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+@@ -83,6 +83,11 @@ public final class VanillaCommandWrapper extends BukkitCommand {
          if (sender instanceof ProxiedCommandSender) {
              return ((ProxiedNativeCommandSender) sender).getHandle();
          }
diff --git a/patches/server/0776-Add-missing-structure-set-seed-configs.patch b/patches/server/0775-Add-missing-structure-set-seed-configs.patch
index f299fd82ac..f299fd82ac 100644
--- a/patches/server/0776-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0775-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0777-Implement-regenerateChunk.patch b/patches/server/0776-Implement-regenerateChunk.patch
index 781aaa93b6..781aaa93b6 100644
--- a/patches/server/0777-Implement-regenerateChunk.patch
+++ b/patches/server/0776-Implement-regenerateChunk.patch
diff --git a/patches/server/0778-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0777-Fix-cancelled-powdered-snow-bucket-placement.patch
index a17a9169aa..a17a9169aa 100644
--- a/patches/server/0778-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0777-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0778-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 8c367b0d11..8c367b0d11 100644
--- a/patches/server/0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0778-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0780-Add-GameEvent-tags.patch b/patches/server/0779-Add-GameEvent-tags.patch
index afeb377743..afeb377743 100644
--- a/patches/server/0780-Add-GameEvent-tags.patch
+++ b/patches/server/0779-Add-GameEvent-tags.patch
diff --git a/patches/server/0781-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0780-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 45ac694a2b..45ac694a2b 100644
--- a/patches/server/0781-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0780-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0782-Furnace-RecipesUsed-API.patch b/patches/server/0781-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0782-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0781-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0783-Configurable-sculk-sensor-listener-range.patch b/patches/server/0782-Configurable-sculk-sensor-listener-range.patch
index c68e2d2cc3..c68e2d2cc3 100644
--- a/patches/server/0783-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0782-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0784-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0783-Add-missing-block-data-mins-and-maxes.patch
index 2096473939..2096473939 100644
--- a/patches/server/0784-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0783-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0785-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0784-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 964a6c913e..964a6c913e 100644
--- a/patches/server/0785-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0784-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0786-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0785-Put-world-into-worldlist-before-initing-the-world.patch
index 8642fd9b72..8642fd9b72 100644
--- a/patches/server/0786-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0785-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0787-Fix-Entity-Position-Desync.patch b/patches/server/0786-Fix-Entity-Position-Desync.patch
index 6c45d79350..2cb7eea3b3 100644
--- a/patches/server/0787-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0786-Fix-Entity-Position-Desync.patch
@@ -9,7 +9,7 @@ This excludes hanging entities, as this fix caused problematic behavior due to t
 position field.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 3212a4cfb0c7e0003981097e813ebbe2601cdfec..900bf9fb40026cce1d869bb7ab1694e6cd354099 100644
+index 31fa0f4fbf195d0db7a89a060b1cc4fd30dc5ab0..fe7aff356a9e7b4f41c3d5cb3bd5afbb0646c16a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -174,7 +174,7 @@ public class ServerEntity {
diff --git a/patches/server/0788-Custom-Potion-Mixes.patch b/patches/server/0787-Custom-Potion-Mixes.patch
index aa329b1411..aa329b1411 100644
--- a/patches/server/0788-Custom-Potion-Mixes.patch
+++ b/patches/server/0787-Custom-Potion-Mixes.patch
diff --git a/patches/server/0789-Force-close-world-loading-screen.patch b/patches/server/0788-Force-close-world-loading-screen.patch
index d4a01751c2..d4a01751c2 100644
--- a/patches/server/0789-Force-close-world-loading-screen.patch
+++ b/patches/server/0788-Force-close-world-loading-screen.patch
diff --git a/patches/server/0790-Fix-falling-block-spawn-methods.patch b/patches/server/0789-Fix-falling-block-spawn-methods.patch
index d96bea324d..6813f1f772 100644
--- a/patches/server/0790-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0789-Fix-falling-block-spawn-methods.patch
@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 49d6ae8465397c4210a6f9599d14008518c30cd0..72cf724733bc5a1e5dcca20fa0a6a8f7874f5f8b 100644
+index 2732b952ab18b49f72efcc22facef4f9b2b4fa4d..5fbd881f4f10c0330ddb5a3415062fac2a332b9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -598,7 +598,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0791-Expose-furnace-minecart-push-values.patch b/patches/server/0790-Expose-furnace-minecart-push-values.patch
index 4086d94249..572d7c5f66 100644
--- a/patches/server/0791-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0790-Expose-furnace-minecart-push-values.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose furnace minecart push values
 Adds methods for getting and setting a furnace minecart's push values
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
-index 49ceb730b6e68b7c70799fca80dc32da4a12c545..b8378d5f3c2a08ab565dcb8cb200822b581c7dba 100644
+index 2469a8e393665c6b085b028816bd4dad4a1b5ba3..1027c915c0a2f981703908fdb2eb6beeb548f347 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
-@@ -28,6 +28,28 @@ public class CraftMinecartFurnace extends CraftMinecart implements PoweredMineca
+@@ -27,6 +27,28 @@ public class CraftMinecartFurnace extends CraftMinecart implements PoweredMineca
          this.getHandle().fuel = fuel;
      }
  
diff --git a/patches/server/0792-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0791-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 2d848b1041..2d848b1041 100644
--- a/patches/server/0792-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0791-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0793-More-Projectile-API.patch b/patches/server/0792-More-Projectile-API.patch
index 03671b1b51..e283c148ef 100644
--- a/patches/server/0793-More-Projectile-API.patch
+++ b/patches/server/0792-More-Projectile-API.patch
@@ -116,10 +116,10 @@ index 40e5b19bc8fa3de3b3d54da0762aee5bd7bb8d7b..b3814bd6c6d6aae090fe417696535ed1
  
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index d443b171191d150eed62d000a1079ede6bcf9052..10e2d251ec398245786a0b3bd41f3bc7155a49fe 100644
+index 5056ec1ad51be9209591d34d32d256c350feed63..9f30946c7a198e2a277b65c02fcd75570c5dbad6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-@@ -59,20 +59,7 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
+@@ -58,20 +58,7 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
          this.getHandle().setCritArrow(critical);
      }
  
@@ -141,7 +141,7 @@ index d443b171191d150eed62d000a1079ede6bcf9052..10e2d251ec398245786a0b3bd41f3bc7
  
      @Override
      public boolean isInBlock() {
-@@ -106,6 +93,27 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
+@@ -105,6 +92,27 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
          return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem());
      }
  
@@ -170,10 +170,10 @@ index d443b171191d150eed62d000a1079ede6bcf9052..10e2d251ec398245786a0b3bd41f3bc7
      public void setNoPhysics(boolean noPhysics) {
          this.getHandle().setNoPhysics(noPhysics);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-index 44353e074fb4655e38ffffe83cbf52080e5cbbdb..1fdf52edc47591bf3d8bbcb9db9d41773aace42f 100644
+index 013de344fc9a4b21952fc6177243905982d88486..e04500dcdc5b72cca7ac81b5d12e76822db9c8c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-@@ -33,20 +33,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
+@@ -32,20 +32,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
          this.getHandle().bukkitYield = yield;
      }
  
@@ -196,10 +196,10 @@ index 44353e074fb4655e38ffffe83cbf52080e5cbbdb..1fdf52edc47591bf3d8bbcb9db9d4177
      @Override
      public Vector getDirection() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index c242f654c88ca1773429348939d3bb2ffae3768c..d1c7ab67cba881d96b7a5e9220130d86d0514304 100644
+index 7417e3d51497fe7e62e108d83ee4b70942972144..68c5af9b67a2834ee6e2f80ceefa19c3a982b8ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-@@ -16,24 +16,26 @@ import org.bukkit.inventory.meta.FireworkMeta;
+@@ -15,24 +15,26 @@ import org.bukkit.inventory.meta.FireworkMeta;
  public class CraftFirework extends CraftProjectile implements Firework {
  
      private final Random random = new Random();
@@ -240,7 +240,7 @@ index c242f654c88ca1773429348939d3bb2ffae3768c..d1c7ab67cba881d96b7a5e9220130d86
      }
  
      @Override
-@@ -53,12 +55,12 @@ public class CraftFirework extends CraftProjectile implements Firework {
+@@ -47,12 +49,12 @@ public class CraftFirework extends CraftProjectile implements Firework {
  
      @Override
      public FireworkMeta getFireworkMeta() {
@@ -255,7 +255,7 @@ index c242f654c88ca1773429348939d3bb2ffae3768c..d1c7ab67cba881d96b7a5e9220130d86
  
          // Copied from EntityFireworks constructor, update firework lifetime/power
          this.getHandle().lifetime = 10 * (1 + meta.getPower()) + this.random.nextInt(6) + this.random.nextInt(7);
-@@ -142,4 +144,46 @@ public class CraftFirework extends CraftProjectile implements Firework {
+@@ -136,4 +138,46 @@ public class CraftFirework extends CraftProjectile implements Firework {
          return getHandle().spawningEntity;
      }
      // Paper end
@@ -303,10 +303,10 @@ index c242f654c88ca1773429348939d3bb2ffae3768c..d1c7ab67cba881d96b7a5e9220130d86
 +    // Paper end - Expose firework item directly + manually setting flight
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-index d38fca354695ef940421fe7325f2ef3a7b57a6f4..ce934b945b85a4c3d0f575eb090bbf90c4b3ca9f 100644
+index b32a8d0a942d1a3c4e4b047cda4aa32d03b09875..9de72665c947bb00547cdd7c41a890711f5b2afc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-@@ -202,4 +202,15 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
+@@ -196,4 +196,15 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
      public HookState getState() {
          return HookState.values()[this.getHandle().currentState.ordinal()];
      }
@@ -323,11 +323,11 @@ index d38fca354695ef940421fe7325f2ef3a7b57a6f4..ce934b945b85a4c3d0f575eb090bbf90
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
-index dd4c67f42217b5e746c4b0cf5c44116cacb321f6..9b92efb9bb6905032cee43299d0fdb226dd0e598 100644
+index 70cbc6c668c60e9d608ca7013b72f9b916c05c2d..47633f05b4fab1dcabc2117e7645fe6d6949622a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
-@@ -26,13 +26,5 @@ public class CraftLlamaSpit extends AbstractProjectile implements LlamaSpit {
-         return EntityType.LLAMA_SPIT;
+@@ -20,13 +20,5 @@ public class CraftLlamaSpit extends AbstractProjectile implements LlamaSpit {
+         return "CraftLlamaSpit";
      }
  
 -    @Override
@@ -368,10 +368,10 @@ index 9a68f4ef68870d0baab5b6464d6c0a82a8fd105d..fd5beb956f643532e08613366ebd380d
      @Override
      public net.minecraft.world.entity.projectile.Projectile getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
-index 20b54f8896be1f8744a29e1d0205e58d27049f1f..43f52716c82863382cb0eb08cc0e174a19ffebdf 100644
+index 929a429428493093837c8a7a065896873d533f2d..807a498c2a80a5bd5eedf5322c699adebf25872f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
-@@ -13,20 +13,7 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul
+@@ -12,20 +12,7 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul
          super(server, entity);
      }
  
@@ -393,7 +393,7 @@ index 20b54f8896be1f8744a29e1d0205e58d27049f1f..43f52716c82863382cb0eb08cc0e174a
  
      @Override
      public org.bukkit.entity.Entity getTarget() {
-@@ -40,6 +27,40 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul
+@@ -39,6 +26,40 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul
          this.getHandle().setTarget(target == null ? null : ((CraftEntity) target).getHandle());
      }
  
@@ -435,10 +435,10 @@ index 20b54f8896be1f8744a29e1d0205e58d27049f1f..43f52716c82863382cb0eb08cc0e174a
      public String toString() {
          return "CraftShulkerBullet";
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index 02ee302f93f971fbd97f7fd88f257a1a613a81ba..2b8a4ad4bca3044f1af274cdff90e6d66b6c7da7 100644
+index 76e64ca4eb60074db23635cb260fc6b56319a5ac..f1a3ed6670fcb4e40000ed5c4f7042a4ca99175c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-@@ -36,11 +36,31 @@ public class CraftThrownPotion extends CraftThrowableProjectile implements Throw
+@@ -35,11 +35,31 @@ public class CraftThrownPotion extends CraftThrowableProjectile implements Throw
      @Override
      public void setItem(ItemStack item) {
          Preconditions.checkArgument(item != null, "ItemStack cannot be null");
@@ -472,10 +472,10 @@ index 02ee302f93f971fbd97f7fd88f257a1a613a81ba..2b8a4ad4bca3044f1af274cdff90e6d6
      public net.minecraft.world.entity.projectile.ThrownPotion getHandle() {
          return (net.minecraft.world.entity.projectile.ThrownPotion) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-index 832981b07ef5c633ef00a382f56798ee87eec0df..faf071201b7c1414225a33fe9641eac9477d53c7 100644
+index c628594b981f276acae7b9337100d811f919631b..c8b65210d2416b5a293cb4bcc1b71f56ed365cd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-@@ -59,5 +59,15 @@ public class CraftTrident extends CraftArrow implements Trident {
+@@ -53,5 +53,15 @@ public class CraftTrident extends CraftArrow implements Trident {
          com.google.common.base.Preconditions.checkArgument(loyaltyLevel >= 0 && loyaltyLevel <= 127, "The loyalty level has to be between 0 and 127");
          this.getHandle().setLoyalty((byte) loyaltyLevel);
      }
diff --git a/patches/server/0794-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0793-Fix-swamp-hut-cat-generation-deadlock.patch
index 018b928494..018b928494 100644
--- a/patches/server/0794-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0793-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0795-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0794-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index f2d111af4d..f2d111af4d 100644
--- a/patches/server/0795-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0794-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0796-Implement-getComputedBiome-API.patch b/patches/server/0795-Implement-getComputedBiome-API.patch
index ed458fddb1..2c84e13a1e 100644
--- a/patches/server/0796-Implement-getComputedBiome-API.patch
+++ b/patches/server/0795-Implement-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 72cf724733bc5a1e5dcca20fa0a6a8f7874f5f8b..9c18ffb9753c135e2dd1c1119082dcbddadc31ca 100644
+index 5fbd881f4f10c0330ddb5a3415062fac2a332b9c..5c66e0eaefbb639e84e35cbfea614c628332e2fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -220,6 +220,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0797-Make-some-itemstacks-nonnull.patch b/patches/server/0796-Make-some-itemstacks-nonnull.patch
index 153d145fd3..153d145fd3 100644
--- a/patches/server/0797-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0796-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0798-Implement-enchantWithLevels-API.patch b/patches/server/0797-Implement-enchantWithLevels-API.patch
index 6999d72cfe..6999d72cfe 100644
--- a/patches/server/0798-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0797-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0799-Fix-saving-in-unloadWorld.patch b/patches/server/0798-Fix-saving-in-unloadWorld.patch
index d047059e5f..d047059e5f 100644
--- a/patches/server/0799-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0798-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0800-Buffer-OOB-setBlock-calls.patch b/patches/server/0799-Buffer-OOB-setBlock-calls.patch
index 4e1905eb3b..4e1905eb3b 100644
--- a/patches/server/0800-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0799-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0801-Add-TameableDeathMessageEvent.patch b/patches/server/0800-Add-TameableDeathMessageEvent.patch
index b08801fd3d..b08801fd3d 100644
--- a/patches/server/0801-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0800-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0801-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 26f87acfb8..26f87acfb8 100644
--- a/patches/server/0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0801-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0803-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0802-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 9c03da00a3..384e78da0b 100644
--- a/patches/server/0803-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0802-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ea3dfa9cd06e4a44ee819ed4a203779e4c10bbd9..c0db84c559c3ab5b202b234915e070b540a828fe 100644
+index 50f6a044385c22336e799efe471ab65e7196aaa6..a8732fe53dc0d6d5961c5e92e3ce5b500a75bcd7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -916,12 +916,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0804-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0803-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 4bed9196fe..710af87ca7 100644
--- a/patches/server/0804-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0803-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5aed3f18ef7464e1fa6f6ee69fad72d524356af0..32d7f615982f73dd985b919aae071d426ad08ca9 100644
+index ceddbc2e0fdec358bd7776af264df33696ecbd6d..5678616a48cc6d2c99b867678359ff31666be3f6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2778,7 +2778,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0805-Guard-against-invalid-entity-positions.patch b/patches/server/0804-Guard-against-invalid-entity-positions.patch
index da7c9a6c56..fbcb551845 100644
--- a/patches/server/0805-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0804-Guard-against-invalid-entity-positions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 420716136301b231a6228577dc8a63a58fa80292..d3802079724d994bc8187198810f21857d26f4c3 100644
+index 5678616a48cc6d2c99b867678359ff31666be3f6..cbb6a06265ebbdcc1210dec1c50a4384d51f6b5e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4448,11 +4448,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0806-cache-resource-keys.patch b/patches/server/0805-cache-resource-keys.patch
index c56e3412af..c56e3412af 100644
--- a/patches/server/0806-cache-resource-keys.patch
+++ b/patches/server/0805-cache-resource-keys.patch
diff --git a/patches/server/0807-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0806-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 5ed62ee0e3..f6f21a0744 100644
--- a/patches/server/0807-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0806-Allow-to-change-the-podium-for-the-EnderDragon.patch
@@ -123,10 +123,10 @@ index 1290090f855840bf64bf3a7ba93e3cb036630dcc..98fb6422df0ceadff5aaf4b2965eb1b0
                  this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
-index acdd2e6efa42476dd627a54da66576ea75bc02d4..92bcc01b3b28062aa966a7aaca199d7a3be832f4 100644
+index 1cfba7aaa807f70ce6d88bf67c7ddacecf55d295..492fdc855fe9735b614b6831aa5baaa6b252cfb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
-@@ -79,4 +79,22 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
+@@ -73,4 +73,22 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
      public int getDeathAnimationTicks() {
          return this.getHandle().dragonDeathTime;
      }
diff --git a/patches/server/0808-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0807-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 5fb11187b2..5fb11187b2 100644
--- a/patches/server/0808-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0807-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0809-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0808-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index fbb9b72b07..fbb9b72b07 100644
--- a/patches/server/0809-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0808-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0810-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0809-Prevent-tile-entity-copies-loading-chunks.patch
index 6803da9cc1..6803da9cc1 100644
--- a/patches/server/0810-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0809-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0811-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0810-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 0b34f9da4c..0b34f9da4c 100644
--- a/patches/server/0811-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0810-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0812-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0811-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index e809e65ba8..e809e65ba8 100644
--- a/patches/server/0812-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0811-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0813-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0812-Pass-ServerLevel-for-gamerule-callbacks.patch
index e546b9e9fd..e546b9e9fd 100644
--- a/patches/server/0813-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0812-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0813-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 6566872ef6..6566872ef6 100644
--- a/patches/server/0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0813-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0815-WorldCreator-keepSpawnLoaded.patch b/patches/server/0814-WorldCreator-keepSpawnLoaded.patch
index 900a92ca9e..900a92ca9e 100644
--- a/patches/server/0815-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0814-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index dd839528c9..dd839528c9 100644
--- a/patches/server/0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 4f2b30a276..4f2b30a276 100644
--- a/patches/server/0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0818-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0818-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0819-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0819-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0820-Add-PlayerStopUsingItemEvent.patch b/patches/server/0819-Add-PlayerStopUsingItemEvent.patch
index 0e7d33a986..0e7d33a986 100644
--- a/patches/server/0820-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0819-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0821-FallingBlock-auto-expire-setting.patch b/patches/server/0820-FallingBlock-auto-expire-setting.patch
index 870320aae9..9aa5e05ea3 100644
--- a/patches/server/0821-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0820-FallingBlock-auto-expire-setting.patch
@@ -46,10 +46,10 @@ index 562462729d0262bac5968583b064124167437449..18eaccb39a4c81338a8cbebe3de03934
  
      public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-index 7124d996fd34155fa76ff1b7ee3f823fb94b08a8..d17808d132b332d51189067fed245eb6bb904968 100644
+index e85a5dcae1a752c48dc457d05191355d72ca4443..a39694a27e362312eb42a29fd7c833f9c7437d46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-@@ -107,4 +107,15 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
+@@ -101,4 +101,15 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
              this.setHurtEntities(true);
          }
      }
diff --git a/patches/server/0822-Don-t-tick-markers.patch b/patches/server/0821-Don-t-tick-markers.patch
index 9980fc455d..9980fc455d 100644
--- a/patches/server/0822-Don-t-tick-markers.patch
+++ b/patches/server/0821-Don-t-tick-markers.patch
diff --git a/patches/server/0823-Do-not-accept-invalid-client-settings.patch b/patches/server/0822-Do-not-accept-invalid-client-settings.patch
index c2c5f72c55..c2c5f72c55 100644
--- a/patches/server/0823-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0822-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0824-Add-support-for-Proxy-Protocol.patch b/patches/server/0823-Add-support-for-Proxy-Protocol.patch
index d4098f4846..0667904896 100644
--- a/patches/server/0824-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0823-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 102955438ce339c403a5c0a7409bcf1894293c44..57f2c414dbfe127c193002fbc8eeb22e94e9cb55 100644
+index a62f151047f90ef1db278192b29b3bd3213d4d46..fb98936bb8a5488db75d676c5bcb4060597fbbf8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,7 @@ dependencies {
diff --git a/patches/server/0825-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 13111af547..13111af547 100644
--- a/patches/server/0825-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0826-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0826-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0827-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch
index 52fcd344ad..52fcd344ad 100644
--- a/patches/server/0827-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0828-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0828-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0829-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch
index b8918a1854..b83ba1cdd0 100644
--- a/patches/server/0829-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a92c3b7dbd4bd352ba1d2ed3310c8993ea3ea921..ad33392e27ce009dbbf1d16f669542fd9623db01 100644
+index cbb6a06265ebbdcc1210dec1c50a4384d51f6b5e..34f5919448a408e7f4c72299fe72d8daabe34402 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -796,6 +796,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0830-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
index fbdcc9b82f..fbdcc9b82f 100644
--- a/patches/server/0830-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0831-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch
index 2638138390..2638138390 100644
--- a/patches/server/0831-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0832-Dont-resent-entity-on-art-update.patch b/patches/server/0831-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..aa24ac355d 100644
--- a/patches/server/0832-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0831-Dont-resent-entity-on-art-update.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dont resent entity on art update
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
-index 1d54465f1835f5e419899a7585d3dec920e1a73b..b7610e880e857058b621228583c841b5d9338fc7 100644
+index be722f9c7f14270a29b1d3694c905426520d73c6..7f4b7ce6b85b4774f58be2c9afd4230a821dd9cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
-@@ -38,7 +38,7 @@ public class CraftPainting extends CraftHanging implements Painting {
+@@ -37,7 +37,7 @@ public class CraftPainting extends CraftHanging implements Painting {
              painting.setDirection(painting.getDirection());
              return false;
          }
diff --git a/patches/server/0833-Add-WardenAngerChangeEvent.patch b/patches/server/0832-Add-WardenAngerChangeEvent.patch
index 2e66f62a0c..2e66f62a0c 100644
--- a/patches/server/0833-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0832-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0834-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch
index 8eea382975..b80d19283a 100644
--- a/patches/server/0834-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index 97b6f2ae67edd37483a27a7e8678d9d78508d990..13078ac512fddc8009114c1c3bec8f67
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c0db84c559c3ab5b202b234915e070b540a828fe..48cd206a41fe238af4c53b7f2a664fb16da366a5 100644
+index a8732fe53dc0d6d5961c5e92e3ce5b500a75bcd7..02eacfb09ce437d5bbb38c5f0e71d7b78793dedc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1315,6 +1315,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0835-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch
index cdb1bc89a3..cdb1bc89a3 100644
--- a/patches/server/0835-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0836-Nameable-Banner-API.patch b/patches/server/0835-Nameable-Banner-API.patch
index 78f176be32..78f176be32 100644
--- a/patches/server/0836-Nameable-Banner-API.patch
+++ b/patches/server/0835-Nameable-Banner-API.patch
diff --git a/patches/server/0837-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch
index 70b52ee7b4..70b52ee7b4 100644
--- a/patches/server/0837-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0838-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch
index d4b066c764..d4b066c764 100644
--- a/patches/server/0838-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0839-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 73b5c96f27..6397403478 100644
--- a/patches/server/0839-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
@@ -7,10 +7,10 @@ Remove in 1.19 along with the SplashPotion and
 LingeringPotion interfaces
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index 2b8a4ad4bca3044f1af274cdff90e6d66b6c7da7..5c3bc680c4e4e6dc4b2d9edc666d6a8d95c2e7b7 100644
+index f1a3ed6670fcb4e40000ed5c4f7042a4ca99175c..04bcb1f26db12556d70e41541a5df0700d20d964 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-@@ -14,7 +14,7 @@ import org.bukkit.entity.ThrownPotion;
+@@ -13,7 +13,7 @@ import org.bukkit.entity.ThrownPotion;
  import org.bukkit.inventory.ItemStack;
  import org.bukkit.potion.PotionEffect;
  
diff --git a/patches/server/0840-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch
index 4a218bdcb8..4a218bdcb8 100644
--- a/patches/server/0840-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0841-Add-Player-getFishHook.patch b/patches/server/0840-Add-Player-getFishHook.patch
index 1f16e905b9..3298fb8485 100644
--- a/patches/server/0841-Add-Player-getFishHook.patch
+++ b/patches/server/0840-Add-Player-getFishHook.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 329e0586ec4ea44b6a8f4b72a69041aa7cd01ced..35f79f34b86dbf6d592842883f53f83e07f95f93 100644
+index 3f64d57b7d92820226c323d1d560432f5c27e650..6f694f68c2792da7088c2aba1d2b201f802b3a5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -161,6 +161,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0842-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0842-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0843-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch
index 45c1f0c564..d4158cd3cf 100644
--- a/patches/server/0843-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ad33392e27ce009dbbf1d16f669542fd9623db01..63e31a1ceac5ff944e2e79b7f10f38109cffcf88 100644
+index 34f5919448a408e7f4c72299fe72d8daabe34402..f9704cefbc1a3b6546dfefd0708fa5485e0a8e72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2677,6 +2677,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,7 +24,7 @@ index ad33392e27ce009dbbf1d16f669542fd9623db01..63e31a1ceac5ff944e2e79b7f10f3810
              EntityDropItemEvent event = new EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
              Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index b3c904416e19edb3508e4e7aa11e1f58cd3fc203..4ec6dc8ddcb940091956fdf014f43832db287d8d 100644
+index 1c4b8b29faac3dbcfc14a07b24c64650982ece00..8448c5d778998390cf2b683f36e4e18ca7ffdc34 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -597,7 +597,7 @@ public class Dolphin extends WaterAnimal {
diff --git a/patches/server/0844-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch
index b47f885404..b47f885404 100644
--- a/patches/server/0844-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0845-Fix-Bee-flower-NPE.patch b/patches/server/0844-Fix-Bee-flower-NPE.patch
index 8bf7400efa..8bf7400efa 100644
--- a/patches/server/0845-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0844-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0846-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 3b8b782960..3b8b782960 100644
--- a/patches/server/0846-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0847-More-Teleport-API.patch b/patches/server/0846-More-Teleport-API.patch
index f931b6243f..38009f8524 100644
--- a/patches/server/0847-More-Teleport-API.patch
+++ b/patches/server/0846-More-Teleport-API.patch
@@ -31,10 +31,10 @@ index 81ba625e01dad1373ef7d5377bb28f9f0b0ae34e..9a5ec7667b99ab271ff9824d3f250c11
              d0 = to.getX();
              d1 = to.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index cc72d960d9a5f9481ec2214b1549a344907a68da..94b41e9e3abe9cfbe09af67b03bc841fc009b75c 100644
+index f61d3cd3cdbfe17f6818fbbb163f80ba3de50ca1..df554fa92065bc4c8566a9638f4f6f6ca9ba54db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -561,15 +561,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -567,15 +567,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
      @Override
      public boolean teleport(Location location, TeleportCause cause) {
@@ -74,7 +74,7 @@ index cc72d960d9a5f9481ec2214b1549a344907a68da..94b41e9e3abe9cfbe09af67b03bc841f
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aca87ca2bb08716ab9c5e00f8735b10e33a36373..d93cb65e623d52f403d181f83ae950badb7bf810 100644
+index 488b92974ac42b08478c0afd9b6115afe4996dc7..87e749a6843dc935ddafc4beaab6996af5beb167 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1210,13 +1210,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0848-Add-EntityPortalReadyEvent.patch b/patches/server/0847-Add-EntityPortalReadyEvent.patch
index 91eedd9dff..af281cff3d 100644
--- a/patches/server/0848-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0847-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 63e31a1ceac5ff944e2e79b7f10f38109cffcf88..5bc44f88ec3ad6e25c2df6e6829c1d9a1f8f836d 100644
+index f9704cefbc1a3b6546dfefd0708fa5485e0a8e72..e09a4ebbbcd2e3f55b8b764cbc36d72bc3092085 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3016,6 +3016,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0849-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch
index a510263a68..a510263a68 100644
--- a/patches/server/0849-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0850-Send-block-entities-after-destroy-prediction.patch b/patches/server/0849-Send-block-entities-after-destroy-prediction.patch
index 6c5d93fca7..6c5d93fca7 100644
--- a/patches/server/0850-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0849-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0851-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch
index 111d9702f9..111d9702f9 100644
--- a/patches/server/0851-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0852-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch
index 822b1e2664..747b46180d 100644
--- a/patches/server/0852-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d93cb65e623d52f403d181f83ae950badb7bf810..d8d440a73cf9173a94ddfeb332f4829b0ce6f44a 100644
+index 87e749a6843dc935ddafc4beaab6996af5beb167..a95f9aa48f50eaa0d32c5e87e35d53436bbb56e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -650,6 +650,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0853-Add-missing-BlockFadeEvents.patch b/patches/server/0852-Add-missing-BlockFadeEvents.patch
index e939b49a21..e939b49a21 100644
--- a/patches/server/0853-Add-missing-BlockFadeEvents.patch
+++ b/patches/server/0852-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0854-Collision-API.patch b/patches/server/0853-Collision-API.patch
index abf0202c4e..e08d82cd05 100644
--- a/patches/server/0854-Collision-API.patch
+++ b/patches/server/0853-Collision-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 9c18ffb9753c135e2dd1c1119082dcbddadc31ca..6537862552818e1e9e0a684a4999e27bd46753d3 100644
+index 5c66e0eaefbb639e84e35cbfea614c628332e2fa..445e6bcebb8d4451c6bd547d3efd98dd01a4664f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -1015,5 +1015,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -22,10 +22,10 @@ index 9c18ffb9753c135e2dd1c1119082dcbddadc31ca..6537862552818e1e9e0a684a4999e27b
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 94b41e9e3abe9cfbe09af67b03bc841fc009b75c..f7c879cf10f89eaeb41a0f40787bd2c98d8d3f31 100644
+index df554fa92065bc4c8566a9638f4f6f6ca9ba54db..bc0a46a6f2ae24b40d3997074c9084cdbb595602 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1408,4 +1408,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1419,4 +1419,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
      }
      // Paper end
diff --git a/patches/server/0855-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index aa73cbbddf..aa73cbbddf 100644
--- a/patches/server/0855-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0856-Block-Ticking-API.patch b/patches/server/0855-Block-Ticking-API.patch
index 583ed00736..583ed00736 100644
--- a/patches/server/0856-Block-Ticking-API.patch
+++ b/patches/server/0855-Block-Ticking-API.patch
diff --git a/patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
index 6ec422b4fb..6ec422b4fb 100644
--- a/patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 2e38ad24c3..2e38ad24c3 100644
--- a/patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0859-Add-NamespacedKey-biome-methods.patch b/patches/server/0858-Add-NamespacedKey-biome-methods.patch
index e03f769d70..e03f769d70 100644
--- a/patches/server/0859-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0858-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
index eef2cb84ad..fc9d240160 100644
--- a/patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
@@ -49,7 +49,7 @@ index 66bb92ca535b559d3bca89b9bc841f8f842b7e07..c5f3dc74888919e82e2ffbb8d648b764
          // Paper end
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 800c70f022aee593ff35f05a86ddeba864567f2d..0fb86a1183e0373a68e110a8828df5b63a71d751 100644
+index 2dca21932c5c97a13c77a559400f0d01eba42c34..bfa091f72d6f477bcaf63d364639a1b4df9b1987 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -18,6 +18,12 @@ public class Main {
diff --git a/patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch
index a66acfb1ef..a66acfb1ef 100644
--- a/patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch
index 66e4d63675..66e4d63675 100644
--- a/patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0863-Missing-eating-regain-reason.patch b/patches/server/0862-Missing-eating-regain-reason.patch
index c3b9f6bde8..c3b9f6bde8 100644
--- a/patches/server/0863-Missing-eating-regain-reason.patch
+++ b/patches/server/0862-Missing-eating-regain-reason.patch
diff --git a/patches/server/0864-Missing-effect-cause.patch b/patches/server/0863-Missing-effect-cause.patch
index 2b4bcfc188..2b4bcfc188 100644
--- a/patches/server/0864-Missing-effect-cause.patch
+++ b/patches/server/0863-Missing-effect-cause.patch
diff --git a/patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch
index 28ffa3283e..28ffa3283e 100644
--- a/patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 392e7b8688..4c66876b92 100644
--- a/patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c29067c513531b819e4d48cd8cab3ed036ae1668..877d3eba8fead8793258f762058121a68e627378 100644
+index 17bb9318262b04c2005bec23bcaf05f3ed06c7db..7909df54223545bb26a3d530f51c11da12dce0e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -509,8 +509,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0867-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0866-Call-BlockPhysicsEvent-more-often.patch
index 83450685d0..83450685d0 100644
--- a/patches/server/0867-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0866-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0868-Configurable-chat-thread-limit.patch b/patches/server/0867-Configurable-chat-thread-limit.patch
index ae9a119f3e..ae9a119f3e 100644
--- a/patches/server/0868-Configurable-chat-thread-limit.patch
+++ b/patches/server/0867-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index c9938548a4..c9938548a4 100644
--- a/patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0870-fix-Jigsaw-block-kicking-user.patch b/patches/server/0869-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0870-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0869-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 9f2be73c77..39be29edef 100644
--- a/patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] use BlockFormEvent for mud converting into clay
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index 5355d9f3eb241be8101e8770c63cabbaf1e6d471..e6efeec733802a17b1ac47ded1af418595c2b94f 100644
+index 741aef7f4fbe1eba8db1eb4eb2ab255906863c66..cd943997f11f5ea5c600fdc6db96043fb0fa713c 100644
 --- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 @@ -211,10 +211,13 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
diff --git a/patches/server/0872-Add-getDrops-to-BlockState.patch b/patches/server/0871-Add-getDrops-to-BlockState.patch
index 7f9d14aad9..7f9d14aad9 100644
--- a/patches/server/0872-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0871-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch
index eac2a29adf..eac2a29adf 100644
--- a/patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 758839864f..758839864f 100644
--- a/patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0875-Fix-custom-piglin-loved-items.patch b/patches/server/0874-Fix-custom-piglin-loved-items.patch
index e768ba98b8..e768ba98b8 100644
--- a/patches/server/0875-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0874-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0876-EntityPickupItemEvent-fixes.patch b/patches/server/0875-EntityPickupItemEvent-fixes.patch
index 8c7fe9dd48..8c7fe9dd48 100644
--- a/patches/server/0876-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0875-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch
index 1aa068e733..1aa068e733 100644
--- a/patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch
index 70dd42cf1b..2a7fe9899e 100644
--- a/patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 48cd206a41fe238af4c53b7f2a664fb16da366a5..88726c9bfd6dee2110910f43a042a9b29717dc82 100644
+index 02eacfb09ce437d5bbb38c5f0e71d7b78793dedc..a114d53e3bdd5889882d72ea46f109a91ad5d65b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -371,6 +371,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0879-Elder-Guardian-appearance-API.patch b/patches/server/0878-Elder-Guardian-appearance-API.patch
index 33961cf705..dc4e1ca9f7 100644
--- a/patches/server/0879-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0878-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 343ceadda0571a38723e83a24b04a657e46d3b6f..c0ff678f8f0f2a3db056907ccd4cbde19c2c9e0d 100644
+index a95f9aa48f50eaa0d32c5e87e35d53436bbb56e1..24d8de19bd29cb318e8da8644fce454398bb8d38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3159,6 +3159,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3154,6 +3154,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0880-Allow-changing-bed-s-occupied-property.patch b/patches/server/0879-Allow-changing-bed-s-occupied-property.patch
index 4d0128b6d3..4d0128b6d3 100644
--- a/patches/server/0880-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0879-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0881-Add-entity-knockback-API.patch b/patches/server/0880-Add-entity-knockback-API.patch
index 92dc055fcf..3ee3120449 100644
--- a/patches/server/0881-Add-entity-knockback-API.patch
+++ b/patches/server/0880-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 877d3eba8fead8793258f762058121a68e627378..0b5e4d4a58c6fbfd87832859d3a21cc45e31a3e2 100644
+index 7909df54223545bb26a3d530f51c11da12dce0e6..6c1ef794af467693f9a62d3312f3c969e46e4835 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1016,5 +1016,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1011,5 +1011,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          }
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
diff --git a/patches/server/0882-Detect-headless-JREs.patch b/patches/server/0881-Detect-headless-JREs.patch
index 9d49be7a76..9d49be7a76 100644
--- a/patches/server/0882-Detect-headless-JREs.patch
+++ b/patches/server/0881-Detect-headless-JREs.patch
diff --git a/patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch
index 19c5cdfd72..19c5cdfd72 100644
--- a/patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0884-optimized-dirt-and-snow-spreading.patch b/patches/server/0883-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0884-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0883-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0885-Added-EntityToggleSitEvent.patch b/patches/server/0884-Added-EntityToggleSitEvent.patch
index 0aeccc4f1a..0aeccc4f1a 100644
--- a/patches/server/0885-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0884-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0886-Add-fire-tick-delay-option.patch b/patches/server/0885-Add-fire-tick-delay-option.patch
index e9a876ed2b..e9a876ed2b 100644
--- a/patches/server/0886-Add-fire-tick-delay-option.patch
+++ b/patches/server/0885-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0887-Add-Moving-Piston-API.patch b/patches/server/0886-Add-Moving-Piston-API.patch
index 53df041ba1..53df041ba1 100644
--- a/patches/server/0887-Add-Moving-Piston-API.patch
+++ b/patches/server/0886-Add-Moving-Piston-API.patch
diff --git a/patches/server/0888-Ignore-impossible-spawn-tick.patch b/patches/server/0887-Ignore-impossible-spawn-tick.patch
index 46cd469266..46cd469266 100644
--- a/patches/server/0888-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0887-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch
index 389dfc4431..389dfc4431 100644
--- a/patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 5c611fbfce..207f99736b 100644
--- a/patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5bc44f88ec3ad6e25c2df6e6829c1d9a1f8f836d..869062266419beca820d95a40b6a8a5ce8a31e1f 100644
+index e09a4ebbbcd2e3f55b8b764cbc36d72bc3092085..32093c96a22221f17411aaf260db071f27350966 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3291,6 +3291,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0892-Prevent-compass-from-loading-chunks.patch b/patches/server/0891-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0892-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0891-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0893-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0892-Add-PrePlayerAttackEntityEvent.patch
index 01fbd77bb2..01fbd77bb2 100644
--- a/patches/server/0893-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0892-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch
index 1f9fc08b58..1f9fc08b58 100644
--- a/patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 9780023a35..9780023a35 100644
--- a/patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0896-Add-Player-Warden-Warning-API.patch b/patches/server/0895-Add-Player-Warden-Warning-API.patch
index bff474c8e6..a187af4d34 100644
--- a/patches/server/0896-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0895-Add-Player-Warden-Warning-API.patch
@@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c0ff678f8f0f2a3db056907ccd4cbde19c2c9e0d..bb4084e96a31492cf090ecda28ebd88f2af44623 100644
+index 24d8de19bd29cb318e8da8644fce454398bb8d38..ea08282554954e838bf8ebb00744bf103b9da5d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3164,6 +3164,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3159,6 +3159,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }
diff --git a/patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch
index 18bc407bfb..4d50741382 100644
--- a/patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch
@@ -35,10 +35,10 @@ index 4bef7abbed6b64c2f126c81af5484eff200e620f..e30d5ae3e2900f43d7cafde71b8196f2
  
      public void gossip(ServerLevel world, Villager villager, long time) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index 6f7977b492ce01e7cda7872c42bd7f2386d3e745..f21c715ea109164efa755cddb35ef656a9859759 100644
+index b27b9001b8eb74c713e6766f0919110432775a2e..f29e221e5b850516c169c03bfbd2b0885d1a841b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -99,6 +99,34 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
+@@ -93,6 +93,34 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
      }
  
      // Paper start
diff --git a/patches/server/0898-Add-paper-dumplisteners-command.patch b/patches/server/0897-Add-paper-dumplisteners-command.patch
index cbf1598dd5..cbf1598dd5 100644
--- a/patches/server/0898-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0897-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0899-check-global-player-list-where-appropriate.patch b/patches/server/0898-check-global-player-list-where-appropriate.patch
index 06093f7117..06093f7117 100644
--- a/patches/server/0899-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0898-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch
index 209c549aa9..b414dd2347 100644
--- a/patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,7 +17,7 @@ index 52fd12c474c01f3b53d0f6596b7a6fafee52bd0d..877498729c66de9aa6a27c9148f7494d
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 6537862552818e1e9e0a684a4999e27bd46753d3..b305941aaf50b417bb054a9327c67a0891f2fe9e 100644
+index 445e6bcebb8d4451c6bd547d3efd98dd01a4664f..b86abf25c8e51f8133ae5d58c31d2362d895d947 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -401,10 +401,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0901-ItemStack-damage-API.patch b/patches/server/0900-ItemStack-damage-API.patch
index 50b1a931b1..f5dc7f03b0 100644
--- a/patches/server/0901-ItemStack-damage-API.patch
+++ b/patches/server/0900-ItemStack-damage-API.patch
@@ -11,10 +11,10 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0b5e4d4a58c6fbfd87832859d3a21cc45e31a3e2..83429bfd26128e85864806699017a481109e75e4 100644
+index 6c1ef794af467693f9a62d3312f3c969e46e4835..97b66e029880fc625ecd5dff62e1c949a696fdd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1012,6 +1012,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
  
diff --git a/patches/server/0902-Friction-API.patch b/patches/server/0901-Friction-API.patch
index b81cea4c7b..c7b1218572 100644
--- a/patches/server/0902-Friction-API.patch
+++ b/patches/server/0901-Friction-API.patch
@@ -109,10 +109,10 @@ index 08a2ce0ab024b99df5f6e23aa5a13c9d6f431db6..52196431a6538872755344859a0454a0
  
          this.setItem(ItemStack.of(nbttagcompound1));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index e9946edf568db010e4ccb9fe7755709ed7b8310f..a925b5c490e7129b27370aa57b5fad1cf05530c6 100644
+index d160db37a3b7ef44b6de8fef209eeccef46c3a95..5e83fabb20bc2b0668cbf48530053ca1bb9092f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -103,6 +103,18 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -102,6 +102,18 @@ public class CraftItem extends CraftEntity implements Item {
          item.age = willAge ? 0 : NO_AGE_TIME;
       }
  
@@ -132,10 +132,10 @@ index e9946edf568db010e4ccb9fe7755709ed7b8310f..a925b5c490e7129b27370aa57b5fad1c
      public int getHealth() {
          return item.health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 83429bfd26128e85864806699017a481109e75e4..b166ca8b8d21b3f7e930fa9b9b71fbca70bfdb97 100644
+index 97b66e029880fc625ecd5dff62e1c949a696fdd0..736eb990bec434729eb3f3432389ab135436b133 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1064,6 +1064,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1059,6 +1059,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          });
      }
  
diff --git a/patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a019ee3c47..a019ee3c47 100644
--- a/patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0904-Fix-player-kick-on-shutdown.patch b/patches/server/0903-Fix-player-kick-on-shutdown.patch
index b954657690..b954657690 100644
--- a/patches/server/0904-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0903-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0905-Sync-offhand-slot-in-menus.patch b/patches/server/0904-Sync-offhand-slot-in-menus.patch
index 66e1fc2fc7..b570019bfe 100644
--- a/patches/server/0905-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0904-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 88726c9bfd6dee2110910f43a042a9b29717dc82..9d46536f80b5b3e6641fd377c02166a431edfd77 100644
+index a114d53e3bdd5889882d72ea46f109a91ad5d65b..dc5fda83a66afbfeb7897fc20b4742899d8aca08 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -340,6 +340,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0906-Player-Entity-Tracking-Events.patch b/patches/server/0905-Player-Entity-Tracking-Events.patch
index d0d18cc406..81e94a6e1f 100644
--- a/patches/server/0906-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0905-Player-Entity-Tracking-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0bce657c8f7b98dfc6bb59c81d22c0172df21115..b1f5de9d80ee46ea8e61f6b8009fdd38424db7fa 100644
+index 32093c96a22221f17411aaf260db071f27350966..58eb0a7be2e5b4dd2aba8aebc0f7a57ff1348135 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4018,9 +4018,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0907-Limit-pet-look-distance.patch b/patches/server/0906-Limit-pet-look-distance.patch
index 144e4e1680..144e4e1680 100644
--- a/patches/server/0907-Limit-pet-look-distance.patch
+++ b/patches/server/0906-Limit-pet-look-distance.patch
diff --git a/patches/server/0908-Properly-resend-entities.patch b/patches/server/0907-Properly-resend-entities.patch
index 1f77d5ced5..1f77d5ced5 100644
--- a/patches/server/0908-Properly-resend-entities.patch
+++ b/patches/server/0907-Properly-resend-entities.patch
diff --git a/patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch
index f7f6ee5b61..f7f6ee5b61 100644
--- a/patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0910-fix-Instruments.patch b/patches/server/0909-fix-Instruments.patch
index d2d3e96851..be861ecff0 100644
--- a/patches/server/0910-fix-Instruments.patch
+++ b/patches/server/0909-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f471c76ec8f3b421d7b0a699099919d6d28b8ccd..2b31486304a919eeaaff9bc0056d5551854c8b5d 100644
+index ea08282554954e838bf8ebb00744bf103b9da5d7..9e5c56c8ca9d7b3ba5484686e2fbedf6dc3fedcb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -724,29 +724,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index f4f36a8f11..f4f36a8f11 100644
--- a/patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 923b2ffa50..923b2ffa50 100644
--- a/patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0913-Add-BlockLockCheckEvent.patch b/patches/server/0912-Add-BlockLockCheckEvent.patch
index 29e8b68880..29e8b68880 100644
--- a/patches/server/0913-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0912-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0914-Add-Sneaking-API-for-Entities.patch b/patches/server/0913-Add-Sneaking-API-for-Entities.patch
index c7ba3ecf8f..f404fed4d7 100644
--- a/patches/server/0914-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0913-Add-Sneaking-API-for-Entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f7c879cf10f89eaeb41a0f40787bd2c98d8d3f31..733158b6f2c2bd03fbe798562ff7bc33280548dc 100644
+index bc0a46a6f2ae24b40d3997074c9084cdbb595602..1186ee7cc4671892346b7173d10125febcfbf88a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1191,6 +1191,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1202,6 +1202,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return Pose.values()[this.getHandle().getPose().ordinal()];
      }
  
diff --git a/patches/server/0915-Improve-logging-and-errors.patch b/patches/server/0914-Improve-logging-and-errors.patch
index e07c007658..e07c007658 100644
--- a/patches/server/0915-Improve-logging-and-errors.patch
+++ b/patches/server/0914-Improve-logging-and-errors.patch
diff --git a/patches/server/0916-Improve-PortalEvents.patch b/patches/server/0915-Improve-PortalEvents.patch
index 2ae3c50949..2ddc3d8b5e 100644
--- a/patches/server/0916-Improve-PortalEvents.patch
+++ b/patches/server/0915-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b1f5de9d80ee46ea8e61f6b8009fdd38424db7fa..4951bcbda4b8003e78d60c986351be011d96ede2 100644
+index 58eb0a7be2e5b4dd2aba8aebc0f7a57ff1348135..6fd0e3556f771464854bd8477163ced7b10b0fc4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3674,7 +3674,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch
index 79b5138f8f..083f8bc89c 100644
--- a/patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 414f635fd591d1b89806c7980bc3734753dcc8c4..11b413e85ad23fa555392c0dcb639e7b90ae6526 100644
+index 6fd0e3556f771464854bd8477163ced7b10b0fc4..c0b23dc9f06655bc8ff447e0960404ce234b9b7e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch
index 1a4d7c4c10..1a4d7c4c10 100644
--- a/patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 04dbb4d045..50b24fc2c0 100644
--- a/patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix NPE on Allay#stopDancing while not dancing
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
-index 38b060f2395df1803a896be8fb2dbc7510e92832..debccfa7cb5517a877c06b13468db57534ace77e 100644
+index cb8c2d0efa72c00a57dee5949943f6c7a2019c64..dc19a0ad99deed9cc71c243322e375b740db7a9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
-@@ -84,7 +84,7 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay
+@@ -78,7 +78,7 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay
      public void stopDancing() {
          this.getHandle().forceDancing = false;
          this.getHandle().jukeboxPos = null;
diff --git a/patches/server/0920-Flying-Fall-Damage.patch b/patches/server/0919-Flying-Fall-Damage.patch
index fe6cf1eaf3..df573bec28 100644
--- a/patches/server/0920-Flying-Fall-Damage.patch
+++ b/patches/server/0919-Flying-Fall-Damage.patch
@@ -26,10 +26,10 @@ index 53487f0a4fe672298c3b83d24a2a603641afcde8..58152160d609d0e9d105153aeb166a56
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7cb90ec9ae50ab6bbf4da1d37513f6b2e38d320a..a3eccebfd65f8450280aee31afc1203bcb4d978d 100644
+index 9e5c56c8ca9d7b3ba5484686e2fbedf6dc3fedcb..05d9dc64d2827904f1cbb00d5a1710af89852f76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2381,6 +2381,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2376,6 +2376,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 807bc860c2..807bc860c2 100644
--- a/patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 2e5c280365..a44797742c 100644
--- a/patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 11b413e85ad23fa555392c0dcb639e7b90ae6526..e70e6f82321ac0c6c8ac1f7d9144e1e9495bf5ae 100644
+index c0b23dc9f06655bc8ff447e0960404ce234b9b7e..a16d3c98f73d96aa7b0a7e72791c45a125bf84eb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0923-config-for-disabling-entity-tag-tags.patch b/patches/server/0922-config-for-disabling-entity-tag-tags.patch
index e7680c986a..e7680c986a 100644
--- a/patches/server/0923-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0922-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0924-Use-single-player-info-update-packet-on-join.patch b/patches/server/0923-Use-single-player-info-update-packet-on-join.patch
index 139aa8bdd8..139aa8bdd8 100644
--- a/patches/server/0924-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0923-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 9edc053a77..9edc053a77 100644
--- a/patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0926-Win-Screen-API.patch b/patches/server/0925-Win-Screen-API.patch
index 6ebc66f5c4..857f4223a3 100644
--- a/patches/server/0926-Win-Screen-API.patch
+++ b/patches/server/0925-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 23cd31aae3845b6aea632fcef1a238a7bb63a028..be0e519188d401499e3d7a416146fd516b074b77 100644
+index 05d9dc64d2827904f1cbb00d5a1710af89852f76..d828ac224f07ec6992c48a19bcd4e189783d2bcb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1213,6 +1213,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
index f6cf642638..f6cf642638 100644
--- a/patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0928-Fix-force-opening-enchantment-tables.patch b/patches/server/0927-Fix-force-opening-enchantment-tables.patch
index 97bfc2c883..fb22bc76d9 100644
--- a/patches/server/0928-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0927-Fix-force-opening-enchantment-tables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 35f79f34b86dbf6d592842883f53f83e07f95f93..bca41901e2a44458dd9f53c2ab7181d86de54e9e 100644
+index 6f694f68c2792da7088c2aba1d2b201f802b3a5c..50f2a94c5f2e9f7c08cea137d8d84d65e2c41326 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -402,7 +402,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0929-Add-Entity-Body-Yaw-API.patch b/patches/server/0928-Add-Entity-Body-Yaw-API.patch
index 32feb04c9d..8fa2c2ab5f 100644
--- a/patches/server/0929-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0928-Add-Entity-Body-Yaw-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b166ca8b8d21b3f7e930fa9b9b71fbca70bfdb97..73cd175cba0e441b8af63d8c05ae0d9143687995 100644
+index 736eb990bec434729eb3f3432389ab135436b133..860de727f4eb220d5cce62d0850f240b900412ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1051,6 +1051,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
      }
  
diff --git a/patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 097c2e3932..097c2e3932 100644
--- a/patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0932-Add-EntityFertilizeEggEvent.patch b/patches/server/0931-Add-EntityFertilizeEggEvent.patch
index d32f3e6081..d32f3e6081 100644
--- a/patches/server/0932-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0931-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 2e74734a41..7392c030a0 100644
--- a/patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv
 public net.minecraft.server.level.ServerPlayer containerSynchronizer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index bca41901e2a44458dd9f53c2ab7181d86de54e9e..0f3e696582cd288357598490e8af0131ab30bdfc 100644
+index 50f2a94c5f2e9f7c08cea137d8d84d65e2c41326..5fe9a0985432ac6cdd28a2a138854a24f10e42ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -755,8 +755,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 1291727de8..1291727de8 100644
--- a/patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch
index 103ddcbb11..fec2b2ac08 100644
--- a/patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Correctly handle ArmorStand invisibility
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index f80cafe3544c7e6c3c29073ba6539783adf6666c..17d08d2c90047ebfc4098b087be091b83111a40f 100644
+index 273f3c029f878c8a30e4f0911d79195c023d3442..dc26be80f2c1f058451c0d446165bc78a0ff8c47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-@@ -158,6 +158,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
+@@ -152,6 +152,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
          this.getHandle().noPhysics = !gravity;
      }
  
diff --git a/patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch
index 8f732ca932..8f732ca932 100644
--- a/patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0937-Fix-text-display-error-on-spawn.patch b/patches/server/0936-Fix-text-display-error-on-spawn.patch
index 4849e726e6..4849e726e6 100644
--- a/patches/server/0937-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0936-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch
index d3435b63af..d3435b63af 100644
--- a/patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0939-Add-Shearable-API.patch b/patches/server/0938-Add-Shearable-API.patch
index 950ecc2beb..7fe688ee70 100644
--- a/patches/server/0939-Add-Shearable-API.patch
+++ b/patches/server/0938-Add-Shearable-API.patch
@@ -32,10 +32,10 @@ index 0000000000000000000000000000000000000000..bcf254e3c81cf1e401bddc850fb24ad2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
-index 20eaa3424428b8b30fd15591b660983cb7fc4375..4a6aae106de5eeeb80c078c5a167ef0484b13929 100644
+index 3e0049c2442c5941e02da0b0fb643784746cb2a1..1efc208dbb00b693de0c1d883e90b310cbf253e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
-@@ -6,7 +6,7 @@ import org.bukkit.entity.EntityType;
+@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.MushroomCow;
  import org.bukkit.entity.MushroomCow.Variant;
  
@@ -45,11 +45,11 @@ index 20eaa3424428b8b30fd15591b660983cb7fc4375..4a6aae106de5eeeb80c078c5a167ef04
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
-index ca8e35fbf04a54d60c3612f74be0b5fbf2ab7a56..81ccb4bde315c42409a0c04883f5cb4551398308 100644
+index c83f16868571ab4724201e9369ab8d90d0e280c5..19e8fc7fa6037b063bc1809c85c703996cd9b5ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
-@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
+@@ -4,7 +4,7 @@ import org.bukkit.DyeColor;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Sheep;
  
 -public class CraftSheep extends CraftAnimals implements Sheep {
@@ -58,11 +58,11 @@ index ca8e35fbf04a54d60c3612f74be0b5fbf2ab7a56..81ccb4bde315c42409a0c04883f5cb45
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index 659e2959c5330e4764ea1edc7f8de9f464f9ff52..42b7058d93fab8cbee49dba130734e1df9910096 100644
+index 5d2e0fb911265f1184de5434464378ffba98d379..e4a14cdfeb91a3d32e622d27d612605b1bca08e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
+@@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.SnowGolem;
+ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.Snowman;
  
 -public class CraftSnowman extends CraftGolem implements Snowman, com.destroystokyo.paper.entity.CraftRangedEntity<SnowGolem> { // Paper
diff --git a/patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4c90082c28..4c90082c28 100644
--- a/patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
index 3706154e05..3706154e05 100644
--- a/patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
+++ b/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0942-Optimize-Hoppers.patch b/patches/server/0941-Optimize-Hoppers.patch
index 6265c6bf6a..6265c6bf6a 100644
--- a/patches/server/0942-Optimize-Hoppers.patch
+++ b/patches/server/0941-Optimize-Hoppers.patch
diff --git a/patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch
index f6e73d0190..f6e73d0190 100644
--- a/patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index f4282269d8..f4282269d8 100644
--- a/patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0945-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch
index c73068144d..c73068144d 100644
--- a/patches/server/0945-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0946-remove-duplicate-animate-packet-for-records.patch b/patches/server/0945-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0946-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0945-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch
index a5713a5087..a5713a5087 100644
--- a/patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 6671aa6357..6671aa6357 100644
--- a/patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0949-Use-array-for-gamerule-storage.patch b/patches/server/0948-Use-array-for-gamerule-storage.patch
index 52052561af..52052561af 100644
--- a/patches/server/0949-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0948-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch
index 195413f40e..195413f40e 100644
--- a/patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0952-Add-Mob-Experience-reward-API.patch b/patches/server/0951-Add-Mob-Experience-reward-API.patch
index 3c07d5e971..3c07d5e971 100644
--- a/patches/server/0952-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0951-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch
index 461e4c40ca..461e4c40ca 100644
--- a/patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch
index 8704b34118..8704b34118 100644
--- a/patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0956-More-accurate-isInOpenWater-impl.patch b/patches/server/0955-More-accurate-isInOpenWater-impl.patch
index 5d9d32149a..c782627938 100644
--- a/patches/server/0956-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0955-More-accurate-isInOpenWater-impl.patch
@@ -13,10 +13,10 @@ public net.minecraft.world.entity.projectile.FishingHook calculateOpenWater(Lnet
 public net.minecraft.world.entity.projectile.FishingHook outOfWaterTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-index ce934b945b85a4c3d0f575eb090bbf90c4b3ca9f..41e8167766383a6fcb1e9fb78933d74784caddbb 100644
+index 9de72665c947bb00547cdd7c41a890711f5b2afc..96b6e537ec4493a0cdd98ccfe7816f7ffb69c7dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-@@ -170,7 +170,7 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
+@@ -164,7 +164,7 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
  
      @Override
      public boolean isInOpenWater() {
diff --git a/patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch
index 2f061397e0..2f061397e0 100644
--- a/patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch
index b166366059..b166366059 100644
--- a/patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch
+++ b/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0960-Expand-PlayerItemMendEvent.patch b/patches/server/0959-Expand-PlayerItemMendEvent.patch
index 46f219d4ee..961cbe0ae5 100644
--- a/patches/server/0960-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0959-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index 8d8fe55a05eea237a8af99ed15ab16d6167daa77..eca634792d2a7cc649675e3394e84dba
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index be0e519188d401499e3d7a416146fd516b074b77..fe77d0c9c11e585a7c6258fbf8fbe63c42d3a10e 100644
+index d828ac224f07ec6992c48a19bcd4e189783d2bcb..6497a2546dac6a577b66bc43fc0b3af277000ad8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1735,11 +1735,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch
index 131575e7af..f5706429d5 100644
--- a/patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch
@@ -9,7 +9,7 @@ Previously, after the entity reloaded, Projectile#getShooter
 would return null, while the entity still had an owner.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e70e6f82321ac0c6c8ac1f7d9144e1e9495bf5ae..8218169014a7af183e6b0058fe08af18ca047448 100644
+index a16d3c98f73d96aa7b0a7e72791c45a125bf84eb..c014fe8808f19195d8c26925227ff28bd6738039 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0962-Add-transient-modifier-API.patch b/patches/server/0961-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0962-Add-transient-modifier-API.patch
+++ b/patches/server/0961-Add-transient-modifier-API.patch
diff --git a/patches/server/0963-Fix-block-place-logic.patch b/patches/server/0962-Fix-block-place-logic.patch
index 2d077f1757..2d077f1757 100644
--- a/patches/server/0963-Fix-block-place-logic.patch
+++ b/patches/server/0962-Fix-block-place-logic.patch
diff --git a/patches/server/0964-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index af0d52e28f..af0d52e28f 100644
--- a/patches/server/0964-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0965-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch
index 9b113e0bfe..9b113e0bfe 100644
--- a/patches/server/0965-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0966-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0965-Call-BlockGrowEvent-for-the-pitcher-crop.patch
index 98e7c69d60..98e7c69d60 100644
--- a/patches/server/0966-Call-BlockGrowEvent-for-the-pitcher-crop.patch
+++ b/patches/server/0965-Call-BlockGrowEvent-for-the-pitcher-crop.patch
diff --git a/patches/server/0967-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 608f9bea3f..608f9bea3f 100644
--- a/patches/server/0967-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0968-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch
index 0dcf015d42..0dcf015d42 100644
--- a/patches/server/0968-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0969-Fix-sniffer-removeExploredLocation.patch b/patches/server/0968-Fix-sniffer-removeExploredLocation.patch
index 7e07747224..ca06cc2a5e 100644
--- a/patches/server/0969-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0968-Fix-sniffer-removeExploredLocation.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix sniffer removeExploredLocation
 Add support to remove explored location in different world
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
-index ca3bffd07e0e8f3b2409917cf561d4755c8fba21..e9e8ee8c87285705366d54c23a59c136c612aaff 100644
+index 1c8b67de03aefe91bf80782fb14fb629a458ecc3..01328768ef2baba2aa7fea7e10b0eb9783497f4b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
-@@ -40,12 +40,13 @@ public class CraftSniffer extends CraftAnimals implements Sniffer {
+@@ -34,12 +34,13 @@ public class CraftSniffer extends CraftAnimals implements Sniffer {
      @Override
      public void removeExploredLocation(Location location) {
          Preconditions.checkArgument(location != null, "location cannot be null");
diff --git a/patches/server/0970-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch
index 6ba0203886..1c886ee26d 100644
--- a/patches/server/0970-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 73cd175cba0e441b8af63d8c05ae0d9143687995..6095d43e08bc1ffc4e9a4796fc7adbd07d69d716 100644
+index 860de727f4eb220d5cce62d0850f240b900412ec..f0ce29d21fe9af803ce4e41b8c037b2ec5d1b124 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0971-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index e1fab1d4bb..1a19a2e975 100644
--- a/patches/server/0971-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0fb86a1183e0373a68e110a8828df5b63a71d751..daed278d1bcf84ee42749f24e311b22b70015d79 100644
+index bfa091f72d6f477bcaf63d364639a1b4df9b1987..776b7fc26fe96b69be260bbd36efae147d988640 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -359,6 +359,7 @@ public class Main {
diff --git a/patches/server/0972-Folia-scheduler-and-owned-region-API.patch b/patches/server/0971-Folia-scheduler-and-owned-region-API.patch
index 5fcdbd2134..e8429bc2d4 100644
--- a/patches/server/0972-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0971-Folia-scheduler-and-owned-region-API.patch
@@ -1158,7 +1158,7 @@ index 8547e7ff2f1f5b7701fb0f3c3010c14601a5f83e..fff7ad7a45f310783ac96b44575ad3db
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c078271ac68ea1f2906c05d843c944649316e537..57be4397c5a52580f6b466c67a6974312d7995de 100644
+index c014fe8808f19195d8c26925227ff28bd6738039..ccc674a3da006fc3f6edd3b479eaa86c1cc67e90 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1305,10 +1305,10 @@ index 144e843191bc955d37ee1524746304fbe0d79149..d62cdda5ef3691a54ce34729920bad8e
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 733158b6f2c2bd03fbe798562ff7bc33280548dc..fc0dc8e607cc24020106ea1af92b4421a5f9393d 100644
+index 1186ee7cc4671892346b7173d10125febcfbf88a..6e600f9d81178f4ad10967a1aba802c9ac853d82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -203,6 +203,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -207,6 +207,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      private EntityDamageEvent lastDamageEvent;
      private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftEntity.DATA_TYPE_REGISTRY);
      protected net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
@@ -1324,7 +1324,7 @@ index 733158b6f2c2bd03fbe798562ff7bc33280548dc..fc0dc8e607cc24020106ea1af92b4421
  
      public CraftEntity(final CraftServer server, final Entity entity) {
          this.server = server;
-@@ -825,6 +834,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -831,6 +840,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.entity;
      }
  
@@ -1335,5 +1335,5 @@ index 733158b6f2c2bd03fbe798562ff7bc33280548dc..fc0dc8e607cc24020106ea1af92b4421
 +    // Paper end
 +
      @Override
-     public void playEffect(EntityEffect type) {
-         Preconditions.checkArgument(type != null, "type");
+     public final EntityType getType() {
+         return this.entityType;
diff --git a/patches/server/0973-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index a34e772338..a34e772338 100644
--- a/patches/server/0973-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0974-Properly-Cancel-Usable-Items.patch b/patches/server/0973-Properly-Cancel-Usable-Items.patch
index 3ec9d65f4f..3ec9d65f4f 100644
--- a/patches/server/0974-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0973-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0975-Add-event-for-player-editing-sign.patch b/patches/server/0974-Add-event-for-player-editing-sign.patch
index 9e06a54123..a7711fc0a5 100644
--- a/patches/server/0975-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0974-Add-event-for-player-editing-sign.patch
@@ -71,12 +71,12 @@ index 1733744691e843891fc22991f8da57877a1b14f3..b01cdfe3c62c609e953aa5007e6557cf
          entityhuman.openTextEdit(tileentitysign, flag);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index f1ba0fd5d17fb1a26cf09848d4125ecfab39eddb..02c4c9142a197aabfe7b8aaca8a88bba10b83b6c 100644
+index 5af30bff1bfdf09daa585071f2ec1fe04db3609f..6d40e8a75126eff3f863ab6fbea8a85ab43ac9c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-@@ -130,9 +130,15 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
- 
-         SignBlockEntity handle = ((CraftSign<?>) sign).getTileEntity();
+@@ -128,9 +128,15 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
+         Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed");
+         Preconditions.checkArgument(sign.getWorld() == player.getWorld(), "Sign must be in same world as Player");
  
 +        // Paper start
 +        io.papermc.paper.event.player.PlayerOpenSignEvent event = new io.papermc.paper.event.player.PlayerOpenSignEvent((Player) player, sign, side, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.PLUGIN);
@@ -88,5 +88,5 @@ index f1ba0fd5d17fb1a26cf09848d4125ecfab39eddb..02c4c9142a197aabfe7b8aaca8a88bba
          }
 +        } // Paper
  
-         handle.setAllowedPlayerEditor(player.getUniqueId()); // Paper
-         ((CraftPlayer) player).getHandle().openTextEdit(handle, Side.FRONT == side);
+         SignBlockEntity handle = ((CraftSign<?>) sign).getTileEntity();
+         handle.setAllowedPlayerEditor(player.getUniqueId());
diff --git a/patches/server/0976-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch
index 774e8b47eb..932a6fcbeb 100644
--- a/patches/server/0976-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only tick item frames if players can see it
 In the event that an item frame cannot be seen by any players, ticking the item frame every tick is unnecessary. This can be a very hot section of the entity tracker when lots of item frames are present on a server, so this reduces the logic which speeds it up.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 900bf9fb40026cce1d869bb7ab1694e6cd354099..81d0b2933040a451441f660f9e46199ae3b111e3 100644
+index fe7aff356a9e7b4f41c3d5cb3bd5afbb0646c16a..d934d07ad761319f338d4386536f68fde211c041 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -108,7 +108,7 @@ public class ServerEntity {
diff --git a/patches/server/0977-Improve-command-function-perm-level-checks.patch b/patches/server/0976-Improve-command-function-perm-level-checks.patch
index 460d87d02c..460d87d02c 100644
--- a/patches/server/0977-Improve-command-function-perm-level-checks.patch
+++ b/patches/server/0976-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0978-Add-option-to-disable-block-updates.patch b/patches/server/0977-Add-option-to-disable-block-updates.patch
index cff21f64bd..cff21f64bd 100644
--- a/patches/server/0978-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0977-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0979-Call-missing-BlockDispenseEvent.patch b/patches/server/0978-Call-missing-BlockDispenseEvent.patch
index b86bb0ea64..b86bb0ea64 100644
--- a/patches/server/0979-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0978-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0980-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch
index 7a9bb63408..4ec90953d4 100644
--- a/patches/server/0980-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 131d88eed13741a5438910b9acc7ffa53d56e86a..4b2d3b5a0a6f4ef168b1b1c2cf1b2e8510b82712 100644
+index ccc674a3da006fc3f6edd3b479eaa86c1cc67e90..2edab21bb271405f200de5a19e9c748bb14aba7d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1368,7 +1368,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0981-Optimize-player-lookups-for-beacons.patch b/patches/server/0980-Optimize-player-lookups-for-beacons.patch
index e0c3eca72c..e0c3eca72c 100644
--- a/patches/server/0981-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0980-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0982-Add-Sign-getInteractableSideFor.patch b/patches/server/0981-Add-Sign-getInteractableSideFor.patch
index 479f8e4001..4521623224 100644
--- a/patches/server/0982-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0981-Add-Sign-getInteractableSideFor.patch
@@ -30,7 +30,7 @@ index e34f7426df5d6c94fcc4101b28702e6c1d9fccff..9eea2982e92e9bc7a53962dc6b21de60
              float f1 = (float) (Mth.atan2(d1, d0) * 57.2957763671875D) - 90.0F;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index fa562d3a9705981524f82b575a3e0760aa40a787..2dcc9b2704a41f7acbdd182512ca05d103ad00cd 100644
+index 6d40e8a75126eff3f863ab6fbea8a85ab43ac9c9..c6c1ebe93a6977b4355db5551b0493b9ce53a61d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -158,6 +158,14 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
diff --git a/patches/server/0983-Array-backed-synched-entity-data.patch b/patches/server/0982-Array-backed-synched-entity-data.patch
index 515a256250..515a256250 100644
--- a/patches/server/0983-Array-backed-synched-entity-data.patch
+++ b/patches/server/0982-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0984-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0983-fix-item-meta-for-tadpole-buckets.patch
index 0f7042779b..0f7042779b 100644
--- a/patches/server/0984-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0983-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0985-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch
index c48f4455c9..c48f4455c9 100644
--- a/patches/server/0985-Suppress-Item-Meta-Validation-Checks.patch
+++ b/patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0986-Fix-BanList-API.patch b/patches/server/0985-Fix-BanList-API.patch
index f60ad3a9fb..ac50f25bb8 100644
--- a/patches/server/0986-Fix-BanList-API.patch
+++ b/patches/server/0985-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fe77d0c9c11e585a7c6258fbf8fbe63c42d3a10e..94dd03ccd95b497987117244eb9f008fe4b01a09 100644
+index 6497a2546dac6a577b66bc43fc0b3af277000ad8..6b7680b4062f0189a587b2fcfc93f30b57e29a9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1633,23 +1633,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0987-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0986-Fix-possible-NPE-on-painting-creation.patch
index 3abab01251..44fb375c6f 100644
--- a/patches/server/0987-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0986-Fix-possible-NPE-on-painting-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix possible NPE on painting creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index b305941aaf50b417bb054a9327c67a0891f2fe9e..995b3e31c5725f3d8879df349351eae3bcdfdddf 100644
+index b86abf25c8e51f8133ae5d58c31d2362d895d947..602b09323e0f1fda64ced1c285bfe2dbd854bb54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -916,6 +916,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0988-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index ef39fd0130..ef39fd0130 100644
--- a/patches/server/0988-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0989-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 313bf5ec8c..313bf5ec8c 100644
--- a/patches/server/0989-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0990-Don-t-tick-signs.patch b/patches/server/0989-Don-t-tick-signs.patch
index 27884b4048..27884b4048 100644
--- a/patches/server/0990-Don-t-tick-signs.patch
+++ b/patches/server/0989-Don-t-tick-signs.patch
diff --git a/patches/server/0991-Configurable-Region-Compression-Format.patch b/patches/server/0990-Configurable-Region-Compression-Format.patch
index 9ce41cb7ed..9ce41cb7ed 100644
--- a/patches/server/0991-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0990-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0992-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 45166cba2a..45166cba2a 100644
--- a/patches/server/0992-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0993-Add-whitelist-events.patch b/patches/server/0992-Add-whitelist-events.patch
index 42eff5bfe1..42eff5bfe1 100644
--- a/patches/server/0993-Add-whitelist-events.patch
+++ b/patches/server/0992-Add-whitelist-events.patch
diff --git a/patches/server/0994-Implement-PlayerFailMoveEvent.patch b/patches/server/0993-Implement-PlayerFailMoveEvent.patch
index 6d03ed35db..6d03ed35db 100644
--- a/patches/server/0994-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0993-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0995-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0995-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0996-API-for-updating-recipes-on-clients.patch b/patches/server/0995-API-for-updating-recipes-on-clients.patch
index 97aae77fcc..97aae77fcc 100644
--- a/patches/server/0996-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0995-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0997-Only-capture-actual-tree-growth.patch b/patches/server/0996-Only-capture-actual-tree-growth.patch
index 73a4055f19..73a4055f19 100644
--- a/patches/server/0997-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0996-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0998-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0997-Use-correct-source-for-mushroom-block-spread-event.patch
index 424bb8c0b8..424bb8c0b8 100644
--- a/patches/server/0998-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0997-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0999-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0998-Respect-randomizeData-on-more-entities-when-spawning.patch
index 6a590a0a4b..6a590a0a4b 100644
--- a/patches/server/0999-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0998-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/1000-Use-correct-seed-on-api-world-load.patch b/patches/server/0999-Use-correct-seed-on-api-world-load.patch
index 9d1369ecae..9d1369ecae 100644
--- a/patches/server/1000-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0999-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/1000-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 56ce0b4a41..56ce0b4a41 100644
--- a/patches/server/1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/1000-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/1002-Cache-map-ids-on-item-frames.patch b/patches/server/1001-Cache-map-ids-on-item-frames.patch
index f6f5cfcbd3..f6f5cfcbd3 100644
--- a/patches/server/1002-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/1001-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/1003-Fix-custom-statistic-criteria-creation.patch b/patches/server/1002-Fix-custom-statistic-criteria-creation.patch
index d6cb704729..d6cb704729 100644
--- a/patches/server/1003-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/1002-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/1004-Bandaid-fix-for-Effect.patch b/patches/server/1003-Bandaid-fix-for-Effect.patch
index 30661e9673..25740e20be 100644
--- a/patches/server/1004-Bandaid-fix-for-Effect.patch
+++ b/patches/server/1003-Bandaid-fix-for-Effect.patch
@@ -58,7 +58,7 @@ index 550dcb7d595221b221e4710890d8a3cad789fc07..f857f490ffba2f25f7c06c5fb1a1905f
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 94dd03ccd95b497987117244eb9f008fe4b01a09..9273d21d59bfd93d6480e57b83ebc4b8df2cc758 100644
+index 6b7680b4062f0189a587b2fcfc93f30b57e29a9e..c9e4a2635c421df192f62c0903659347bce677f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -860,7 +860,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1005-SculkCatalyst-bloom-API.patch b/patches/server/1004-SculkCatalyst-bloom-API.patch
index 5de0c0cf79..5de0c0cf79 100644
--- a/patches/server/1005-SculkCatalyst-bloom-API.patch
+++ b/patches/server/1004-SculkCatalyst-bloom-API.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject d548daac2f99b1b570f9d229464f55d10d9a58b
+Subproject b76ceb4f5dbeeedb6e0cff3b4545779b137bc12
diff --git a/work/Spigot b/work/Spigot
-Subproject b41c46db51ec4aca746def5ac9080ec319c4abd
+Subproject 94e187b577b93759e4f46e85c892049a6baa3bc