Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@92f872c Fix bad diff in wandering trader spawn rate patch from .4 update
PaperMC/Paper@9087a64 chore: cleanup annotations in api adventure patch
PaperMC/Paper@23b0ef5 [ci skip] rebuild patches
PaperMC/Paper@a0f548f Don't warn for deprecated PrepareGrindstoneEvent (#9036)
PaperMC/Paper@38be4f8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9018)
PaperMC/Paper@d5abb94 Expose Path to jar file in PluginProviderContext (#9030)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.4-R0.1-SNAPSHOT
 
-paperCommit = e8b82590d0c3dd57ac1728b236117d2fcd531c4f
+paperCommit = d5abb94e69ceed6e73116c13e7634b57b5ad84cf
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0008-Allow-inventory-resizing.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] Allow inventory resizing
 
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 35aac79a7c58d00e6b3c6c042b291093c9c7af71..7fa8909f07ce768654b9ea7c42c4913b7e2593b7 100644
+index 94f127fd6ba69ca48d03acbc9886ee499e9be4f3..1f958facfed766c401144b840e4369154c71d3c2 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -155,7 +155,7 @@ public enum InventoryType {
+@@ -152,7 +152,7 @@ public enum InventoryType {
-     // Paper end
+     SMITHING_NEW(4, "Upgrade Gear"),
      ;
  
 -    private final int size;

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

@@ -1918,7 +1918,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
      int LARGE_MAX_STACK_SIZE = 64;
      int DEFAULT_DISTANCE_LIMIT = 8;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9a1e8589e6b371869b2199650172d61ae186c907..6e8a76d64418c214fcdd021f23bdfaf9827470a9 100644
+index 4705d7066207250c03a5f98eef61554c901f2e35..548133e399b5abc4aa83045af87c135a3455b722 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2004,7 +2004,7 @@ index 9a1e8589e6b371869b2199650172d61ae186c907..6e8a76d64418c214fcdd021f23bdfaf9
          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;
-@@ -4156,16 +4190,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4162,16 +4196,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2030,7 +2030,7 @@ index 9a1e8589e6b371869b2199650172d61ae186c907..6e8a76d64418c214fcdd021f23bdfaf9
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4173,14 +4209,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4179,14 +4215,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -2098,7 +2098,7 @@ index 9a1e8589e6b371869b2199650172d61ae186c907..6e8a76d64418c214fcdd021f23bdfaf9
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4202,9 +4285,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4208,9 +4291,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 98d92f6d6a98d66e369286b079db2c4db0bd5298..d5369a39c86353bd99b4b404028db2aea97f8438 100644
+index 4b2806b26ad712eb893b8b9702cf185792354435..1b3a4928aba578b402e4364aa6501b5445e0669f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1716,6 +1716,26 @@ public class ServerPlayer extends Player {
@@ -81,10 +81,10 @@ index 93a1e990b0a6caae4143c2f9d09bfb368fa1d6db..615611fe372d6edaef56db058bbf2cf7
          return this.type().msgId();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6e8a76d64418c214fcdd021f23bdfaf9827470a9..a0aeb144f4f92b0cfdee1449b44771d0b6808d35 100644
+index 548133e399b5abc4aa83045af87c135a3455b722..9608b00d957bbd0158a22f61949e9029340be9c9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3908,6 +3908,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3914,6 +3914,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return SlotAccess.NULL;
      }
  

patches/server/0008-Ridables.patch

@@ -46,7 +46,7 @@ index 87d6b8e0cd8fec7959fb052dce1b73feb8cdb967..b40bc54e80dadc8eb426ed6217b87963
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d5369a39c86353bd99b4b404028db2aea97f8438..8fa36563e130f8af0fc60d84d08134fa54c4ca53 100644
+index 1b3a4928aba578b402e4364aa6501b5445e0669f..94408cb56dcc229ae59ab8e682c803faaecfec5c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -707,6 +707,15 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index 56b9a7059e3b9c2bc66961cb50bc6be3d02cf41c..df46668a78adab398f57b4df98d13478
                              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)) {
                                  entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a0aeb144f4f92b0cfdee1449b44771d0b6808d35..f216a136c693a202d1e07f8760ab493e51a4738e 100644
+index 9608b00d957bbd0158a22f61949e9029340be9c9..1abefe370ac307beecd69ee6f5f9d46c9f414fb6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -120,7 +120,7 @@ index a0aeb144f4f92b0cfdee1449b44771d0b6808d35..f216a136c693a202d1e07f8760ab493e
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4731,4 +4746,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4737,4 +4752,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -2697,7 +2697,7 @@ index e2935115c8d41af1d623da4f0d4f73de80386129..b6e2e7398413296449e8f132a2a6296d
      }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index c6949c7ec0766bda07324a6f004b29cbd37d0f1f..473b801645a62c89ed680f993761dcb64f73bc01 100644
+index 89f761871a84f8ab95f2a16aba8340bb8726da30..99adff4f1d4cd19227dff1554ebf40be6c1daa86 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -81,6 +81,23 @@ public class Sniffer extends Animal {
@@ -2724,7 +2724,7 @@ index c6949c7ec0766bda07324a6f004b29cbd37d0f1f..473b801645a62c89ed680f993761dcb6
      // CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
      @Override
      protected void defineSynchedData() {
-@@ -296,7 +313,7 @@ public class Sniffer extends Animal {
+@@ -303,7 +320,7 @@ public class Sniffer extends Animal {
      }
  
      @Override

patches/server/0010-Barrels-and-enderchests-6-rows.patch

@@ -223,10 +223,10 @@ index 191e8233deaa859d969d54242e297e722f3d947b..76e26542448d18750ce33d53d54c2a77
              case DISPENSER:
              case DROPPER:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 44eba9e20651c29a84def786f4a350750fdbdeeb..15b3e89702a6a8dbfcd820ac9654c9c15b95c52f 100644
+index 092f6843e3b43d4c615d2eee344f5966e96ae850..cb0c851ab5fcf676da2397040835a94d4bdb4be1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -82,7 +82,7 @@ public class CraftInventory implements Inventory {
+@@ -83,7 +83,7 @@ public class CraftInventory implements Inventory {
  
      @Override
      public void setContents(ItemStack[] items) {

patches/server/0058-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 49956239c2f9d0dcbc44352974a8d00e09a965a2..3726b52e088d745285864fb2fb99cbb1aa5963d8 100644
+index 3b62c02aaf5354a52eeb1b10c195d1d6619e8175..7b9f92b3e42146ac33fd72ca943ed91fba4992ad 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4786,5 +4786,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4792,5 +4792,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean processClick(InteractionHand hand) {
          return false;
      }

patches/server/0088-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 3726b52e088d745285864fb2fb99cbb1aa5963d8..ac6d250f143ea0198a823f2c24166bfa891adfe9 100644
+index 7b9f92b3e42146ac33fd72ca943ed91fba4992ad..e157763e945660ca15c4f2371edbf7cda68022c8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4218,6 +4218,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4224,6 +4224,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.yRotO = this.getYRot();
      }
  

patches/server/0093-Allow-toggling-special-MobSpawners-per-world.patch

@@ -36,10 +36,10 @@ index a7c153f957af48cf42ecbb01ada5f8f384c4e5e4..5a6c5972f6044cc4bda46259679d7ca1
          ChunkGenerator chunkgenerator = worlddimension.generator();
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index ae9f9112ce9bec82e7571f679017f1723d9eb982..6f8f03c868b671ea42b45aea97d823fe0d40373e 100644
+index 5d199fe497bd852827d3d18fb7566a09e70331a3..6cd8a50289a6404441e9e5e08d82d2ebe14a09cc 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -160,7 +160,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
+@@ -159,7 +159,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
              int k = pos.getX() + this.random.nextInt(range * 2) - range;
              int l = pos.getZ() + this.random.nextInt(range * 2) - range;
              int i1 = world.getHeight(Heightmap.Types.WORLD_SURFACE, k, l);

patches/server/0147-Sneak-to-bulk-process-composter.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sneak to bulk process composter
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..b69277b2ce0b5e4fd5cc5c21d07f529a16d21cc6 100644
+index 1d33c02088c150189d7f4b0aa27f6a1de96b11cf..1a46dbb364423c889fcdf58f640b778487cef7b7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -568,7 +568,7 @@ public class ServerPlayerGameMode {
+@@ -576,7 +576,7 @@ public class ServerPlayerGameMode {
              boolean flag1 = player.isSecondaryUseActive() && flag;
              ItemStack itemstack1 = stack.copy();
  
@@ -102,7 +102,7 @@ index ae90e86327957bb784e2d81694ee7eea288bb455..c5e4bc4bbeacd4875996ba54e795689f
          int i = (Integer) state.getValue(ComposterBlock.LEVEL);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cc620403d92cd6978d9383591f9f196a99bdc35c..a089b2be3b92688822d22b2b1a49ea1f2184b308 100644
+index c62c1b914f46c3f04d63dedf0df2b9d1cf577941..b9e21b75d0899b636301afab90cb5ab8b5062423 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -485,6 +485,11 @@ public class PurpurWorldConfig {

patches/server/0152-Break-individual-slabs-when-sneaking.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Break individual slabs when sneaking
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index b69277b2ce0b5e4fd5cc5c21d07f529a16d21cc6..9564cfd3ff593662cf5755ae1d83dee4b627cdf9 100644
+index 1a46dbb364423c889fcdf58f640b778487cef7b7..037515e1821098fd44cf6ad42986aec061546fb6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -389,6 +389,7 @@ public class ServerPlayerGameMode {
+@@ -397,6 +397,7 @@ public class ServerPlayerGameMode {
                  } else {capturedBlockEntity = true;} // Paper end
                  return false;
              }
@@ -47,7 +47,7 @@ index 18b603d646081926343dea108b55d641df1c2c34..03ad3e45fc6d48091ac0c0ba5dc3d014
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index def330259864bb5d51bd843b512e2162c6b1cbed..36fb15cb1e6e8a177a4006a901a0cb8048a9a242 100644
+index 90bea40165a45f06c71a1627ee812cc616df0a52..1687652d528e61ebcba35a2437a0ac5ece7e6ce8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -611,6 +611,11 @@ public class PurpurWorldConfig {

patches/server/0177-ShulkerBox-allow-oversized-stacks.patch

@@ -9,10 +9,10 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for
 creative players) instead of routing it through the LootableBuilder.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 9564cfd3ff593662cf5755ae1d83dee4b627cdf9..49335b4fc2a9caab1418531a814210bf52b3cc43 100644
+index 037515e1821098fd44cf6ad42986aec061546fb6..6b186a49957e97a60bb245912211d58eb7b84c0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -420,7 +420,7 @@ public class ServerPlayerGameMode {
+@@ -428,7 +428,7 @@ public class ServerPlayerGameMode {
  
                  ItemStack mainHandStack = null; // Paper
                  boolean isCorrectTool = false; // Paper
@@ -35,7 +35,7 @@ index c89978ecbc5a13dda6f76ea6d1cc3056efc9a174..39868ad3ee4bb573a4dd562894d93f64
                  blockEntity.saveToItem(itemStack);
                  if (shulkerBoxBlockEntity.hasCustomName()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5ca1f9923ecd232c14a8843963cd20166b10d6b1..13a1373355d613bb6a1aa29a7b4cd3e1fe124dd2 100644
+index ce662f1c7ca96586f3470397392576debefa8dcb..2c3c4df0928ee80fe4e6b8152eee46a18231000c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -678,6 +678,11 @@ public class PurpurWorldConfig {

patches/server/0179-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 88ee27ba72be1180def7e0b48c74449189b7ea1e..fd382ff7ee45bfc6a9bfd83d960390f94299b295 100644
+index 41ee6c53e7b8e55587cbdfe114555d0d09c07bbd..179ec9c6ec26b4bf497005a33e0d47aca051282e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4799,5 +4799,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4805,5 +4805,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean canSaveToDisk() {
          return true;
      }

patches/server/0219-Shift-right-click-to-use-exp-for-mending.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Shift right click to use exp for mending
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 49335b4fc2a9caab1418531a814210bf52b3cc43..ebf1ac089202c06fd2cc593dc12c21fe2d0a8de8 100644
+index 6b186a49957e97a60bb245912211d58eb7b84c0d..75f29f6dddf50ccf7ef43ecfa602ccade3c9004d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -509,6 +509,7 @@ public class ServerPlayerGameMode {
+@@ -517,6 +517,7 @@ public class ServerPlayerGameMode {
      public InteractionHand interactHand;
      public ItemStack interactItemStack;
      public InteractionResult useItemOn(ServerPlayer player, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
@@ -16,7 +16,7 @@ index 49335b4fc2a9caab1418531a814210bf52b3cc43..ebf1ac089202c06fd2cc593dc12c21fe
          BlockPos blockposition = hitResult.getBlockPos();
          BlockState iblockdata = world.getBlockState(blockposition);
          InteractionResult enuminteractionresult = InteractionResult.PASS;
-@@ -605,4 +606,18 @@ public class ServerPlayerGameMode {
+@@ -613,4 +614,18 @@ public class ServerPlayerGameMode {
      public void setLevel(ServerLevel world) {
          this.level = world;
      }
@@ -48,7 +48,7 @@ index a004ee039ed9129ffbcbba3d591e16de70c7eff1..672fb9b917f994e9778a833ce722d6b5
                  cancelled = event.useItemInHand() == Event.Result.DENY;
              } else {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 85f40c9255fe6ceb75b526b128ec7772d1fe4928..4e136afc1d1eb052a0c87cde7bb81a50824b3e63 100644
+index 168d05a2be759d37c07ba3cb10b87d67f25e3c34..7fefc3388ec02a218e87c16db1834288aee45185 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -415,6 +415,7 @@ public class PurpurWorldConfig {

patches/server/0277-Remove-Mojang-Profiler.patch

@@ -768,7 +768,7 @@ index 74ab15db63acae728a55ad2cde40ae9bfa3003f3..43bf3285729ec5cedb3de84f2b606739
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 087fd880ec62fed20383ef665b4f4d2e4aa882c7..ef56e8e8496443c85474bfc98a71518f0515b763 100644
+index cacc2ba287b6b48b9fd489a9cf84f2ae042ad67f..5c918b86bc7f0f74a0011efab1a6ca82e1633bbd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1196,7 +1196,7 @@ public class ServerPlayer extends Player {
@@ -1027,7 +1027,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1a918da8b04a463bcce9359c8053b8fb4eeaacb8..c88eda6be7ffe312a2efd90eae85bc7fbc5397ef 100644
+index 9cdfd0a72b020d3820276dfa400b345bc00dd36b..c44d0e77fc610cd0fe540ee25d6773ff97f25031 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -823,7 +823,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1589,10 +1589,10 @@ index cb55b8479f8874ff2fa0941e277c4891cf3fe8d9..8129ad2ca6e0b4c6ca586dc221dcce1e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index f5d2f12c2a95c274823ec37ac1c14a54a48a9cdc..0c5efd0b364e4c1f510d30094757ddb7dc979a68 100644
+index 595c23fee0f1ab313f64769c6cac33acaf9b9dcd..6e7c0e95b27c41bf12da1beb3458830ce27c6029 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -462,11 +462,11 @@ public class Sniffer extends Animal {
+@@ -469,11 +469,11 @@ public class Sniffer extends Animal {
  
      @Override
      protected void customServerAiStep() {