Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0c1643c Fix MC-252439 (#7994)
PaperMC/Paper@0ae78d3 Fix advancement saving before reloads (#8003)
PaperMC/Paper@f428887 Prevent empty items from being added to world (#7998)
PaperMC/Paper@dd61319 Couple fixes for command blocks (#8004)
PaperMC/Paper@d1b1c6f Add missing deprecation to AdvancementDisplayType (#7876)
PaperMC/Paper@81f2eec [ci skip] rebuild patches
PaperMC/Paper@e269a0a Fix incorrect random nextLong to nextInt (#8009)
PaperMC/Paper@b77fe3a Temp: Disable javadoc.io for now
PaperMC/Paper@7688112 [ci skip] restore jd.io
PaperMC/Paper@b0eb4e0 Fix number parsing (#8013)

Pufferfish Changes:
pufferfish-gg/Pufferfish@fdfb106 Fix version checker
pufferfish-gg/Pufferfish@b4104a6 Updated Upstream (Paper)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = 2dcfb2b11fb0ef9807d01c81e891d90b74ba4750
+paperCommit = b0eb4e0c7497836bf4fd8a1bfabb822ff2f1c24f
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -953,7 +953,7 @@ index 0000000000000000000000000000000000000000..53f2df00c6809618a9ee3d2ea72e85e8
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..adafc4fd661cf080b004b86c3eaed231a0133101
+index 0000000000000000000000000000000000000000..e877921370f6009a4bd204d9b17d2d58834b8822
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
 @@ -0,0 +1,136 @@
@@ -989,8 +989,8 @@ index 0000000000000000000000000000000000000000..adafc4fd661cf080b004b86c3eaed231
 +	private static final Logger LOGGER = Logger.getLogger("PufferfishVersionFetcher");
 +	private static final HttpClient client = HttpClient.newHttpClient();
 +	
-+	private static final URI JENKINS_URI = URI.create("https://ci.pufferfish.host/job/Pufferfish-1.18/lastSuccessfulBuild/buildNumber");
-+	private static final String GITHUB_FORMAT = "https://api.github.com/repos/pufferfish-gg/Pufferfish/compare/ver/1.18...%s";
++	private static final URI JENKINS_URI = URI.create("https://ci.pufferfish.host/job/Pufferfish-1.19/lastSuccessfulBuild/buildNumber");
++	private static final String GITHUB_FORMAT = "https://api.github.com/repos/pufferfish-gg/Pufferfish/compare/ver/1.19...%s";
 +	
 +	private static final HttpResponse.BodyHandler<JsonObject> JSON_OBJECT_BODY_HANDLER = responseInfo -> HttpResponse.BodySubscribers
 +			.mapping(
@@ -2141,7 +2141,7 @@ index 0000000000000000000000000000000000000000..facd55463d44cb7e3d2ca6892982f549
 +	}
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 5a808a09291da691cbee75a55f6aa1b70ac9f018..13e49592a70285e92bf0d14ab596f3bcdebedf4c 100644
+index 456595e4b7e0c7f50617aa2694b0d2dfc368ab81..bc72131afa1ae9986ee311a9b371e97c8feb38f8 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -8,6 +8,7 @@ import net.kyori.adventure.text.Component;
@@ -2197,7 +2197,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..c0fdc5a79107f8694a514a12d5526bd4
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..99751fc36a332f2f9115b56ed6ca66ab037825d3 100644
+index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..e96ff8b13b1237d7c70359b78e4d72938877191f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -295,6 +295,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2218,7 +2218,7 @@ index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..99751fc36a332f2f9115b56ed6ca66ab
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
-@@ -2221,6 +2223,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2228,6 +2230,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -2416,7 +2416,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f255
                          this.wasOnGround = this.entity.isOnGround();
                          this.teleportDelay = 0;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..8043a1aa9d785c78e220ea54a6ffa7388f2d501e 100644
+index 2b9669df574cf95c2643344a66ad18b213bd9cd7..9e3c82e5c35ee6df68942ba505d098d7a6ae59de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -689,7 +689,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2445,7 +2445,7 @@ index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..8043a1aa9d785c78e220ea54a6ffa738
      }
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
--    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom();
+-    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong());
 +    // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super
      // Paper end
  
@@ -2597,10 +2597,10 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83a47ddb4e 100644
+index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212f560cc1d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -286,7 +286,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public double yo;
      public double zo;
      private Vec3 position;
@@ -2609,7 +2609,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
      public float yRot; // Paper - private->public
-@@ -408,6 +408,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -413,6 +413,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end
@@ -2621,7 +2621,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
      public float getBukkitYaw() {
          return this.yRot;
      }
-@@ -431,17 +436,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -436,17 +441,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  
@@ -2659,7 +2659,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -450,6 +474,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -455,6 +479,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  range = passengerRange;
              }
          }
@@ -2669,7 +2669,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
  
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
-@@ -781,6 +808,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -786,6 +813,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit end
  
      public void baseTick() {
@@ -2682,7 +2682,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
          this.level.getProfiler().push("entityBaseTick");
          if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
          this.feetBlockState = null;
-@@ -3973,16 +4006,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3978,16 +4011,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2708,7 +2708,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -3990,14 +4025,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3995,14 +4030,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -2776,7 +2776,7 @@ index 89cecb3603b41ae22efc54a9f2858a6f60e52148..4d57f2b8d08a83e404f0b81321b18c83
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4019,9 +4101,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4024,9 +4106,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }
@@ -3093,7 +3093,7 @@ index 56dd01801f56c56d07101e7e22b58ac059f5f07f..f489301701f8abfb8f509d91089c1433
          this.level.getProfiler().pop();
          this.level.getProfiler().push("goatActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index ae4b251e10babb07055d031ff48ac7dd5d4be4a0..fa612a4f4abc5185c9142af31f5d7f6e92549350 100644
+index 08f15739dd7e2ab80718ab8d983b483a46309deb..64c8eefa0302b04b416cd4912c01c50feddf1301 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -249,10 +249,16 @@ public class ItemEntity extends Entity {
@@ -3450,14 +3450,14 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951
          final String id;
          private final GameRules.Category category;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9 100644
+index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..a26799f92db1699d2d5173e2e93be29273e1a317 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -272,6 +272,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
-+    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
++    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
 +
 +    // Pufferfish start - ensure these get inlined
 +    private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;
@@ -3750,7 +3750,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..d66806565770cb03a21794f99e5c4b0f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 8ab1d401ed55d4cce55704317cbffe53ebc9f119..cfc7901125c127b155c5e7d5875f0fd0c8bb9c01 100644
+index ccad692aba2ed77259f6814d88f01b91ed9d229b..698a0ac71cf9fb409d609a81cc2958121260a46d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -43,7 +43,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -4182,7 +4182,7 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..7899ae5e60ee2b30c6d4d7056c59bb38cc05b7c8 100644
+index 72311b27bb642ee05dba45b76935277d183012eb..8fea63ed3e9e036f1371645c5fae183677ca7970 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -243,7 +243,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0002-Fix-pufferfish-issues.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix pufferfish issues
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8043a1aa9d785c78e220ea54a6ffa7388f2d501e..c018f89decbd2ee158367adb408335ab3ab18e22 100644
+index 9e3c82e5c35ee6df68942ba505d098d7a6ae59de..96d1af76aec13b07f91c2168fbdfa8740175f3db 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -769,7 +769,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -13,20 +13,20 @@ index 8043a1aa9d785c78e220ea54a6ffa7388f2d501e..c018f89decbd2ee158367adb408335ab
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
 -    // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super
-+    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - moved to super // Purpur - dont break ABI
++    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - moved to super // Purpur - dont break ABI
      // Paper end
  
      private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9..ef13ff67ed29e277fe3bbfeb9c8f414bd305d119 100644
+index a26799f92db1699d2d5173e2e93be29273e1a317..8bae26d296eb73642fa1a2f83ec1a28fadcade0c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -272,7 +272,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
--    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
-+    //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI
+-    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
++    //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI
  
      // Pufferfish start - ensure these get inlined
      private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;

patches/server/0007-Component-related-conveniences.patch

@@ -81,10 +81,10 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4d57f2b8d08a83e404f0b81321b18c83a47ddb4e..cba8aec79f7f1664a1410646c733f57f3c39ca5e 100644
+index e6d25ab2e7e19d9fb993fdad6f650212f560cc1d..5a50c83f288c2c4924f56ea42a4a5a9502c485a6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3765,6 +3765,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3770,6 +3770,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return SlotAccess.NULL;
      }
  

patches/server/0008-Ridables.patch

@@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 783b81e5252a689683264a494a30fb668b43a986..d4b05231b6b631f382d7e5fe6c42eba3e1581fad 100644
+index 7b3b8c20b5c33804753e55324651f5fbe69e231e..ef30cc43c89594a1d42c1ca4b20b54893d9ce26c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1533,6 +1533,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index 783b81e5252a689683264a494a30fb668b43a986..d4b05231b6b631f382d7e5fe6c42eba3
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c018f89decbd2ee158367adb408335ab3ab18e22..3d94e1c0abd49d59847c9aa17c6161b3da3fb649 100644
+index 96d1af76aec13b07f91c2168fbdfa8740175f3db..9a6f462bbd604045590b850ef0d5371e04ae6a28 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -46,7 +46,7 @@ index c018f89decbd2ee158367adb408335ab3ab18e22..3d94e1c0abd49d59847c9aa17c6161b3
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 070b7d49b46e6e23b4baf33ac045582194579137..f4b33e5788665eefef35e701ed99d58d0ea1b3c2 100644
+index 3ed1bd3f9a75056c040a3563533d53ad4438b962..2842ba7028bf833478758f2e839796b25084b1b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -668,6 +668,15 @@ public class ServerPlayer extends Player {
@@ -79,10 +79,10 @@ index 147a8a0ff6593724f311b077579178c412480451..22fad6467c6b9202e8cbf3e77e90c50f
                          if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cba8aec79f7f1664a1410646c733f57f3c39ca5e..e2b2be41e9981196650096dd9d468618a96cb28e 100644
+index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc3242850b45 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -356,7 +356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      private final Set<String> tags;
      private final double[] pistonDeltas;
      private long pistonDeltasGameTime;
@@ -91,7 +91,7 @@ index cba8aec79f7f1664a1410646c733f57f3c39ca5e..e2b2be41e9981196650096dd9d468618
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2756,6 +2756,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2761,6 +2761,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -104,7 +104,7 @@ index cba8aec79f7f1664a1410646c733f57f3c39ca5e..e2b2be41e9981196650096dd9d468618
          }
          return true; // CraftBukkit
      }
-@@ -2796,6 +2802,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2801,6 +2807,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  return false;
              }
              // Spigot end
@@ -119,7 +119,7 @@ index cba8aec79f7f1664a1410646c733f57f3c39ca5e..e2b2be41e9981196650096dd9d468618
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4512,4 +4526,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4517,4 +4531,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -4775,7 +4775,7 @@ index 97b3082dc020043fa38d9e5e4591102f97519ed3..be664e96a63bf6042375654e8297e4d6
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index b75c0ff18aa7adb673fbb2b5ada7775dd8ac1e29..42f6de4e9277d7208d5e0afb5a80d33f7f81ac46 100644
+index 7fe5908020c4577c1e4d6c00af382cf536351d96..457de9aa4e049682f37421e3d83e7a7b09f66675 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -78,6 +78,23 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -4941,7 +4941,7 @@ index 769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53..ff149234a8f3e1c94961e41d5bc81174
          this.level.getProfiler().pop();
          PiglinBruteAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 4366f7ff095c79a1f4444a27198f2613eb01fdc2..5918c35ebdba83dc93414d05b19a9d2b55b1bb7c 100644
+index cd6fb81d14706217c92fccc7853afce4010dfd1b..d41a559531b024f8c873b2b3e56fed1336f4bb2f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 @@ -118,8 +118,32 @@ public class Warden extends Monster implements VibrationListener.VibrationListen

patches/server/0051-Fix-the-dead-lagging-the-server.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5fa0b40eaa545d1047591f7166bb43e1872ffe34..f04412aa992986bd8a1e76f581e48f0bddc2ab17 100644
+index 6e2c7db44373738b9c0bc30dff1078b04dafa98a..a33b5792a2966847568d6d96e696fef18200b872 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1865,6 +1865,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1870,6 +1870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
          this.setYHeadRot(yaw); // Paper - Update head rotation

patches/server/0062-Configurable-void-damage-height-and-damage.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f04412aa992986bd8a1e76f581e48f0bddc2ab17..d032cd8054bcba9fd29ea62b234e6453e0a44adf 100644
+index a33b5792a2966847568d6d96e696fef18200b872..f6201f11bceeec05d436fa68354c222995d7bc2f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -884,7 +884,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -889,7 +889,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      public void checkOutOfWorld() {
          // Paper start - Configurable nether ceiling damage

patches/server/0063-Add-canSaveToDisk-to-Entity.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d032cd8054bcba9fd29ea62b234e6453e0a44adf..c5898834338046237d2690fd82443ac6844055a2 100644
+index f6201f11bceeec05d436fa68354c222995d7bc2f..e0c79bf667aff0936b59a582ee36659e83d0dbc9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4567,5 +4567,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4572,5 +4572,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean processClick(InteractionHand hand) {
          return false;
      }

patches/server/0093-Stop-squids-floating-on-top-of-water.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c5898834338046237d2690fd82443ac6844055a2..d0e0811601684199206f4c6e23e077a2c987e86b 100644
+index e0c79bf667aff0936b59a582ee36659e83d0dbc9..216f242232c3384afa2c6a8bffd6e29728364c9f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4034,6 +4034,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4039,6 +4039,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.yRotO = this.getYRot();
      }
  

patches/server/0095-Entities-can-use-portals-configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d0e0811601684199206f4c6e23e077a2c987e86b..8873e947665a877255d92548f7e894f6d8b708f8 100644
+index 216f242232c3384afa2c6a8bffd6e29728364c9f..6141ff524ac4fc1ee6bcb2b871be8c0d4b078997 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2868,7 +2868,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2873,7 +2873,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void handleInsidePortal(BlockPos pos) {
          if (this.isOnPortalCooldown()) {
              this.setPortalCooldown();
@@ -17,7 +17,7 @@ index d0e0811601684199206f4c6e23e077a2c987e86b..8873e947665a877255d92548f7e894f6
              if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3533,7 +3533,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3538,7 +3538,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean canChangeDimensions() {

patches/server/0136-Movement-options-for-armor-stands.patch

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8873e947665a877255d92548f7e894f6d8b708f8..e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7 100644
+index 6141ff524ac4fc1ee6bcb2b871be8c0d4b078997..02ac813cfa9bafd931a1fb2f31a0a3cd955cd5d7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1717,7 +1717,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1722,7 +1722,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.isInWater() || flag;
      }
  
@@ -66,7 +66,7 @@ index 9dcb46959c723723a369cde50427cbee0349f5a1..6bd31ed84049bc36a060b5e01b0599bf
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8821ac74c9999235bbfc9e5d480f78f6c3edba35..a3c4433a5fe19ca6475f98214768b097e3495353 100644
+index b4da08402c7b7152cae2d1e1df9a5f35cf1c490f..804a90cfb82d194de5b0f985e04a1fa7f89c29b0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -101,10 +101,16 @@ public class PurpurWorldConfig {

patches/server/0137-Fix-stuck-in-portals.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b..4980b0b46e75a4bc914cb3719d8b394fbcd8c224 100644
+index 1de4f239dfb63250b7143e89e97487d048b99776..bc5d5a2a48cfc6b4257d1cc3ac73d8ec5300721d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1185,6 +1185,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b..4980b0b46e75a4bc914cb3719d8b394f
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7..42822c44dbe18f1cffb269b35eb554efde59a20d 100644
+index 02ac813cfa9bafd931a1fb2f31a0a3cd955cd5d7..f9111dc426a539c91665840d772258f76b6d1c76 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2865,12 +2865,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2870,12 +2870,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
@@ -37,7 +37,7 @@ index e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7..42822c44dbe18f1cffb269b35eb554ef
  
              this.isInsidePortal = true;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a3c4433a5fe19ca6475f98214768b097e3495353..da34e98f9c62336a07d9ee16b36819ef840738d6 100644
+index 804a90cfb82d194de5b0f985e04a1fa7f89c29b0..a9654a4935c625852070255e443c669bd80d332a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -332,6 +332,7 @@ public class PurpurWorldConfig {

patches/server/0157-Drowning-Settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 42822c44dbe18f1cffb269b35eb554efde59a20d..9a43dd908114f0bb087bf9a2230e4148390df6c0 100644
+index f9111dc426a539c91665840d772258f76b6d1c76..fafea41a3d05936d898da39017eb8ee8e28c520e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3096,7 +3096,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3101,7 +3101,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public int getMaxAirSupply() {
@@ -40,7 +40,7 @@ index e9ee22f12f542f0c2d1a4ecedc891d708491a8eb..4f9b44c1a1421969f454cb2984d0b7ce
                  }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a78e8939f9b2edcfdd3122a7d6b94df852903ff4..93a89a2adc151437324ecfed1fddce5206bd6446 100644
+index a2878203e88d5ffeab7e209c1d2914047c779df9..0322b818bbb5f79b3f4eb25c729de0df91fa41d2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -161,6 +161,15 @@ public class PurpurWorldConfig {

patches/server/0185-API-for-any-mob-to-burn-daylight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9a43dd908114f0bb087bf9a2230e4148390df6c0..a28365f60d379cc59edcbbd2c21cf43042bc9659 100644
+index fafea41a3d05936d898da39017eb8ee8e28c520e..b303008bf53ed4f4469d26465c35ec266fdd80f2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4580,5 +4580,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4585,5 +4585,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean canSaveToDisk() {
          return true;
      }

patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a28365f60d379cc59edcbbd2c21cf43042bc9659..2f50759e625993e28db857b07975b3c0d9ba2eb0 100644
+index b303008bf53ed4f4469d26465c35ec266fdd80f2..fda9f5113cb529237cc73159cfb27e4d935cdfe3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2916,7 +2916,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2921,7 +2921,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
@@ -45,7 +45,7 @@ index 04bae5085756842ce88710646a17e9dc1aad5994..e7658fa9806701505e15cbf1d28ea3bd
              entity.portalWorld = ((ServerLevel)world);
              entity.portalBlock = pos.immutable();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ec6e01ef3b3d20dba9b2c55cc6370c780b1105a6..8485e62dabd88df10635b9e1b58aae1c5d0b5bb7 100644
+index 7804c2850e8765af7c7715fb33509d448b52cfab..a66e47e5db1a1e1037a96d469a46ef998a300690 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -628,6 +628,11 @@ public class PurpurWorldConfig {

patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option to prevent spiders from climbing world border
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2f50759e625993e28db857b07975b3c0d9ba2eb0..678bd5a24846cab9eca153ddbd6254d1c9b770f1 100644
+index fda9f5113cb529237cc73159cfb27e4d935cdfe3..d3438154fb7d7f05e83fa7e94ad8c8f4b637f683 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -304,6 +304,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean verticalCollision;
      public boolean verticalCollisionBelow;
      public boolean minorHorizontalCollision;
@@ -16,7 +16,7 @@ index 2f50759e625993e28db857b07975b3c0d9ba2eb0..678bd5a24846cab9eca153ddbd6254d1
      public boolean hurtMarked;
      protected Vec3 stuckSpeedMultiplier;
      @Nullable
-@@ -1410,7 +1411,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1415,7 +1416,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, true,
                  false, false, null, null);
  
@@ -39,7 +39,7 @@ index bdd4fc3072f7a5ea504ba35f6a08ae971e83b69f..b9ac8cefefe1f47548166330b7c889df
  
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 73fb5e6d26517f4ffdaef29e1aebbfee2c98802f..50cfe61d4efeae6b00bde8bea9cf3c36f244989e 100644
+index e82f57bba3669fe7201563186148b42a33c0129b..2d5c629148a004f8cc8b5f41939486bfa5aa435b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -2483,6 +2483,7 @@ public class PurpurWorldConfig {

patches/server/0256-Allow-void-trading.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 692fa17277cf89aebb3d98269e6b0e8271feb0ba..e352904cb790b3253ec30753e66a70507c0d748c 100644
+index 7128bcecb9eb1677dcb54e82698a7ea65eb015b6..0192e1f5bb07095015a682ce47c27bab1cdf9a1f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2681,7 +2681,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2682,7 +2682,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  // Paper start
@@ -18,7 +18,7 @@ index 692fa17277cf89aebb3d98269e6b0e8271feb0ba..e352904cb790b3253ec30753e66a7050
                  }
                  // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6f14dac3a428e8d982a172c5c510e424cf09ecf6..7dcbf902937d05062f49f66ea6a09ec608111539 100644
+index ce6744240e4e57aef9f5d452047f103068e37b91..3b171cc74b925e7ae501f8d5c171afdf99936eb7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -417,6 +417,7 @@ public class PurpurWorldConfig {