diff --git a/Paper b/Paper
index ecbf5a3..c649585 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit ecbf5a38e59fdcfbac08ee7bf22f66846a3f917a
+Subproject commit c6495850826bcd797b9d0e21d1a4349117fa6868
diff --git a/patches/api/0001-Parchment-POM-Changes.patch b/patches/api/0001-Parchment-POM-Changes.patch
index 7baddaf..a3e3e39 100644
--- a/patches/api/0001-Parchment-POM-Changes.patch
+++ b/patches/api/0001-Parchment-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Parchment POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index c2e9ca1cc7f14d3a696385edc3cb341f902fa2fd..e5ed07236c358e9ea544f43b41533c92769192dd 100644
+index 73fbd5d5a591871a3a386fb5c455cd96a3992e7a..1e182b441771c7159dd4323c2c72364efb971407 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
diff --git a/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch b/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch
index 8727272..7e8ee2e 100644
--- a/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch
+++ b/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Create interfaces for getting UUIDs and Players
 Creates new interfaces for getting UUIDs, Human Entities, Offline Players, and Players. Features matching NotNull and Nullable interfaces. Lessens the required overloads for plugin developers when working with varying player objects.
 
 diff --git a/pom.xml b/pom.xml
-index e5ed07236c358e9ea544f43b41533c92769192dd..8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165 100644
+index 1e182b441771c7159dd4323c2c72364efb971407..6857042b3475925f426cbe9f4858438a02bebd23 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -47,6 +47,14 @@
@@ -538,7 +538,7 @@ index 2ce774c81a93260a1464183d435b4c418ed61648..aaf08f8e2cce8c7f7f0520fbe3904d26
      /**
       * Returns the name of this player
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 34b51466ffb281b05f531b3f7deda245ae7fd96a..f37339692b027c0258d2f5bc20ee7db9c6c9b7fb 100644
+index a4b236d75e77176a163094edd31f81725bbf4eca..54138dae452714e73549ad1c1512b68267cad443 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -5,6 +5,7 @@ import java.util.Set; // Paper
diff --git a/patches/api/0003-Add-Optional-PlayerLike-interfaces.patch b/patches/api/0003-Add-Optional-PlayerLike-interfaces.patch
index 710df54..49256fc 100644
--- a/patches/api/0003-Add-Optional-PlayerLike-interfaces.patch
+++ b/patches/api/0003-Add-Optional-PlayerLike-interfaces.patch
@@ -61,7 +61,7 @@ index e2b4f86fc3825a77a5a0c1c29b428308eee54b16..95220ef8ad0602fae9f88c0231762ff5
      @Override
      @NotNull default OfflinePlayer getOfflinePlayer() {
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f37339692b027c0258d2f5bc20ee7db9c6c9b7fb..c2866ecabc05edf48712f7fcd3596ae3bf0c46fd 100644
+index 54138dae452714e73549ad1c1512b68267cad443..2c9aa0cbce1450695b285a9e654b0e9f10e28c37 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -6,6 +6,7 @@ import java.util.UUID;
diff --git a/patches/api/0004-Update-to-Java-15.patch b/patches/api/0004-Update-to-Java-15.patch
index e133a6f..a7ac28b 100644
--- a/patches/api/0004-Update-to-Java-15.patch
+++ b/patches/api/0004-Update-to-Java-15.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update to Java 15
 
 
 diff --git a/pom.xml b/pom.xml
-index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285ae4e4be46 100644
+index 6857042b3475925f426cbe9f4858438a02bebd23..a295e88e8c05306c0e5876608797d64df6dc1699 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -19,8 +19,10 @@
@@ -21,7 +21,7 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285a
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
      </properties>
-@@ -129,7 +131,7 @@
+@@ -148,7 +150,7 @@
          <!-- annotations -->
          <dependency>
              <groupId>org.jetbrains</groupId>
@@ -30,7 +30,7 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285a
              <version>20.1.0</version>
              <scope>provided</scope>
          </dependency>
-@@ -259,15 +261,38 @@
+@@ -278,15 +280,38 @@
                      </properties>
                  </configuration>
              </plugin>
@@ -70,7 +70,7 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285a
                          <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
                          <!-- Paper start -->
                          <link>https://jd.adventure.kyori.net/api/${adventure.version}/</link>
-@@ -278,6 +303,7 @@
+@@ -297,6 +322,7 @@
                      </links>
                  </configuration>
              </plugin>
diff --git a/patches/api/0007-Make-OptionalPlayerLike-extend-Audience.patch b/patches/api/0007-Make-OptionalPlayerLike-extend-Audience.patch
index 229076f..ee0b9e2 100644
--- a/patches/api/0007-Make-OptionalPlayerLike-extend-Audience.patch
+++ b/patches/api/0007-Make-OptionalPlayerLike-extend-Audience.patch
@@ -284,7 +284,7 @@ index 95220ef8ad0602fae9f88c0231762ff50358d98f..27e837a0dbcf37fff9927deb1c34a3ca
      @Override
      @NotNull default OfflinePlayer getOfflinePlayer() {
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c2866ecabc05edf48712f7fcd3596ae3bf0c46fd..206f5c00434b35fab27df6bc17c96c789fc8fb2a 100644
+index 2c9aa0cbce1450695b285a9e654b0e9f10e28c37..b7ce4b50a7f8f9488cb30a40f0e8acaf2b8d33e7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -5,8 +5,8 @@ import java.util.Set; // Paper
diff --git a/patches/server/0001-Parchment-POM-Changes.patch b/patches/server/0001-Parchment-POM-Changes.patch
index 64320af..a41a7ed 100644
--- a/patches/server/0001-Parchment-POM-Changes.patch
+++ b/patches/server/0001-Parchment-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Parchment POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index ab57297272c2d6f3d21067081bcaf8775b8fff09..85bf0a229fa8c4e42744f438b71fda4cef67b4e0 100644
+index 1a9204c869dd36e80932b1366352db15ebd70723..e8c91265e5694676b6fb6a4b3ee022b88d1e5cf0 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -45,7 +45,7 @@ index ab57297272c2d6f3d21067081bcaf8775b8fff09..85bf0a229fa8c4e42744f438b71fda4c
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -160,7 +160,7 @@
+@@ -187,7 +187,7 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -54,7 +54,7 @@ index ab57297272c2d6f3d21067081bcaf8775b8fff09..85bf0a229fa8c4e42744f438b71fda4c
          <defaultGoal>clean install</defaultGoal> <!-- Paper -->
          <plugins>
              <plugin>
-@@ -168,7 +168,7 @@
+@@ -195,7 +195,7 @@
                  <artifactId>gitdescribe-maven-plugin</artifactId>
                  <version>1.3</version>
                  <configuration>
diff --git a/patches/server/0003-Parchment-brand-changes.patch b/patches/server/0003-Parchment-brand-changes.patch
index 97ced8e..ef58a5e 100644
--- a/patches/server/0003-Parchment-brand-changes.patch
+++ b/patches/server/0003-Parchment-brand-changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Parchment brand changes
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8d651788bce04f4d6d3e8bcbd3f97a8e0bbacf02 100644
+index bf80e870e6a2a6fe1d4ae1bea355bcd7a0735d3b..2b5c226789e807574af798f49d09ebc55db4b71d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1580,7 +1580,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1583,7 +1583,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -18,10 +18,10 @@ index 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8d651788bce04f4d6d3e8bcbd3f97a8e
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..ae3af6c152aefad32616c9debd4f1172c49f68fd 100644
+index cebecee640ed5a7fc2b978e00ff7eb012228267d..825a49819a4ff3302f1067d80654e698518506ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
+@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -31,10 +31,10 @@ index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..ae3af6c152aefad32616c9debd4f1172
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 154f3a6a3d37b94c40cb29c305e3aa5fb494850c..ae76d5878392e1226ad7d72fe536fb1796cdb500 100644
+index 409fbeeb66fb8f58a72d94686bc9515299927b75..312225f15a864dc42df47f9911ba376ffb7b2c99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -253,7 +253,7 @@ public class Main {
+@@ -265,7 +265,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
diff --git a/patches/server/0004-Build-sources.patch b/patches/server/0004-Build-sources.patch
index a6e05fa..96f8ff3 100644
--- a/patches/server/0004-Build-sources.patch
+++ b/patches/server/0004-Build-sources.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build sources
 
 
 diff --git a/pom.xml b/pom.xml
-index 85bf0a229fa8c4e42744f438b71fda4cef67b4e0..dde8ac8aadd56c411f72c12124dcf301ea50e169 100644
+index e8c91265e5694676b6fb6a4b3ee022b88d1e5cf0..afa475f33bad218e77e5a6f373615409b3eb5d60 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -352,6 +352,21 @@
+@@ -405,6 +405,21 @@
                      </excludes>
                  </configuration>
              </plugin>
diff --git a/patches/server/0005-Bump-to-Java-15.patch b/patches/server/0005-Bump-to-Java-15.patch
index 2a6db55..ea0ab4b 100644
--- a/patches/server/0005-Bump-to-Java-15.patch
+++ b/patches/server/0005-Bump-to-Java-15.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bump to Java 15
 
 
 diff --git a/pom.xml b/pom.xml
-index dde8ac8aadd56c411f72c12124dcf301ea50e169..731610f136521d984508796a9d9fcea7ed477fac 100644
+index afa475f33bad218e77e5a6f373615409b3eb5d60..e5c61b389ac022e59c3abb3aac1afeb45d384913 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -14,8 +14,8 @@
diff --git a/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch
index d972aa1..ce074d5 100644
--- a/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch
+++ b/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add origin location to EntityDamageByBlockEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 53ea8a6d90faf4f7f8fd0819be4499422bdd4cbe..344504de9714c4e5398a0fb32c026045c385383c 100644
+index e6bf78f46acc37d9515d58cec3587e236ac0733c..1cea7c5bf99e0c99e8160658df0eab065cca2841 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 @@ -46,6 +46,16 @@ public class DamageSource {
@@ -25,7 +25,7 @@ index 53ea8a6d90faf4f7f8fd0819be4499422bdd4cbe..344504de9714c4e5398a0fb32c026045
      // CraftBukkit start
      private boolean sweep;
  
-@@ -108,11 +118,11 @@ public class DamageSource {
+@@ -109,11 +119,11 @@ public class DamageSource {
      }
  
      public static DamageSource explosion(@Nullable Explosion explosion) {
@@ -39,7 +39,7 @@ index 53ea8a6d90faf4f7f8fd0819be4499422bdd4cbe..344504de9714c4e5398a0fb32c026045
      }
  
      public static DamageSource a() {
-@@ -233,8 +243,9 @@ public class DamageSource {
+@@ -234,8 +244,9 @@ public class DamageSource {
          return entity instanceof EntityHuman && ((EntityHuman) entity).abilities.canInstantlyBuild;
      }
  
@@ -69,7 +69,7 @@ index 79008bda42558ea7d28ccf51b66405a3bdb52da7..8fd81f4238416fd6a5d09e3307aebe78
          return (ExplosionDamageCalculator) (entity == null ? Explosion.a : new ExplosionDamageCalculatorEntity(entity));
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/BlockBed.java b/src/main/java/net/minecraft/world/level/block/BlockBed.java
-index abe0a1c309d526de37efcac44922fa259e1d112c..0d63e93e4dbcc6abf5ea26ae0a8681531c5685de 100644
+index 00a01a157deec004bcf2f8587723a0ecd0bfef85..ece4648bf133621b644291390f5743f9c48c750d 100644
 --- a/src/main/java/net/minecraft/world/level/block/BlockBed.java
 +++ b/src/main/java/net/minecraft/world/level/block/BlockBed.java
 @@ -89,7 +89,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -86,7 +86,7 @@ index abe0a1c309d526de37efcac44922fa259e1d112c..0d63e93e4dbcc6abf5ea26ae0a868153
                  return EnumInteractionResult.SUCCESS;
              } else if ((Boolean) iblockdata.get(BlockBed.OCCUPIED)) {
                  if (!this.a(world, blockposition)) {
-@@ -137,7 +142,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
+@@ -138,7 +143,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
                      world.a(blockposition1, false);
                  }
  
@@ -101,10 +101,10 @@ index abe0a1c309d526de37efcac44922fa259e1d112c..0d63e93e4dbcc6abf5ea26ae0a868153
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b14cec316b16e46d54d389650372c5c9ce1e5a4d..f0bd5b57ffd7e55299180b382551afe06bd764f8 100644
+index a678277416cd71e01cd6980bcfaf9a9803e7ea17..0df40bc18dcd66a367b82e435316851eb99d077c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -938,7 +938,7 @@ public class CraftEventFactory {
+@@ -941,7 +941,7 @@ public class CraftEventFactory {
              entityDamage = null;
              EntityDamageEvent event;
              if (damager == null) {
@@ -113,7 +113,7 @@ index b14cec316b16e46d54d389650372c5c9ce1e5a4d..f0bd5b57ffd7e55299180b382551afe0
              } else if (entity instanceof EntityEnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) {
                  event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions);
              } else {
-@@ -974,7 +974,7 @@ public class CraftEventFactory {
+@@ -977,7 +977,7 @@ public class CraftEventFactory {
  
              return callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
          } else if (source == DamageSource.OUT_OF_WORLD) {
diff --git a/patches/server/0010-Add-SoundEvent.patch b/patches/server/0010-Add-SoundEvent.patch
index 34b28b3..731015a 100644
--- a/patches/server/0010-Add-SoundEvent.patch
+++ b/patches/server/0010-Add-SoundEvent.patch
@@ -45,7 +45,7 @@ index f896dd7447d8a8fbc6e3c1abad0c3da5448273c1..e61b9bc82641174e935516fc7c54d2f4
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 10e9e5328f783832b957113a8672f45f90ace813..89440aec276d919c784f0a43f8f398b84571cb1c 100644
+index 75bcfb3a2b4a104aeebb2fe3298714b2e5b569d2..00bc4f136e9fb0a450d83514be647b00e89f3f02 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -53,7 +53,6 @@ import net.minecraft.network.protocol.game.PacketPlayOutExperience;
@@ -56,7 +56,7 @@ index 10e9e5328f783832b957113a8672f45f90ace813..89440aec276d919c784f0a43f8f398b8
  import net.minecraft.network.protocol.game.PacketPlayOutOpenBook;
  import net.minecraft.network.protocol.game.PacketPlayOutOpenSignEditor;
  import net.minecraft.network.protocol.game.PacketPlayOutOpenWindow;
-@@ -173,6 +172,11 @@ import org.bukkit.event.player.PlayerTeleportEvent;
+@@ -174,6 +173,11 @@ import org.bukkit.event.player.PlayerTeleportEvent;
  import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
  import org.bukkit.inventory.MainHand;
  // CraftBukkit end
@@ -68,7 +68,7 @@ index 10e9e5328f783832b957113a8672f45f90ace813..89440aec276d919c784f0a43f8f398b8
  
  public class EntityPlayer extends EntityHuman implements ICrafting {
  
-@@ -2132,7 +2136,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2158,7 +2162,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void a(SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1) {
@@ -82,7 +82,7 @@ index 10e9e5328f783832b957113a8672f45f90ace813..89440aec276d919c784f0a43f8f398b8
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 7e032845fe9a46d33236444d62405a41e29daa17..80801c60dd902d19d9c08f0692c96f0ee9612098 100644
+index f68a252378a94c8fcab622d2d89d738aceab45a4..0f24e5a5c837984636d4451620af9c35c0135e9b 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -58,11 +58,9 @@ import net.minecraft.network.protocol.Packet;
@@ -134,7 +134,7 @@ index 7e032845fe9a46d33236444d62405a41e29daa17..80801c60dd902d19d9c08f0692c96f0e
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2a76c3624c64e93509a96579f48c507e29901625..9b76349d960b2d5a4d934dc2814f10c4a56e54b0 100644
+index 90776231b1faffb11e4394f555f336ca248e3004..7fa36b053f070f13b75cbdd7f7994cfc012b2fc6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -43,7 +43,6 @@ import net.minecraft.network.protocol.game.PacketPlayOutGameStateChange;
@@ -328,7 +328,7 @@ index 457cbdab3fa96fdf7fad1b0206bec9c0aa7847d8..ce854033e098888c468d2c632fd6a877
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3b3eda95c0ff8b129adedbae6561bba2d01c2f3a..c5d211806cff0d7053a4fd41088e357a184e22d1 100644
+index c0b49a0eaeda06b89a4fb425eec3d5bfa9717379..8892804079fd1c15dd4c6d96cc40ae18c3a38500 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -26,7 +26,6 @@ import net.minecraft.core.BlockPosition;
@@ -350,7 +350,7 @@ index 3b3eda95c0ff8b129adedbae6561bba2d01c2f3a..c5d211806cff0d7053a4fd41088e357a
  
  public class CraftWorld implements World {
      public static final int CUSTOM_DIMENSION_OFFSET = 10;
-@@ -2308,8 +2311,11 @@ public class CraftWorld implements World {
+@@ -2326,8 +2329,11 @@ public class CraftWorld implements World {
          double y = loc.getY();
          double z = loc.getZ();
  
@@ -365,7 +365,7 @@ index 3b3eda95c0ff8b129adedbae6561bba2d01c2f3a..c5d211806cff0d7053a4fd41088e357a
  
      private static Map<String, GameRules.GameRuleKey<?>> gamerules;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 05248f560d643080a3eac581c01aa89fb3709e6c..7ccf0619cafe3c1bf83333ac2235d1fd2c6fb7e2 100644
+index cfe6898dc373fe55a08acf5c90e200061aa7d0fc..fcd27e569919fa05703e694a1981db413551ed9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -41,10 +41,8 @@ import net.minecraft.network.protocol.game.PacketPlayOutBlockBreakAnimation;
@@ -394,7 +394,7 @@ index 05248f560d643080a3eac581c01aa89fb3709e6c..7ccf0619cafe3c1bf83333ac2235d1fd
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
-@@ -577,7 +583,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -582,7 +588,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          float f = (float) Math.pow(2.0D, (note - 12.0D) / 12.0D);
@@ -407,7 +407,7 @@ index 05248f560d643080a3eac581c01aa89fb3709e6c..7ccf0619cafe3c1bf83333ac2235d1fd
      }
  
      @Override
-@@ -639,7 +649,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -644,7 +654,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  break;
          }
          float f = (float) Math.pow(2.0D, (note.getId() - 12.0D) / 12.0D);
@@ -420,7 +420,7 @@ index 05248f560d643080a3eac581c01aa89fb3709e6c..7ccf0619cafe3c1bf83333ac2235d1fd
      }
  
      @Override
-@@ -655,17 +669,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -660,17 +674,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void playSound(Location loc, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch) {
          if (loc == null || sound == null || category == null || getHandle().playerConnection == null) return;
@@ -448,7 +448,7 @@ index 05248f560d643080a3eac581c01aa89fb3709e6c..7ccf0619cafe3c1bf83333ac2235d1fd
      }
  
      @Override
-@@ -2211,11 +2230,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2216,11 +2235,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void playSound(final net.kyori.adventure.sound.Sound sound, final double x, final double y, final double z) {
          final MinecraftKey name = io.papermc.paper.adventure.PaperAdventure.asVanilla(sound.name());
          final java.util.Optional<net.minecraft.sounds.SoundEffect> event = net.minecraft.core.IRegistry.SOUND_EVENT.getOptional(name);
@@ -471,10 +471,10 @@ index 05248f560d643080a3eac581c01aa89fb3709e6c..7ccf0619cafe3c1bf83333ac2235d1fd
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f0bd5b57ffd7e55299180b382551afe06bd764f8..5985509e3b3696c293cb7261ccec2addd3f78e6d 100644
+index 0df40bc18dcd66a367b82e435316851eb99d077c..428f757ed01339db0d572d610b4ef77cb4b65b3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -71,6 +71,7 @@ import net.minecraft.world.phys.MovingObjectPositionBlock;
+@@ -72,6 +72,7 @@ import net.minecraft.world.phys.MovingObjectPositionBlock;
  import net.minecraft.world.phys.MovingObjectPositionEntity;
  import net.minecraft.world.phys.Vec3D;
  import io.papermc.paper.event.block.BlockPreDispenseEvent; // Paper
@@ -482,7 +482,7 @@ index f0bd5b57ffd7e55299180b382551afe06bd764f8..5985509e3b3696c293cb7261ccec2add
  import org.bukkit.Bukkit;
  import org.bukkit.Location; // Paper
  import org.bukkit.Material;
-@@ -228,6 +229,19 @@ import org.bukkit.inventory.meta.BookMeta;
+@@ -231,6 +232,19 @@ import org.bukkit.inventory.meta.BookMeta;
  import org.bukkit.potion.PotionEffect;
  
  import org.bukkit.event.entity.SpawnerSpawnEvent; // Spigot
@@ -502,7 +502,7 @@ index f0bd5b57ffd7e55299180b382551afe06bd764f8..5985509e3b3696c293cb7261ccec2add
  
  public class CraftEventFactory {
      public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.BURN);
-@@ -1832,4 +1846,36 @@ public class CraftEventFactory {
+@@ -1841,4 +1855,36 @@ public class CraftEventFactory {
          return event.callEvent();
      }
      // Paper end