diff --git a/purpur-server/build.gradle.kts.patch b/purpur-server/build.gradle.kts.patch
index f901882c9..656651770 100644
--- a/purpur-server/build.gradle.kts.patch
+++ b/purpur-server/build.gradle.kts.patch
@@ -8,7 +8,7 @@
  
  plugins {
      `java-library`
-@@ -26,6 +_,18 @@
+@@ -26,15 +_,27 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = false
  
@@ -27,6 +27,18 @@
      spigot {
          enabled = false
          buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
+         packageVersion = "v1_21_R5" // also needs to be updated in MappingEnvironment
+     }
+ 
+-    updatingMinecraft {
+-        oldPaperCommit = "29c8822d90899c89d2689338e81a98f690bcba12" // 1.21.8 main
+-    }
++    // updatingMinecraft {
++    //     oldPaperCommit = "29c8822d90899c89d2689338e81a98f690bcba12" // 1.21.8 main
++    // }
+ 
+     reobfPackagesToFix.addAll(
+         "co.aikar.timings",
 @@ -111,7 +_,21 @@
      }
  }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/commands/Commands.java.patch
similarity index 84%
rename from purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/commands/Commands.java.patch
index 996bf8e00..76c7592a4 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/commands/Commands.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index ec1cced129ef42be65d7b2b622638bfae8bd895e..e03e2b976870ecda1e5e3c53d47e7978fe5670ed 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -252,7 +_,7 @@
+@@ -252,7 +252,7 @@ public class Commands {
              JfrCommand.register(this.dispatcher);
          }
  
@@ -9,7 +17,7 @@
              RaidCommand.register(this.dispatcher, context);
              DebugPathCommand.register(this.dispatcher);
              DebugMobSpawningCommand.register(this.dispatcher);
-@@ -264,6 +_,12 @@
+@@ -264,6 +264,12 @@ public class Commands {
              }
          }
  
@@ -22,7 +30,7 @@
          if (selection.includeDedicated) {
              BanIpCommands.register(this.dispatcher);
              BanListCommands.register(this.dispatcher);
-@@ -280,6 +_,14 @@
+@@ -280,6 +286,14 @@ public class Commands {
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
@@ -37,7 +45,7 @@
          }
  
          if (selection.includeIntegrated) {
-@@ -504,6 +_,7 @@
+@@ -504,6 +518,7 @@ public class Commands {
      private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<CommandSourceStack> rootCommandNode) {
          // Paper end - Perf: Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API
@@ -45,7 +53,7 @@
          org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
-@@ -514,6 +_,8 @@
+@@ -514,6 +529,8 @@ public class Commands {
              }
          }
          // CraftBukkit end
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/server/dedicated/DedicatedServer.java.patch
similarity index 81%
rename from purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/server/dedicated/DedicatedServer.java.patch
index e8a2669b4..ef5baf4f3 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/server/dedicated/DedicatedServer.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index 98927d4a5fba2a0dcdb147ac10b82c3286ccdc6b..670553243d26e2faab8a21f099a846d4d1df7927 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -105,6 +_,7 @@
+@@ -105,6 +105,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              public void run() {
                  if (!org.bukkit.craftbukkit.Main.useConsole) return; // CraftBukkit
                  // Paper start - Use TerminalConsoleAppender
@@ -8,7 +16,7 @@
                  new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
                  /*
                  BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
-@@ -183,6 +_,15 @@
+@@ -183,6 +184,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
          this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
@@ -24,7 +32,7 @@
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
  
          this.setPvpAllowed(properties.pvp);
-@@ -230,6 +_,30 @@
+@@ -230,6 +240,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              if (true) throw new IllegalStateException("Failed to bind to port", var10); // Paper - Propagate failed to bind to port error
              return false;
          }
@@ -55,7 +63,7 @@
  
          // CraftBukkit start
          this.server.loadPlugins();
-@@ -308,6 +_,8 @@
+@@ -308,6 +342,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  LOGGER.info("JMX monitoring enabled");
              }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch
similarity index 56%
rename from purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch
index 74d774008..12f65e365 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/dedicated/DedicatedServerProperties.java b/net/minecraft/server/dedicated/DedicatedServerProperties.java
+index 4a01088da91fc6d620cb804a9ab6d6eb1630b473..b286dc17cda16fca3af9374d2a4a8bd137c24450 100644
 --- a/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -51,6 +_,7 @@
+@@ -51,6 +51,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
      public final boolean onlineMode = this.get("online-mode", true);
      public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
      public final String serverIp = this.get("server-ip", "");
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/server/level/ServerLevel.java.patch
similarity index 88%
rename from purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/server/level/ServerLevel.java.patch
index 5626a7245..0bfb3f56c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/server/level/ServerLevel.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a2900104a396e2e 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -206,6 +_,8 @@
+@@ -206,6 +206,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      private final StructureManager structureManager;
      private final StructureCheck structureCheck;
      private final boolean tickTime;
@@ -9,7 +17,7 @@
      private final RandomSequences randomSequences;
  
      // CraftBukkit start
-@@ -590,7 +_,24 @@
+@@ -590,7 +592,24 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          // CraftBukkit end
          this.tickTime = tickTime;
          this.server = server;
@@ -35,7 +43,7 @@
          this.serverLevelData = serverLevelData;
          ChunkGenerator chunkGenerator = levelStem.generator();
          // CraftBukkit start
-@@ -675,6 +_,7 @@
+@@ -675,6 +694,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler);
          // Paper end - rewrite chunk system
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
@@ -43,7 +51,7 @@
      }
  
      // Paper start
-@@ -721,7 +_,7 @@
+@@ -721,7 +741,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          }
  
          int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
@@ -52,7 +60,7 @@
              // Paper start - create time skip event - move up calculations
              final long newDayTime = this.levelData.getDayTime() + 24000L;
              org.bukkit.event.world.TimeSkipEvent event = new org.bukkit.event.world.TimeSkipEvent(
-@@ -840,6 +_,13 @@
+@@ -840,6 +860,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              this.serverLevelData.getScheduledEvents().tick(this.server, l);
              Profiler.get().pop();
              if (this.serverLevelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -66,11 +74,10 @@
                  this.setDayTime(this.levelData.getDayTime() + 1L);
              }
          }
-@@ -847,7 +_,21 @@
+@@ -847,7 +874,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
  
      public void setDayTime(long time) {
          this.serverLevelData.setDayTime(time);
--    }
 +        // Purpur start - Configurable daylight cycle
 +        this.preciseTime = time;
 +        this.forceTime = false;
@@ -84,12 +91,12 @@
 +    // Purpur start - Configurable daylight cycle
 +    public boolean isForceTime() {
 +        return this.forceTime;
-+    }
+     }
 +    // Purpur end - Configurable daylight cycle
  
      public void tickCustomSpawners(boolean spawnEnemies, boolean spawnFriendlies) {
          for (CustomSpawner customSpawner : this.customSpawners) {
-@@ -951,9 +_,17 @@
+@@ -951,9 +992,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                      && this.random.nextDouble() < currentDifficultyAt.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01) // Paper - Configurable spawn chances for skeleton horses
                      && !this.getBlockState(blockPos.below()).is(Blocks.LIGHTNING_ROD);
                  if (flag) {
@@ -109,7 +116,7 @@
                          skeletonHorse.setAge(0);
                          skeletonHorse.setPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
                          this.addFreshEntity(skeletonHorse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
-@@ -988,9 +_,35 @@
+@@ -988,9 +1037,35 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                  if (blockState.is(Blocks.SNOW)) {
                      int layersValue = blockState.getValue(SnowLayerBlock.LAYERS);
                      if (layersValue < Math.min(_int, 8)) {
@@ -145,7 +152,7 @@
                      }
                  } else {
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), 3, null); // CraftBukkit
-@@ -1011,7 +_,7 @@
+@@ -1011,7 +1086,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                  pointOfInterestType -> pointOfInterestType.is(PoiTypes.LIGHTNING_ROD),
                  blockPos -> blockPos.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockPos.getX(), blockPos.getZ()) - 1,
                  pos,
@@ -154,7 +161,7 @@
                  PoiManager.Occupancy.ANY
              );
          return optional.map(blockPos -> blockPos.above(1));
-@@ -1060,8 +_,26 @@
+@@ -1060,8 +1135,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                  int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
                  Component component;
                  if (this.sleepStatus.areEnoughSleeping(_int)) {
@@ -181,7 +188,7 @@
                      component = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(_int));
                  }
  
-@@ -1198,6 +_,7 @@
+@@ -1198,6 +1291,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      @VisibleForTesting
      public void resetWeatherCycle() {
          // CraftBukkit start
@@ -189,7 +196,7 @@
          this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
          // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
          // Not that everyone ever manages to get the whole server to sleep at the same time....
-@@ -1205,6 +_,7 @@
+@@ -1205,6 +1299,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              this.serverLevelData.setRainTime(0);
          }
          // CraftBukkit end
@@ -197,7 +204,7 @@
          this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
          // CraftBukkit start
          // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
-@@ -2727,7 +_,7 @@
+@@ -2727,7 +2822,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // 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 - Fix merchant inventory not closing on entity removal
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/server/level/ServerPlayer.java.patch
similarity index 88%
rename from purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/server/level/ServerPlayer.java.patch
index 17b3285b2..0d48fe63b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/server/level/ServerPlayer.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 8f94c963f2c59668d72d162f46f7505d6a6b06a5..90e4965d7c266d7349112bfdc27bbcba0f12523a 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -429,6 +_,9 @@
+@@ -429,6 +429,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      public boolean isRealPlayer; // Paper
      public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -10,7 +18,7 @@
  
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -562,6 +_,10 @@
+@@ -562,6 +565,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          this.respawnConfig = input.read("respawn", ServerPlayer.RespawnConfig.CODEC).orElse(null);
          this.spawnExtraParticlesOnFall = input.getBooleanOr("spawn_extra_particles_on_fall", false);
          this.raidOmenPosition = input.read("raid_omen_position", BlockPos.CODEC).orElse(null);
@@ -21,7 +29,7 @@
      }
  
      @Override
-@@ -579,6 +_,9 @@
+@@ -579,6 +586,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          output.storeNullable("raid_omen_position", BlockPos.CODEC, this.raidOmenPosition);
          this.saveEnderPearls(output);
          this.getBukkitEntity().setExtraData(output); // CraftBukkit
@@ -31,7 +39,7 @@
      }
  
      private void saveParentVehicle(ValueOutput output) {
-@@ -1079,6 +_,7 @@
+@@ -1079,6 +1089,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
              // Paper - moved up to sendClientboundPlayerCombatKillPacket()
              sendClientboundPlayerCombatKillPacket(event.getShowDeathMessages(), deathScreenMessage); // Paper - Expand PlayerDeathEvent
              Team team = this.getTeam();
@@ -39,7 +47,7 @@
              if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
                  this.server.getPlayerList().broadcastSystemMessage(deathMessage, false);
              } else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
-@@ -1185,6 +_,13 @@
+@@ -1185,6 +1196,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          if (this.isInvulnerableTo(level, damageSource)) {
              return false;
          } else {
@@ -53,7 +61,7 @@
              Entity entity = damageSource.getEntity();
              if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false.
               !(entity instanceof Player player && !this.canHarmPlayer(player))
-@@ -1438,6 +_,7 @@
+@@ -1438,6 +1456,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                  serverLevel.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
                  // CraftBukkit end
@@ -61,7 +69,7 @@
                  this.setServerLevel(level);
                  this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
-@@ -1554,7 +_,7 @@
+@@ -1554,7 +1573,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                              new AABB(vec3.x() - 8.0, vec3.y() - 5.0, vec3.z() - 8.0, vec3.x() + 8.0, vec3.y() + 5.0, vec3.z() + 8.0),
                              monster -> monster.isPreventingPlayerRest(this.level(), this)
                          );
@@ -70,7 +78,7 @@
                          return Either.left(Player.BedSleepingProblem.NOT_SAFE);
                      }
                  }
-@@ -1591,7 +_,19 @@
+@@ -1591,7 +1610,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                      CriteriaTriggers.SLEPT_IN_BED.trigger(this);
                  });
                  if (!this.level().canSleepThroughNights()) {
@@ -91,7 +99,7 @@
                  }
  
                  this.level().updateSleepingPlayerList();
-@@ -1683,6 +_,7 @@
+@@ -1683,6 +1714,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
  
      @Override
      public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) {
@@ -99,7 +107,7 @@
          this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText));
      }
-@@ -1992,6 +_,26 @@
+@@ -1992,6 +2024,26 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
  
@@ -126,7 +134,7 @@
      @Override
      public void displayClientMessage(Component chatComponent, boolean actionBar) {
          this.sendSystemMessage(chatComponent, actionBar);
-@@ -2210,6 +_,20 @@
+@@ -2210,6 +2262,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          );
      }
  
@@ -147,14 +155,13 @@
      public void sendSystemMessage(Component mesage) {
          this.sendSystemMessage(mesage, false);
      }
-@@ -2348,7 +_,67 @@
+@@ -2348,8 +2414,68 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
--    }
 +        this.setAfk(false); // Purpur - AFK API
-+    }
-+
+     }
+ 
 +    // Purpur start - AFK API
 +    private boolean isAfk = false;
 +
@@ -213,10 +220,11 @@
 +        return !this.isAfk() && super.canBeCollidedWith(entity);
 +    }
 +    // Purpur end - AFK API
- 
++
      public ServerStatsCounter getStats() {
          return this.stats;
-@@ -2976,4 +_,56 @@
+     }
+@@ -2976,4 +3102,56 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch
similarity index 83%
rename from purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch
index 416b40862..918f919bb 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..436f753d00f3854c481c95e4ddacfd9fac9932d4 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -39,10 +_,11 @@
+@@ -39,10 +39,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      public final Connection connection; // Paper
      private final boolean transferred;
      //private long keepAliveTime; // Paper - improve keepalives
@@ -13,7 +21,7 @@
      private volatile int latency; // Paper - improve keepalives - make volatile
      private final io.papermc.paper.util.KeepAlive keepAlive; // Paper - improve keepalives
      private volatile boolean suspendFlushingOnServerThread = false;
-@@ -53,6 +_,10 @@
+@@ -53,6 +54,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
      protected static final net.minecraft.resources.ResourceLocation MINECRAFT_BRAND = net.minecraft.resources.ResourceLocation.withDefaultNamespace("brand"); // Paper - Brand support
@@ -24,7 +32,7 @@
      // Paper start - retain certain values
      public @Nullable String playerBrand;
      public final java.util.Set<String> pluginMessagerChannels;
-@@ -104,6 +_,18 @@
+@@ -104,6 +109,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          // Paper start - improve keepalives
          long now = System.nanoTime();
          io.papermc.paper.util.KeepAlive.PendingKeepAlive pending = this.keepAlive.pendingKeepAlives.peek();
@@ -43,7 +51,7 @@
          if (pending != null && pending.challengeId() == packet.getId()) {
              this.keepAlive.pendingKeepAlives.remove(pending);
  
-@@ -178,6 +_,12 @@
+@@ -178,6 +195,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  return;
              }
  
@@ -56,7 +64,7 @@
              if (identifier.equals(MINECRAFT_BRAND)) {
                  this.playerBrand = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256);
              }
-@@ -263,6 +_,23 @@
+@@ -263,6 +286,23 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          Profiler.get().push("keepAlive");
          long millis = Util.getMillis();
          // Paper start - improve keepalives
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
similarity index 91%
rename from purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
index ad3ad9fae..621515409 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index ca13dd72f173be6714965c506f2d48dcd3c9e569..19d964230bf56dc8c4823b98a47fb4258f787390 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -338,6 +_,20 @@
+@@ -338,6 +338,20 @@ public class ServerGamePacketListenerImpl
      }
      // Paper end - configuration phase API
  
@@ -21,7 +29,7 @@
      @Override
      public void tick() {
          if (this.ackBlockChangesUpTo > -1) {
-@@ -396,6 +_,12 @@
+@@ -396,6 +410,12 @@ public class ServerGamePacketListenerImpl
          if (this.player.getLastActionTime() > 0L
              && this.server.getPlayerIdleTimeout() > 0
              && Util.getMillis() - this.player.getLastActionTime() > this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits
@@ -34,7 +42,7 @@
              this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
              this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
          }
-@@ -665,6 +_,8 @@
+@@ -665,6 +685,8 @@ public class ServerGamePacketListenerImpl
                      this.lastYaw = to.getYaw();
                      this.lastPitch = to.getPitch();
  
@@ -43,7 +51,7 @@
                      Location oldTo = to.clone();
                      PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
                      this.cserver.getPluginManager().callEvent(event);
-@@ -744,6 +_,7 @@
+@@ -744,6 +766,7 @@ public class ServerGamePacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
          if (packet.getId() == this.awaitingTeleport) {
              if (this.awaitingPositionFromClient == null) {
@@ -51,7 +59,7 @@
                  this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
                  return;
              }
-@@ -1277,6 +_,10 @@
+@@ -1277,6 +1300,10 @@ public class ServerGamePacketListenerImpl
              final int maxBookPageSize = pageMax.intValue();
              final double multiplier = Math.clamp(io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier, 0.3D, 1D);
              long byteAllowed = maxBookPageSize;
@@ -62,7 +70,7 @@
              for (final String page : pageList) {
                  final int byteLength = page.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  byteTotal += byteLength;
-@@ -1301,7 +_,8 @@
+@@ -1301,7 +1328,8 @@ public class ServerGamePacketListenerImpl
              }
  
              if (byteTotal > byteAllowed) {
@@ -72,7 +80,7 @@
                  this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect
                  return;
              }
-@@ -1320,31 +_,45 @@
+@@ -1320,31 +1348,45 @@ public class ServerGamePacketListenerImpl
              Optional<String> optional = packet.title();
              optional.ifPresent(list::add);
              list.addAll(packet.pages());
@@ -122,7 +130,7 @@
              itemStack.set(
                  DataComponents.WRITTEN_BOOK_CONTENT,
                  new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getName().getString(), 0, list, true)
-@@ -1358,6 +_,16 @@
+@@ -1358,6 +1400,16 @@ public class ServerGamePacketListenerImpl
          return this.player.isTextFilteringEnabled() ? Filterable.passThrough(filteredText.filteredOrEmpty()) : Filterable.from(filteredText);
      }
  
@@ -139,7 +147,7 @@
      @Override
      public void handleEntityTagQuery(ServerboundEntityTagQueryPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
-@@ -1397,7 +_,15 @@
+@@ -1397,7 +1449,15 @@ public class ServerGamePacketListenerImpl
      @Override
      public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
@@ -156,7 +164,7 @@
              this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
          } else {
              ServerLevel serverLevel = this.player.level();
-@@ -1579,7 +_,7 @@
+@@ -1579,7 +1639,7 @@ public class ServerGamePacketListenerImpl
                                          movedWrongly = true;
                                          if (event.getLogWarning())
                                       // Paper end
@@ -165,7 +173,7 @@
                                      } // Paper
                                  }
  
-@@ -1644,6 +_,8 @@
+@@ -1644,6 +1704,8 @@ public class ServerGamePacketListenerImpl
                                          this.lastYaw = to.getYaw();
                                          this.lastPitch = to.getPitch();
  
@@ -174,7 +182,7 @@
                                          Location oldTo = to.clone();
                                          PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
                                          this.cserver.getPluginManager().callEvent(event);
-@@ -1699,6 +_,13 @@
+@@ -1699,6 +1761,13 @@ public class ServerGamePacketListenerImpl
                                          this.player.tryResetCurrentImpulseContext();
                                      }
  
@@ -188,7 +196,7 @@
                                      this.player.checkMovementStatistics(this.player.getX() - x, this.player.getY() - y, this.player.getZ() - z);
                                      this.lastGoodX = this.player.getX();
                                      this.lastGoodY = this.player.getY();
-@@ -1716,6 +_,17 @@
+@@ -1716,6 +1785,17 @@ public class ServerGamePacketListenerImpl
          }
      }
  
@@ -206,7 +214,7 @@
      private boolean shouldCheckPlayerMovement(boolean isElytraMovement) {
          if (this.isSingleplayerOwner()) {
              return false;
-@@ -2113,6 +_,7 @@
+@@ -2113,6 +2193,7 @@ public class ServerGamePacketListenerImpl
  
                  boolean cancelled;
                  if (hitResult == null || hitResult.getType() != HitResult.Type.BLOCK) {
@@ -214,7 +222,7 @@
                      org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemInHand, hand);
                      cancelled = event.useItemInHand() == Event.Result.DENY;
                  } else {
-@@ -2760,6 +_,7 @@
+@@ -2760,6 +2841,7 @@ public class ServerGamePacketListenerImpl
  
                  AABB boundingBox = target.getBoundingBox();
                  if (this.player.canInteractWithEntity(boundingBox, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience value for interact range
@@ -222,7 +230,7 @@
                      packet.dispatch(
                          new ServerboundInteractPacket.Handler() {
                              private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit
-@@ -3492,7 +_,7 @@
+@@ -3492,7 +3574,7 @@ public class ServerGamePacketListenerImpl
      @Override
      public void handleChangeGameMode(ServerboundChangeGameModePacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/server/players/PlayerList.java.patch
similarity index 83%
rename from purpur-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/server/players/PlayerList.java.patch
index d9456fc40..07c44bab4 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/server/players/PlayerList.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index e1fd699b33832c0f01b14023db7cc2b9d6797227..189bf2f787e6f99ed16d75c2e05ff4351d2c8747 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -401,6 +_,7 @@
+@@ -401,6 +401,7 @@ public abstract class PlayerList {
                  scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
              }
              // Paper end - Configurable player collision
@@ -8,7 +16,7 @@
              PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), loggableAddress, player.getId(), serverLevel.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
              // Paper start - Send empty chunk, so players aren't stuck in the world loading screen with our chunk system not sending chunks when dead
              if (player.isDeadOrDying()) {
-@@ -508,6 +_,7 @@
+@@ -508,6 +509,7 @@ public abstract class PlayerList {
      }
      public @Nullable net.kyori.adventure.text.Component remove(ServerPlayer player, net.kyori.adventure.text.Component leaveMessage) {
          // Paper end - Fix kick event leave message not being sent
@@ -16,7 +24,7 @@
          ServerLevel serverLevel = player.level();
          player.awardStat(Stats.LEAVE_GAME);
          // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
-@@ -893,6 +_,20 @@
+@@ -893,6 +895,20 @@ public abstract class PlayerList {
          }
      }
  
@@ -37,7 +45,7 @@
      public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
          for (ServerPlayer serverPlayer : this.players) {
              if (serverPlayer.level().dimension() == dimension) {
-@@ -977,6 +_,7 @@
+@@ -977,6 +993,7 @@ public abstract class PlayerList {
              } else {
                  b = (byte)(24 + permLevel);
              }
@@ -45,7 +53,7 @@
  
              player.connection.send(new ClientboundEntityEventPacket(player, b));
          }
-@@ -989,7 +_,7 @@
+@@ -989,7 +1006,7 @@ public abstract class PlayerList {
  
      // Paper start - whitelist verify event / login event
      public LoginResult canBypassFullServerLogin(final GameProfile profile, final LoginResult currentResult) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/Entity.java.patch
similarity index 82%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/Entity.java.patch
index 8c8c3e08b..ae530ba1f 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/Entity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 8dff36deb47de619f6958cead3c648c832ecc171..f532809a855562b43545e45957bd28c207bd4547 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -148,6 +_,7 @@
+@@ -148,6 +148,7 @@ import org.jetbrains.annotations.Contract;
  import org.slf4j.Logger;
  
  public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker
@@ -8,7 +16,7 @@
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
      public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo
-@@ -280,8 +_,9 @@
+@@ -280,8 +281,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public double xOld;
      public double yOld;
      public double zOld;
@@ -19,7 +27,7 @@
      public int tickCount;
      private int remainingFireTicks;
      public boolean wasTouchingWater;
-@@ -315,8 +_,8 @@
+@@ -315,8 +317,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public PortalProcessor portalProcess;
      public int portalCooldown;
      private boolean invulnerable;
@@ -30,7 +38,7 @@
      private boolean hasGlowingTag;
      private final Set<String> tags = new io.papermc.paper.util.SizeLimitedSet<>(new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<>(), MAX_ENTITY_TAG_COUNT); // Paper - fully limit tag size - replace set impl
      private final double[] pistonDeltas = new double[]{0.0, 0.0, 0.0};
-@@ -371,6 +_,7 @@
+@@ -371,6 +373,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public long activatedTick = Integer.MIN_VALUE;
      public boolean isTemporarilyActive;
      public long activatedImmunityTick = Integer.MIN_VALUE;
@@ -38,7 +46,7 @@
  
      public void inactiveTick() {
      }
-@@ -533,10 +_,21 @@
+@@ -533,10 +536,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
      // Paper end - optimise entity tracker
  
@@ -60,7 +68,7 @@
          this.position = Vec3.ZERO;
          this.blockPosition = BlockPos.ZERO;
          this.chunkPosition = ChunkPos.ZERO;
-@@ -911,6 +_,7 @@
+@@ -911,6 +925,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
              && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
              // Paper end - Configurable nether ceiling damage
@@ -68,7 +76,7 @@
              this.onBelowWorld();
          }
      }
-@@ -1889,7 +_,7 @@
+@@ -1889,7 +1904,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean fireImmune() {
@@ -77,7 +85,7 @@
      }
  
      public boolean causeFallDamage(double fallDistance, float damageMultiplier, DamageSource damageSource) {
-@@ -2585,6 +_,11 @@
+@@ -2585,6 +2600,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  output.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -89,7 +97,7 @@
          } catch (Throwable var7) {
              CrashReport crashReport = CrashReport.forThrowable(var7, "Saving entity NBT");
              CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being saved");
-@@ -2705,6 +_,9 @@
+@@ -2705,6 +2725,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
              freezeLocked = input.getBooleanOr("Paper.FreezeLock", false);
              // Paper end
@@ -99,7 +107,7 @@
          } catch (Throwable var7) {
              CrashReport crashReport = CrashReport.forThrowable(var7, "Loading entity NBT");
              CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being loaded");
-@@ -2983,6 +_,7 @@
+@@ -2983,6 +3006,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (this.isAlive() && this instanceof Leashable leashable2) {
                  if (leashable2.getLeashHolder() == player) {
                      if (!this.level().isClientSide()) {
@@ -107,7 +115,7 @@
                          // Paper start - EntityUnleashEvent
                          if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent(
                              leashable2, player, hand, !player.hasInfiniteMaterials(), true
-@@ -3388,15 +_,18 @@
+@@ -3388,15 +3412,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
@@ -127,7 +135,7 @@
              }
          }
      }
-@@ -3601,7 +_,7 @@
+@@ -3601,7 +3628,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public int getMaxAirSupply() {
@@ -136,7 +144,7 @@
      }
  
      public int getAirSupply() {
-@@ -4155,7 +_,7 @@
+@@ -4155,7 +4182,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // CraftBukkit end
  
      public boolean canUsePortal(boolean allowPassengers) {
@@ -145,7 +153,7 @@
      }
  
      public boolean canTeleport(Level fromLevel, Level toLevel) {
-@@ -4680,6 +_,12 @@
+@@ -4680,6 +4707,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
  
@@ -158,7 +166,7 @@
      // Paper start - optimise collisions
      public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
          if (this.touchingUnloadedChunk()) {
-@@ -5106,7 +_,7 @@
+@@ -5106,7 +5139,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public float maxUpStep() {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/LivingEntity.java.patch
similarity index 85%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/LivingEntity.java.patch
index 1399531a0..36a0f9dca 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/LivingEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index c3c3b7dfb01317c902687b7de192f8a5a910a565..92ef84721a75b85331b936a808c3beb3585aefab 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -444,6 +_,12 @@
+@@ -444,6 +444,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
                  if (d < 0.0) {
                      double damagePerBlock = serverLevel1.getWorldBorder().getDamagePerBlock();
                      if (damagePerBlock > 0.0) {
@@ -13,7 +21,7 @@
                          this.hurtServer(serverLevel1, this.damageSources().outOfBorder(), Math.max(1, Mth.floor(-d * damagePerBlock)));
                      }
                  }
-@@ -456,10 +_,10 @@
+@@ -456,10 +462,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
                      && (!flag || !((Player)this).getAbilities().invulnerable);
                  if (flag1) {
                      this.setAirSupply(this.decreaseAirSupply(this.getAirSupply()));
@@ -26,7 +34,7 @@
                      }
                  } else if (this.getAirSupply() < this.getMaxAirSupply()) {
                      this.setAirSupply(this.increaseAirSupply(this.getAirSupply()));
-@@ -1039,14 +_,32 @@
+@@ -1039,15 +1045,33 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          if (lookingEntity != null) {
              ItemStack itemBySlot = this.getItemBySlot(EquipmentSlot.HEAD);
              EntityType<?> type = lookingEntity.getType();
@@ -36,15 +44,13 @@
 -                || type == EntityType.PIGLIN_BRUTE && itemBySlot.is(Items.PIGLIN_HEAD)
 -                || type == EntityType.CREEPER && itemBySlot.is(Items.CREEPER_HEAD)) {
 -                d *= 0.5;
--            }
--        }
 +            // Purpur start - Mob head visibility percent
 +            if (type == EntityType.SKELETON && itemBySlot.is(Items.SKELETON_SKULL)) {
 +                d *= lookingEntity.level().purpurConfig.skeletonHeadVisibilityPercent;
 +            }
 +            else if (type == EntityType.ZOMBIE && itemBySlot.is(Items.ZOMBIE_HEAD)) {
 +                d *= lookingEntity.level().purpurConfig.zombieHeadVisibilityPercent;
-+            }
+             }
 +            else if ((type == EntityType.PIGLIN || type == EntityType.PIGLIN_BRUTE) && itemBySlot.is(Items.PIGLIN_HEAD)) {
 +                d *= lookingEntity.level().purpurConfig.piglinHeadVisibilityPercent;
 +            }
@@ -52,8 +58,8 @@
 +                d *= lookingEntity.level().purpurConfig.creeperHeadVisibilityPercent;
 +            }
 +            // Purpur end - Mob head visibility percent
-+        }
-+
+         }
+ 
 +        // Purpur start - Configurable mob blindness
 +        if (lookingEntity instanceof LivingEntity entityliving) {
 +            if (entityliving.hasEffect(MobEffects.BLINDNESS)) {
@@ -64,10 +70,11 @@
 +            }
 +        }
 +        // Purpur end - Configurable mob blindness
- 
++
          return d;
      }
-@@ -1093,6 +_,7 @@
+ 
+@@ -1093,6 +1117,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
              Iterator<MobEffectInstance> iterator = this.activeEffects.values().iterator();
              while (iterator.hasNext()) {
                  MobEffectInstance effect = iterator.next();
@@ -75,7 +82,7 @@
                  EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
                  if (event.isCancelled()) {
                      continue;
-@@ -1417,6 +_,24 @@
+@@ -1417,6 +1442,24 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
                  this.stopSleeping();
              }
  
@@ -100,7 +107,7 @@
              this.noActionTime = 0;
              if (amount < 0.0F) {
                  amount = 0.0F;
-@@ -1678,10 +_,10 @@
+@@ -1678,10 +1721,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
      protected Player resolvePlayerResponsibleForDamage(DamageSource damageSource) {
          Entity entity = damageSource.getEntity();
          if (entity instanceof Player player) {
@@ -113,7 +120,7 @@
              } else {
                  this.lastHurtByPlayer = null;
                  this.lastHurtByPlayerMemoryTime = 0;
-@@ -1732,6 +_,18 @@
+@@ -1732,6 +1775,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
                  }
              }
  
@@ -132,7 +139,7 @@
              final org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
              final EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
              event.setCancelled(itemStack == null);
-@@ -1907,6 +_,7 @@
+@@ -1907,6 +1962,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          boolean flag = this.lastHurtByPlayerMemoryTime > 0;
          this.dropEquipment(level); // CraftBukkit - from below
          if (this.shouldDropLoot() && level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -140,7 +147,7 @@
              this.dropFromLootTable(level, damageSource, flag);
              // Paper start
              final boolean prev = this.clearEquipmentSlots;
-@@ -1915,6 +_,7 @@
+@@ -1915,6 +1971,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
              // Paper end
              this.dropCustomDeathLoot(level, damageSource, flag);
              this.clearEquipmentSlots = prev; // Paper
@@ -148,7 +155,7 @@
          }
  
          // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
-@@ -3109,6 +_,7 @@
+@@ -3109,6 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
              float f = (float)(d * 10.0 - 3.0);
              if (f > 0.0F) {
                  this.playSound(this.getFallDamageSound((int)f), 1.0F, 1.0F);
@@ -156,16 +163,16 @@
                  this.hurt(this.damageSources().flyIntoWall(), f);
              }
          }
-@@ -4517,6 +_,12 @@
-             ? slot == EquipmentSlot.MAINHAND && this.canUseSlot(EquipmentSlot.MAINHAND)
+@@ -4518,6 +4576,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
              : slot == equippable.slot() && this.canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(this.getType());
      }
-+
+ 
 +    // Purpur start - Dispenser curse of binding protection
 +    public @Nullable EquipmentSlot getEquipmentSlotForDispenserItem(ItemStack itemstack) {
 +        return EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.BINDING_CURSE, itemstack) > 0 ? null : this.getEquipmentSlotForItem(itemstack);
 +    }
 +    // Purpur end - Dispenser curse of binding protection
- 
++
      private static SlotAccess createEquipmentSlotAccess(LivingEntity entity, EquipmentSlot slot) {
          return slot != EquipmentSlot.HEAD && slot != EquipmentSlot.MAINHAND && slot != EquipmentSlot.OFFHAND
+             ? SlotAccess.forEquipmentSlot(entity, slot, itemStack -> itemStack.isEmpty() || entity.getEquipmentSlotForItem(itemStack) == slot)
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/Mob.java.patch
similarity index 73%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/Mob.java.patch
index 1d0a1c905..7943f7547 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/Mob.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
+index e0b3cb2b2694768803ed347a1026b881fd624951..150d12e27c2de0740af5c554286358f81e290fae 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -140,6 +_,7 @@
+@@ -140,6 +140,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      private int homeRadius = -1;
      public boolean aware = true; // CraftBukkit
      public net.kyori.adventure.util.TriState despawnInPeacefulOverride = net.kyori.adventure.util.TriState.NOT_SET; // Paper - allow changing despawnInPeaceful
@@ -8,7 +16,7 @@
  
      protected Mob(EntityType<? extends Mob> entityType, Level level) {
          super(entityType, level);
-@@ -285,6 +_,7 @@
+@@ -285,6 +286,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
                  target = null;
              }
          }
@@ -16,14 +24,13 @@
          this.target = target;
          return true;
          // CraftBukkit end
-@@ -328,7 +_,27 @@
+@@ -328,8 +330,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          }
  
          profilerFiller.pop();
--    }
 +        incrementTicksSinceLastInteraction(); // Purpur - Entity lifespan
-+    }
-+
+     }
+ 
 +    // Purpur start - Entity lifespan
 +    private void incrementTicksSinceLastInteraction() {
 +        ++this.ticksSinceLastInteraction;
@@ -42,10 +49,11 @@
 +        }
 +    }
 +    // Purpur end - Entity lifespan
- 
++
      @Override
      protected void playHurtSound(DamageSource source) {
-@@ -433,6 +_,7 @@
+         this.resetAmbientSoundTime();
+@@ -433,6 +455,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name());
          }
          // Paper end - allow changing despawnInPeaceful
@@ -53,7 +61,7 @@
      }
  
      @Override
-@@ -461,6 +_,7 @@
+@@ -461,6 +484,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          this.setNoAi(input.getBooleanOr("NoAI", false));
          this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit
          this.despawnInPeacefulOverride = input.read("Paper.DespawnInPeacefulOverride", io.papermc.paper.util.PaperCodecs.TRI_STATE_CODEC).orElse(net.kyori.adventure.util.TriState.NOT_SET); // Paper - allow changing despawnInPeaceful
@@ -61,7 +69,7 @@
      }
  
      @Override
-@@ -1201,7 +_,7 @@
+@@ -1201,7 +1225,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              );
          }
  
@@ -70,7 +78,7 @@
          return spawnGroupData;
      }
  
-@@ -1538,6 +_,7 @@
+@@ -1538,6 +1562,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              this.playAttackSound();
          }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/animal/Bee.java.patch
similarity index 79%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/animal/Bee.java.patch
index 41eefdb1a..277f0180d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/animal/Bee.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
+index 13f24836649790a34b988e2d63accb043e6ff080..a74def8accfbed14257b4090889a6c8d1a3ccd87 100644
 --- a/net/minecraft/world/entity/animal/Bee.java
 +++ b/net/minecraft/world/entity/animal/Bee.java
-@@ -168,7 +_,7 @@
+@@ -168,7 +168,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          // Paper end - Fix MC-167279
          this.lookControl = new Bee.BeeLookControl(this);
          this.setPathfindingMalus(PathType.DANGER_FIRE, -1.0F);
@@ -9,7 +17,7 @@
          this.setPathfindingMalus(PathType.WATER_BORDER, 16.0F);
          this.setPathfindingMalus(PathType.COCOA, -1.0F);
          this.setPathfindingMalus(PathType.FENCE, -1.0F);
-@@ -366,7 +_,7 @@
+@@ -366,7 +366,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      }
  
      public static boolean isNightOrRaining(Level level) {
@@ -18,7 +26,7 @@
      }
  
      public void setStayOutOfHiveCountdown(int stayOutOfHiveCountdown) {
-@@ -389,7 +_,7 @@
+@@ -389,7 +389,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      @Override
      protected void customServerAiStep(ServerLevel level) {
          boolean hasStung = this.hasStung();
@@ -27,7 +35,7 @@
              this.underWaterTicks++;
          } else {
              this.underWaterTicks = 0;
-@@ -399,6 +_,7 @@
+@@ -399,6 +399,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              this.hurtServer(level, this.damageSources().drown(), 1.0F);
          }
  
@@ -35,7 +43,7 @@
          if (hasStung) {
              this.timeSinceSting++;
              if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) {
-@@ -1133,6 +_,7 @@
+@@ -1133,6 +1134,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                      Bee.this.savedFlowerPos = optional.get();
                      Bee.this.navigation
                          .moveTo(Bee.this.savedFlowerPos.getX() + 0.5, Bee.this.savedFlowerPos.getY() + 0.5, Bee.this.savedFlowerPos.getZ() + 0.5, 1.2F);
@@ -43,7 +51,7 @@
                      return true;
                  } else {
                      Bee.this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(Bee.this.random, 20, 60);
-@@ -1179,6 +_,7 @@
+@@ -1179,6 +1181,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              this.pollinating = false;
              Bee.this.navigation.stop();
              Bee.this.remainingCooldownBeforeLocatingNewFlower = 200;
@@ -51,7 +59,7 @@
          }
  
          @Override
-@@ -1225,6 +_,7 @@
+@@ -1225,6 +1228,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                                  this.setWantedPos();
                              }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/animal/Parrot.java.patch
similarity index 74%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/animal/Parrot.java.patch
index aa96df2cb..67dfd1122 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/animal/Parrot.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
+index 22d1e36dadd6a8cbf615335074426aaab6ea7d01..50d836960e6b2d7dae760ac648b5999d8c58b785 100644
 --- a/net/minecraft/world/entity/animal/Parrot.java
 +++ b/net/minecraft/world/entity/animal/Parrot.java
-@@ -159,6 +_,7 @@
+@@ -159,6 +159,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new TamableAnimal.TamableAnimalPanicGoal(1.25));
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -8,7 +16,7 @@
          this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
          this.goalSelector.addGoal(2, new FollowOwnerGoal(this, 1.0, 5.0F, 1.0F));
-@@ -264,7 +_,7 @@
+@@ -264,7 +265,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
              }
  
              if (!this.level().isClientSide) {
@@ -17,7 +25,7 @@
                      this.tame(player);
                      this.level().broadcastEntityEvent(this, (byte)7);
                  } else {
-@@ -272,6 +_,7 @@
+@@ -272,6 +273,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
                  }
              }
  
@@ -25,7 +33,7 @@
              return InteractionResult.SUCCESS;
          } else if (!itemInHand.is(ItemTags.PARROT_POISONOUS_FOOD)) {
              if (!this.isFlying() && this.isTame() && this.isOwnedBy(player)) {
-@@ -296,7 +_,7 @@
+@@ -296,7 +298,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
  
      @Override
      public boolean isFood(ItemStack stack) {
@@ -34,7 +42,7 @@
      }
  
      public static boolean checkParrotSpawnRules(
-@@ -311,13 +_,13 @@
+@@ -311,13 +313,13 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
  
      @Override
      public boolean canMate(Animal otherAnimal) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Skeleton.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/monster/Skeleton.java.patch
similarity index 87%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Skeleton.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/monster/Skeleton.java.patch
index 5cc1ae280..99318d823 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Skeleton.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/monster/Skeleton.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Skeleton.java b/net/minecraft/world/entity/monster/Skeleton.java
+index 743bc2986b962d4aaef00d2e457117f375ca65c7..d53364e33bd9e15ad419f306d7cc2e09c9de242c 100644
 --- a/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/net/minecraft/world/entity/monster/Skeleton.java
-@@ -140,4 +_,64 @@
+@@ -140,4 +140,64 @@ public class Skeleton extends AbstractSkeleton {
              this.spawnAtLocation(level, Items.SKELETON_SKULL);
          }
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/monster/ZombieVillager.java.patch
similarity index 68%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/monster/ZombieVillager.java.patch
index 44370007d..ea04fe3af 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/monster/ZombieVillager.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
+index bc80d5b302f24974ce89db502b41d659457dd98c..75a8f3ecaec5cdfe98aa8363326a8a2047ea75b1 100644
 --- a/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -129,10 +_,10 @@
+@@ -129,10 +129,10 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          ItemStack itemInHand = player.getItemInHand(hand);
          if (itemInHand.is(Items.GOLDEN_APPLE)) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/CatSpawner.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/npc/CatSpawner.java.patch
similarity index 77%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/CatSpawner.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/npc/CatSpawner.java.patch
index 9df36fcd7..222cd8727 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/CatSpawner.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/npc/CatSpawner.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/npc/CatSpawner.java b/net/minecraft/world/entity/npc/CatSpawner.java
+index e282b6ab6d0d1c11ee40f5f436bd50fa90ddc88b..d6ae13c19481ce33bfa0b6c9db63283009339d8c 100644
 --- a/net/minecraft/world/entity/npc/CatSpawner.java
 +++ b/net/minecraft/world/entity/npc/CatSpawner.java
-@@ -25,7 +_,7 @@
+@@ -25,7 +25,7 @@ public class CatSpawner implements CustomSpawner {
          if (spawnFriendlies && level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
              this.nextTick--;
              if (this.nextTick <= 0) {
@@ -9,7 +17,7 @@
                  Player randomPlayer = level.getRandomPlayer();
                  if (randomPlayer != null) {
                      RandomSource randomSource = level.random;
-@@ -48,9 +_,12 @@
+@@ -48,9 +48,12 @@ public class CatSpawner implements CustomSpawner {
      }
  
      private void spawnInVillage(ServerLevel level, BlockPos pos) {
@@ -25,7 +33,7 @@
              if (entitiesOfClass.size() < 5) {
                  this.spawnCat(pos, level, false);
              }
-@@ -58,8 +_,11 @@
+@@ -58,8 +61,11 @@ public class CatSpawner implements CustomSpawner {
      }
  
      private void spawnInHut(ServerLevel level, BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/player/Player.java.patch
similarity index 85%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/player/Player.java.patch
index bed82e0d8..1724f5573 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/player/Player.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index e5e08dbefead90e9fe2bb05e4f0257f7aa4c0686..fd0322685f17f188d19ccc5fc8d2995bfab17f6e 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -219,11 +_,20 @@
+@@ -219,11 +219,20 @@ public abstract class Player extends LivingEntity {
      private int currentImpulseContextResetGraceTime = 0;
      public boolean affectsSpawning = true; // Paper - Affects Spawning API
      public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
@@ -21,7 +29,7 @@
      @Override
      public org.bukkit.craftbukkit.entity.CraftHumanEntity getBukkitEntity() {
          return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
-@@ -287,6 +_,12 @@
+@@ -287,6 +296,12 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void tick() {
@@ -34,7 +42,7 @@
          this.noPhysics = this.isSpectator();
          if (this.isSpectator() || this.isPassenger()) {
              this.setOnGround(false);
-@@ -365,6 +_,17 @@
+@@ -365,6 +380,17 @@ public abstract class Player extends LivingEntity {
              this.turtleHelmetTick();
          }
  
@@ -52,7 +60,7 @@
          this.cooldowns.tick();
          this.updatePlayerPose();
          if (this.currentImpulseContextResetGraceTime > 0) {
-@@ -630,7 +_,7 @@
+@@ -630,7 +656,7 @@ public abstract class Player extends LivingEntity {
              List<Entity> list = Lists.newArrayList();
  
              for (Entity entity : entities) {
@@ -61,7 +69,7 @@
                      list.add(entity);
                  } else if (!entity.isRemoved()) {
                      this.touch(entity);
-@@ -1226,7 +_,7 @@
+@@ -1226,7 +1252,7 @@ public abstract class Player extends LivingEntity {
                          flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                          if (flag2) {
                              damageSource = damageSource.critical(); // Paper - critical damage API
@@ -70,7 +78,7 @@
                          }
  
                          float f2 = f + f1;
-@@ -1822,7 +_,23 @@
+@@ -1822,7 +1848,23 @@ public abstract class Player extends LivingEntity {
  
      @Override
      protected int getBaseExperienceReward(ServerLevel level) {
@@ -95,17 +103,17 @@
      }
  
      @Override
-@@ -1860,6 +_,13 @@
-     public boolean addItem(ItemStack stack) {
+@@ -1861,6 +1903,13 @@ public abstract class Player extends LivingEntity {
          return this.inventory.add(stack);
      }
-+
+ 
 +    // Purpur start - Player ridable in water option
 +    @Override
 +    public boolean dismountsUnderwater() {
 +        return !level().purpurConfig.playerRidableInWater;
 +    }
 +    // Purpur end - Player ridable in water option
- 
++
      public boolean setEntityOnShoulder(CompoundTag entityCompound) {
          if (this.isPassenger() || !this.onGround() || this.isInWater() || this.isInPowderSnow) {
+             return false;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/AxeItem.java.patch
similarity index 90%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/item/AxeItem.java.patch
index c87b129e2..6c6b19bc6 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/AxeItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/AxeItem.java b/net/minecraft/world/item/AxeItem.java
+index bd919b9a83f9736f02783b1ba3863fd1b77c7e89..eb8d2d6f9c65185f5fe16a13ab0cdbba78a25a40 100644
 --- a/net/minecraft/world/item/AxeItem.java
 +++ b/net/minecraft/world/item/AxeItem.java
-@@ -62,13 +_,15 @@
+@@ -62,13 +62,15 @@ public class AxeItem extends Item {
          if (playerHasBlockingItemUseIntent(context)) {
              return InteractionResult.PASS;
          } else {
@@ -18,7 +26,7 @@
                      return InteractionResult.PASS;
                  }
                  // Paper end
-@@ -76,8 +_,15 @@
+@@ -76,8 +78,15 @@ public class AxeItem extends Item {
                      CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, clickedPos, itemInHand);
                  }
  
@@ -36,7 +44,7 @@
                  if (player != null) {
                      itemInHand.hurtAndBreak(1, player, LivingEntity.getSlotForHand(context.getHand()));
                  }
-@@ -94,22 +_,24 @@
+@@ -94,22 +103,24 @@ public class AxeItem extends Item {
              && !player.isSecondaryUseActive();
      }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/BlockItem.java.patch
similarity index 79%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/item/BlockItem.java.patch
index 4276bf195..21fcde34d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/BlockItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
+index 6db566adf2d0df1d26221eda04aa01738df6d3d2..3dbdb5c30f8af89e768016bb683a4d2c1549aa0e 100644
 --- a/net/minecraft/world/item/BlockItem.java
 +++ b/net/minecraft/world/item/BlockItem.java
-@@ -144,7 +_,16 @@
+@@ -144,7 +144,16 @@ public class BlockItem extends Item {
      }
  
      protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, @Nullable Player player, ItemStack stack, BlockState state) {
@@ -18,7 +26,7 @@
      }
  
      @Nullable
-@@ -211,6 +_,7 @@
+@@ -211,6 +220,7 @@ public class BlockItem extends Item {
                      }
  
                      if (!type.onlyOpCanSetNbt() || player != null && (player.canUseGameMasterBlocks() || (player.getAbilities().instabuild && player.getBukkitEntity().hasPermission("minecraft.nbt.place")))) { // Spigot - add permission
@@ -26,7 +34,7 @@
                          return customData.loadInto(blockEntity, level.registryAccess());
                      }
  
-@@ -252,6 +_,7 @@
+@@ -252,6 +262,7 @@ public class BlockItem extends Item {
      public void onDestroyed(ItemEntity itemEntity) {
          ItemContainerContents itemContainerContents = itemEntity.getItem().set(DataComponents.CONTAINER, ItemContainerContents.EMPTY);
          if (itemContainerContents != null) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/HoeItem.java.patch
similarity index 82%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/item/HoeItem.java.patch
index cebe3180e..3acfeaf2e 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/HoeItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/HoeItem.java b/net/minecraft/world/item/HoeItem.java
+index 3bf3d4030c4da65fa386a8b8083d259a6046d15e..77a8d5d334cd93d23149afa8e58f4114412632df 100644
 --- a/net/minecraft/world/item/HoeItem.java
 +++ b/net/minecraft/world/item/HoeItem.java
-@@ -45,15 +_,25 @@
+@@ -45,15 +45,25 @@ public class HoeItem extends Item {
      public InteractionResult useOn(UseOnContext context) {
          Level level = context.getLevel();
          BlockPos clickedPos = context.getClickedPos();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/SpawnEggItem.java.patch
similarity index 84%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/item/SpawnEggItem.java.patch
index 7a0553a75..6301e8389 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/item/SpawnEggItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/SpawnEggItem.java b/net/minecraft/world/item/SpawnEggItem.java
+index 7a961e5ebbdac061f6e73e4ed07fe957ba759066..d48c1dedbd39770ccf3c9c3ff3351b391601cd77 100644
 --- a/net/minecraft/world/item/SpawnEggItem.java
 +++ b/net/minecraft/world/item/SpawnEggItem.java
-@@ -57,6 +_,23 @@
+@@ -57,6 +57,23 @@ public class SpawnEggItem extends Item {
              if (level.getBlockEntity(clickedPos) instanceof Spawner spawner) {
                  if (level.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation) return InteractionResult.FAIL; // Paper - Allow disabling mob spawner spawn egg transformation
                  EntityType<?> type = this.getType(level.registryAccess(), itemInHand);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/Block.java.patch
similarity index 85%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/Block.java.patch
index aee7753ae..a2e463ff7 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/Block.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
+index be6f37f91569c659c609e5e8d38671ca86f8cd95..d023c985344807db2180665a15d282fa50754299 100644
 --- a/net/minecraft/world/level/block/Block.java
 +++ b/net/minecraft/world/level/block/Block.java
-@@ -99,6 +_,10 @@
+@@ -99,6 +99,10 @@ public class Block extends BlockBehaviour implements ItemLike {
      public static final int UPDATE_LIMIT = 512;
      protected final StateDefinition<Block, BlockState> stateDefinition;
      private BlockState defaultBlockState;
@@ -11,7 +19,7 @@
      // Paper start - Protect Bedrock and End Portal/Frames from being destroyed
      public final boolean isDestroyable() {
          return io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowPermanentBlockBreakExploits ||
-@@ -345,7 +_,7 @@
+@@ -345,7 +349,7 @@ public class Block extends BlockBehaviour implements ItemLike {
              event.setExpToDrop(block.getExpDrop(state, serverLevel, pos, net.minecraft.world.item.ItemStack.EMPTY, true)); // Paper - Properly handle xp dropping
              event.callEvent();
              for (org.bukkit.inventory.ItemStack drop : event.getDrops()) {
@@ -20,7 +28,7 @@
              }
              state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, false); // Paper - Properly handle xp dropping
              block.popExperience(serverLevel, pos, event.getExpToDrop()); // Paper - Properly handle xp dropping
-@@ -363,7 +_,7 @@
+@@ -363,7 +367,7 @@ public class Block extends BlockBehaviour implements ItemLike {
  
      public static void dropResources(BlockState state, LevelAccessor level, BlockPos pos, @Nullable BlockEntity blockEntity) {
          if (level instanceof ServerLevel) {
@@ -29,7 +37,7 @@
              state.spawnAfterBreak((ServerLevel)level, pos, ItemStack.EMPTY, true);
          }
      }
-@@ -375,11 +_,30 @@
+@@ -375,11 +379,30 @@ public class Block extends BlockBehaviour implements ItemLike {
      public static void dropResources(BlockState state, Level level, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool, boolean dropExperience) {
      // Paper end - Properly handle xp dropping
          if (level instanceof ServerLevel) {
@@ -61,11 +69,10 @@
      public static void popResource(Level level, BlockPos pos, ItemStack stack) {
          double d = EntityType.ITEM.getHeight() / 2.0;
          double d1 = pos.getX() + 0.5 + Mth.nextDouble(level.random, -0.25, 0.25);
-@@ -460,7 +_,15 @@
+@@ -460,7 +483,15 @@ public class Block extends BlockBehaviour implements ItemLike {
      }
  
      public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
--    }
 +        this.placer = placer; // Purpur - Store placer on Block when placed
 +    }
 +
@@ -73,12 +80,12 @@
 +    @Nullable protected LivingEntity placer = null;
 +    public void forgetPlacer() {
 +        this.placer = null;
-+    }
+     }
 +    // Purpur end - Store placer on Block when placed
  
      public boolean isPossibleToRespawnInThis(BlockState state) {
          return !state.isSolid() && !state.liquid();
-@@ -471,7 +_,7 @@
+@@ -471,7 +502,7 @@ public class Block extends BlockBehaviour implements ItemLike {
      }
  
      public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch
similarity index 78%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch
index 3ab8cbc0e..7ccc03e85 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CarvedPumpkinBlock.java b/net/minecraft/world/level/block/CarvedPumpkinBlock.java
+index 7cdf16c7216878350537b5331081cb30f44d6dbb..a4854370dfdcbc7ec4c27975e4feb69d4cb48a11 100644
 --- a/net/minecraft/world/level/block/CarvedPumpkinBlock.java
 +++ b/net/minecraft/world/level/block/CarvedPumpkinBlock.java
-@@ -64,7 +_,7 @@
+@@ -64,7 +64,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
          if (blockPatternMatch != null) {
              SnowGolem snowGolem = EntityType.SNOW_GOLEM.create(level, EntitySpawnReason.TRIGGERED);
              if (snowGolem != null) {
@@ -9,7 +17,7 @@
              }
          } else {
              BlockPattern.BlockPatternMatch blockPatternMatch1 = this.getOrCreateIronGolemFull().find(level, pos);
-@@ -72,13 +_,23 @@
+@@ -72,13 +72,23 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
                  IronGolem ironGolem = EntityType.IRON_GOLEM.create(level, EntitySpawnReason.TRIGGERED);
                  if (ironGolem != null) {
                      ironGolem.setPlayerCreated(true);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/ComposterBlock.java.patch
similarity index 81%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/ComposterBlock.java.patch
index 8ee18624a..170f0f56d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/ComposterBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/ComposterBlock.java b/net/minecraft/world/level/block/ComposterBlock.java
+index a647d76d365a60b95a3eb7927ac426bf70d417f3..3eb11df5d14ec63911be630ca99d8d9903723f9b 100644
 --- a/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/net/minecraft/world/level/block/ComposterBlock.java
-@@ -250,23 +_,52 @@
+@@ -250,17 +250,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
      ) {
          int levelValue = state.getValue(LEVEL);
          if (levelValue < 8 && COMPOSTABLES.containsKey(stack.getItem())) {
@@ -14,7 +22,6 @@
 -                level.levelEvent(1500, pos, state != blockState ? 1 : 0);
 -                player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
 -                stack.consume(1, player);
--            }
 +            // Purpur start - sneak to bulk process composter
 +            BlockState newState = process(levelValue, player, state, level, pos, stack);
 +            if (newState == null) {
@@ -34,15 +41,15 @@
 +                    newCount = stack.getCount();
 +                    newLevel = newState.getValue(ComposterBlock.LEVEL);
 +                } while (newCount > 0 && (newCount != oldCount || newLevel != oldLevel || newState != oldState));
-+            }
+             }
 +            // Purpur end - Sneak to bulk process composter
  
              return InteractionResult.SUCCESS;
          } else {
-             return super.useItemOn(stack, state, level, pos, player, hand, hitResult);
+@@ -268,6 +278,25 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          }
      }
-+
+ 
 +    // Purpur start - sneak to bulk process composter
 +    private static @Nullable BlockState process(int levelValue, Player player, BlockState state, Level level, BlockPos pos, ItemStack stack) {
 +        if (levelValue < 7 && !level.isClientSide) {
@@ -61,6 +68,7 @@
 +        return state;
 +    }
 +    // Purpur end - Sneak to bulk process composter
- 
++
      @Override
      protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
+         int levelValue = state.getValue(LEVEL);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
similarity index 76%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
index 9369902be..4eb4192d1 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+index 91f7ee163107d846e7f6a5783be6eff96e783886..b1b49fa83794f4237994e9b985816ddf6d20b7e9 100644
 --- a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -75,7 +_,7 @@
+@@ -75,7 +75,7 @@ public class BeehiveBlockEntity extends BlockEntity {
          "leash",
          "UUID"
      );
@@ -9,7 +17,7 @@
      private static final int MIN_TICKS_BEFORE_REENTERING_HIVE = 400;
      private static final int MIN_OCCUPATION_TICKS_NECTAR = 2400;
      public static final int MIN_OCCUPATION_TICKS_NECTARLESS = 600;
-@@ -150,11 +_,33 @@
+@@ -150,11 +150,33 @@ public class BeehiveBlockEntity extends BlockEntity {
          return list;
      }
  
@@ -43,7 +51,7 @@
      // Paper start - Add EntityBlockStorage clearEntities
      public void clearBees() {
          this.stored.clear();
-@@ -392,8 +_,8 @@
+@@ -392,8 +414,8 @@ public class BeehiveBlockEntity extends BlockEntity {
          return this.stored.stream().map(BeehiveBlockEntity.BeeData::toOccupant).toList();
      }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch
similarity index 85%
rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch
rename to purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch
index a337495d8..1a2c3b9b4 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch
+++ b/purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
+index 0e87d20639c382be2221d73c7498480d21ebeafb..3ea9fe4c936f024c15a6bba6e7c5d960a3def1f9 100644
 --- a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
-@@ -151,7 +_,7 @@
+@@ -151,7 +151,7 @@ public class ConduitBlockEntity extends BlockEntity {
                          BlockPos blockPos1 = pos.offset(i, i1, i2x);
                          BlockState blockState = level.getBlockState(blockPos1);
  
@@ -9,7 +17,7 @@
                              if (blockState.is(block)) {
                                  positions.add(blockPos1);
                              }
-@@ -166,13 +_,13 @@
+@@ -166,13 +166,13 @@ public class ConduitBlockEntity extends BlockEntity {
  
      private static void applyEffects(Level level, BlockPos pos, List<BlockPos> positions) {
          // CraftBukkit start
@@ -26,7 +34,7 @@
          // CraftBukkit start
          return i;
      }
-@@ -202,7 +_,7 @@
+@@ -202,7 +202,7 @@ public class ConduitBlockEntity extends BlockEntity {
          EntityReference<LivingEntity> entityReference = updateDestroyTarget(blockEntity.destroyTarget, level, pos, canDestroy);
          LivingEntity livingEntity = EntityReference.get(entityReference, level, LivingEntity.class);
          if (damageTarget && livingEntity != null) { // CraftBukkit
@@ -35,7 +43,7 @@
              level.playSound(
                  null, livingEntity.getX(), livingEntity.getY(), livingEntity.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F
              );
-@@ -224,20 +_,26 @@
+@@ -224,20 +224,26 @@ public class ConduitBlockEntity extends BlockEntity {
              return selectNewTarget(level, pos);
          } else {
              LivingEntity livingEntity = EntityReference.get(destroyTarget, level, LivingEntity.class);
diff --git a/purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch b/purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch
index e0eadeef9..f37a3cbdb 100644
--- a/purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch
+++ b/purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
+index ae2bb9a73106febfe5f0d090abd4252bbb5fd27e..ca21597263cb430e2a5ae07e8cecfb0d53a270d2 100644
 --- a/io/papermc/paper/entity/activation/ActivationRange.java
 +++ b/io/papermc/paper/entity/activation/ActivationRange.java
-@@ -147,6 +_,8 @@
+@@ -147,6 +147,8 @@ public final class ActivationRange {
                  continue;
              }
  
@@ -9,7 +17,7 @@
              final int worldHeight = world.getHeight();
              ActivationRange.maxBB = player.getBoundingBox().inflate(maxRange, worldHeight, maxRange);
              ActivationType.MISC.boundingBox = player.getBoundingBox().inflate(miscActivationRange, worldHeight, miscActivationRange);
-@@ -288,6 +_,7 @@
+@@ -288,6 +290,7 @@ public final class ActivationRange {
       * @return
       */
      public static boolean checkIfActive(final Entity entity) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch
index 52cafd0d1..aa68398a8 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/CrashReport.java b/net/minecraft/CrashReport.java
+index 3e0e88afcf010d9a3d46e48bca5cbdf98fe97544..394443d00e661715439be1e56dddc129947699a4 100644
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -30,6 +_,7 @@
+@@ -30,6 +30,7 @@ public class CrashReport {
      private boolean trackingStackTrace = true;
      private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
      private final SystemReport systemReport = new SystemReport();
@@ -8,7 +16,7 @@
  
      public CrashReport(String title, Throwable exception) {
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
-@@ -130,7 +_,7 @@
+@@ -130,7 +131,7 @@ public class CrashReport {
      }
  
      public String getFriendlyReport(ReportType type) {
@@ -17,7 +25,7 @@
      }
  
      @Nullable
-@@ -161,7 +_,7 @@
+@@ -161,7 +162,7 @@ public class CrashReport {
      }
  
      public boolean saveToFile(Path path, ReportType type) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch
index 007fa82c9..57b7a3aba 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/commands/CommandSourceStack.java b/net/minecraft/commands/CommandSourceStack.java
+index 3acfb2a78845dd8081dc3c01d653034232c76e60..51caf352e77df49fc04bf84f1fab29b6f4f4fc14 100644
 --- a/net/minecraft/commands/CommandSourceStack.java
 +++ b/net/minecraft/commands/CommandSourceStack.java
-@@ -447,6 +_,19 @@
+@@ -447,6 +447,19 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
      }
      // CraftBukkit end
  
@@ -20,11 +28,10 @@
      public Vec3 getPosition() {
          return this.worldPosition;
      }
-@@ -531,6 +_,30 @@
-             }
+@@ -532,6 +545,30 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
          }
      }
-+
+ 
 +    // Purpur start - Purpur config files
 +    public void sendSuccess(@Nullable String message) {
 +        sendSuccess(message, false);
@@ -48,6 +55,7 @@
 +        sendSuccess(() -> io.papermc.paper.adventure.PaperAdventure.asVanilla(message), broadcastToOps);
 +    }
 +    // Purpur end - Purpur config files
- 
++
      public void sendSuccess(Supplier<Component> messageSupplier, boolean allowLogging) {
          boolean flag = this.source.acceptsSuccess() && !this.silent;
+         boolean flag1 = allowLogging && this.source.shouldInformAdmins() && !this.silent;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch
index c89e997d6..c98bbb4cd 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/commands/arguments/selector/EntitySelector.java b/net/minecraft/commands/arguments/selector/EntitySelector.java
+index 514f8fbdeb776087608665c35de95294aadf5cf0..b305ba9bab617bf4e52d0e6ddf160bacc5751a94 100644
 --- a/net/minecraft/commands/arguments/selector/EntitySelector.java
 +++ b/net/minecraft/commands/arguments/selector/EntitySelector.java
-@@ -192,26 +_,27 @@
+@@ -192,26 +192,27 @@ public class EntitySelector {
          this.checkPermissions(source);
          if (this.playerName != null) {
              ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(this.playerName);
@@ -32,7 +40,7 @@
                              players.add(serverPlayer1);
                              if (players.size() >= resultLimit) {
                                  return players;
-@@ -270,4 +_,10 @@
+@@ -270,4 +271,10 @@ public class EntitySelector {
      public static Component joinNames(List<? extends Entity> names) {
          return ComponentUtils.formatList(names, Entity::getDisplayName);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch
index 8b669b1d6..21171f477 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/core/BlockPos.java b/net/minecraft/core/BlockPos.java
+index a81694a22e94cca6f7110f7d5b205d1303f4e071..6518d3fff6daf331b24a7bf5b39fa1920b73711d 100644
 --- a/net/minecraft/core/BlockPos.java
 +++ b/net/minecraft/core/BlockPos.java
-@@ -63,6 +_,12 @@
+@@ -63,6 +63,12 @@ public class BlockPos extends Vec3i {
      public static final int MAX_HORIZONTAL_COORDINATE = 33554431;
      // Paper end - Optimize Bit Operations by inlining
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch
index 15ad30cf2..cc8dc4234 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/core/dispenser/DispenseItemBehavior.java b/net/minecraft/core/dispenser/DispenseItemBehavior.java
+index ca02c4c71a0a5a1a0ae8bbb40f0b1b7eac64e6fd..582e012222123e5001c34153f2ee1ab1d08935fd 100644
 --- a/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java
-@@ -735,5 +_,22 @@
+@@ -735,5 +735,22 @@ public interface DispenseItemBehavior {
          DispenserBlock.registerBehavior(Items.TNT_MINECART, new MinecartDispenseItemBehavior(EntityType.TNT_MINECART));
          DispenserBlock.registerBehavior(Items.HOPPER_MINECART, new MinecartDispenseItemBehavior(EntityType.HOPPER_MINECART));
          DispenserBlock.registerBehavior(Items.COMMAND_BLOCK_MINECART, new MinecartDispenseItemBehavior(EntityType.COMMAND_BLOCK_MINECART));
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch
index 9a2c1e083..9d5f43765 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
+index e2d169b45f1dba6559ca337b07a110f79d3db504..727d04a442053f6d0c4df3e744554e2866fa38cd 100644
 --- a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
 +++ b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
-@@ -32,7 +_,7 @@
+@@ -32,7 +32,7 @@ public class EquipmentDispenseItemBehavior extends DefaultDispenseItemBehavior {
              return false;
          } else {
              LivingEntity livingEntity = entitiesOfClass.getFirst();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch
index 870429942..2f8549b9e 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/gametest/framework/GameTestHelper.java b/net/minecraft/gametest/framework/GameTestHelper.java
+index 9fb53bc1330bf5370769200599b022a985f88db2..61ab8b508d2b614d0f05ae4cc23dc214f8e95a1d 100644
 --- a/net/minecraft/gametest/framework/GameTestHelper.java
 +++ b/net/minecraft/gametest/framework/GameTestHelper.java
-@@ -292,6 +_,8 @@
+@@ -292,6 +292,8 @@ public class GameTestHelper {
                  return gameType;
              }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch
index 8002c2998..29372b4d9 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/gametest/framework/TestCommand.java b/net/minecraft/gametest/framework/TestCommand.java
+index 17f33a309ead525975a3090514a6367260f0af09..f4360d9472ba344f2e7afd6d798d313d5423fcb5 100644
 --- a/net/minecraft/gametest/framework/TestCommand.java
 +++ b/net/minecraft/gametest/framework/TestCommand.java
-@@ -449,7 +_,7 @@
+@@ -449,7 +449,7 @@ public class TestCommand {
                              )
                      )
              );
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch
index 6b808c0fd..b4a3f68ff 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
+index 41005f6b9f53a9c1125ad5e08538d9f5aacb3571..411e1284a208ca1a097cf6eaa92e1e0d2203d83d 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
-@@ -580,11 +_,20 @@
+@@ -580,11 +580,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper - Buffer joins to world
      private static int joinAttemptsThisTick; // Paper - Buffer joins to world
      private static int currTick; // Paper - Buffer joins to world
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch
index 60c29bda0..a73db0fdc 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/network/chat/SignedMessageChain.java b/net/minecraft/network/chat/SignedMessageChain.java
+index f6eed34b2fd72ab74cc9dc4b99ca184d512c0a66..a3e211edd348c0936757de33a74b9456248b3bd2 100644
 --- a/net/minecraft/network/chat/SignedMessageChain.java
 +++ b/net/minecraft/network/chat/SignedMessageChain.java
-@@ -45,7 +_,7 @@
+@@ -45,7 +45,7 @@ public class SignedMessageChain {
                      SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink;
                      if (signedMessageLink == null) {
                          throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.CHAIN_BROKEN);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch
index 3705f6215..902228324 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
+index fd3553bdc1c3cdbf6aa3dc00e0a4987f8eaa4fb8..b06c2c4aa77edafb374f7cf0406cf4d29c6e7f9f 100644
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -109,6 +_,13 @@
+@@ -109,6 +109,13 @@ public class Main {
                  JvmProfiler.INSTANCE.start(Environment.SERVER);
              }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
index 7b0c83d5c..ab70d4f12 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 9243bb11e3f968d0bf0eb2e3dc9295c0232bc15d..0595271ec939a72d38b97241270c109ece0be0e0 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -284,6 +_,7 @@
+@@ -284,6 +284,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public joptsimple.OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
      public static int currentTick; // Paper - improve tick loop
@@ -8,7 +16,7 @@
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      // Paper - don't store the vanilla dispatcher
-@@ -294,7 +_,7 @@
+@@ -294,7 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper - improve server tick loop
      @Deprecated(forRemoval = true) // Paper
@@ -17,7 +25,7 @@
      // Spigot end
      public volatile boolean hasFullyShutdown; // Paper - Improved watchdog support
      public volatile boolean abnormalExit; // Paper - Improved watchdog support
-@@ -303,6 +_,8 @@
+@@ -303,6 +304,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
      private final Set<String> pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping
      public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
@@ -26,7 +34,7 @@
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {
          ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system
-@@ -996,6 +_,15 @@
+@@ -996,6 +999,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -42,7 +50,7 @@
          // CraftBukkit start
          if (this.server != null) {
              this.server.spark.disable(); // Paper - spark
-@@ -1094,6 +_,8 @@
+@@ -1094,6 +1106,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.safeShutdown(waitForServer, false);
      }
      public void safeShutdown(boolean waitForServer, boolean isRestarting) {
@@ -51,7 +59,7 @@
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper - Debugging
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-@@ -1113,6 +_,7 @@
+@@ -1113,6 +1127,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -59,7 +67,7 @@
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1199,6 +_,16 @@
+@@ -1199,6 +1214,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
              // Paper end - Add onboarding message for initial server start
  
@@ -76,7 +84,7 @@
              while (this.running) {
                  long l;
                  if (!this.isPaused() && this.tickRateManager.isSprinting() && this.tickRateManager.checkShouldSprintThisTick()) {
-@@ -1223,14 +_,19 @@
+@@ -1223,14 +1248,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
                      final long diff = currentTime - tickSection;
                      final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -99,7 +107,7 @@
                      tickSection = currentTime;
                  }
                  // Paper end - further improve server tick loop
-@@ -1262,6 +_,12 @@
+@@ -1262,6 +1292,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      profilerFiller.popPush("nextTickWait");
                      this.mayHaveDelayedTasks = true;
                      this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + l, this.nextTickTimeNanos);
@@ -112,7 +120,7 @@
                      this.startMeasuringTaskExecutionTime();
                      this.waitUntilNextTick();
                      this.finishMeasuringTaskExecutionTime();
-@@ -1691,7 +_,7 @@
+@@ -1691,7 +1727,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
@@ -121,7 +129,7 @@
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-@@ -1856,7 +_,7 @@
+@@ -1856,7 +1892,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/PlayerAdvancements.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/PlayerAdvancements.java.patch
index 24e974fe8..482864934 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/PlayerAdvancements.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/PlayerAdvancements.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
+index fdeca41d40705f28864ce4443d01cd872c9d51b0..10e5469df1800bcdfb3f8cb4045ee25a4bafc58c 100644
 --- a/net/minecraft/server/PlayerAdvancements.java
 +++ b/net/minecraft/server/PlayerAdvancements.java
-@@ -147,6 +_,7 @@
+@@ -147,6 +147,7 @@ public class PlayerAdvancements {
              AdvancementHolder advancementHolder = advancementManager.get(path);
              if (advancementHolder == null) {
                  if (!path.getNamespace().equals(ResourceLocation.DEFAULT_NAMESPACE)) return; // CraftBukkit
@@ -8,7 +16,7 @@
                  LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", path, this.playerSavePath);
              } else {
                  this.startProgress(advancementHolder, progress);
-@@ -194,6 +_,7 @@
+@@ -194,6 +195,7 @@ public class PlayerAdvancements {
                  advancement.value().display().ifPresent(displayInfo -> {
                      // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
                      if (event.message() != null && this.player.level().getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch
index 6379c1d94..328d8e923 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/commands/EnchantCommand.java b/net/minecraft/server/commands/EnchantCommand.java
+index 6f4fcee9fdba2248227708fcced1ce0f40aff6af..13f1dbd0d09428e9e0a42f99d0553283e0065f6f 100644
 --- a/net/minecraft/server/commands/EnchantCommand.java
 +++ b/net/minecraft/server/commands/EnchantCommand.java
-@@ -70,7 +_,7 @@
+@@ -70,7 +70,7 @@ public class EnchantCommand {
  
      private static int enchant(CommandSourceStack source, Collection<? extends Entity> targets, Holder<Enchantment> enchantment, int level) throws CommandSyntaxException {
          Enchantment enchantment1 = enchantment.value();
@@ -9,7 +17,7 @@
              throw ERROR_LEVEL_TOO_HIGH.create(level, enchantment1.getMaxLevel());
          } else {
              int i = 0;
-@@ -80,7 +_,7 @@
+@@ -80,7 +80,7 @@ public class EnchantCommand {
                      ItemStack mainHandItem = livingEntity.getMainHandItem();
                      if (!mainHandItem.isEmpty()) {
                          if (enchantment1.canEnchant(mainHandItem)
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch
index 135ee41ef..a3d1fc816 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/commands/GameModeCommand.java b/net/minecraft/server/commands/GameModeCommand.java
+index 9da9ab3b835a8dcc7e1da286be1de88a3f0240fa..4b8c9aaf1d143bc38f52f646e4e73b56013eda8c 100644
 --- a/net/minecraft/server/commands/GameModeCommand.java
 +++ b/net/minecraft/server/commands/GameModeCommand.java
-@@ -53,6 +_,18 @@
+@@ -53,6 +53,18 @@ public class GameModeCommand {
      }
  
      private static int setMode(CommandContext<CommandSourceStack> source, Collection<ServerPlayer> players, GameType gameType) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch
index e7a366475..41303c3e8 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/commands/GiveCommand.java b/net/minecraft/server/commands/GiveCommand.java
+index 4f56cdcf658234b1ca92d38c3df3d31e9be34a15..945d7c0b31fe9ac029e518af92eebd6e8018a69f 100644
 --- a/net/minecraft/server/commands/GiveCommand.java
 +++ b/net/minecraft/server/commands/GiveCommand.java
-@@ -69,6 +_,7 @@
+@@ -69,6 +69,7 @@ public class GiveCommand {
                      i1 -= min;
                      ItemStack itemStack1 = item.createItemStack(min, false);
                      boolean flag = serverPlayer.getInventory().add(itemStack1);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/MinecraftServerGui.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/MinecraftServerGui.java.patch
index 910e0b882..95741d636 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/MinecraftServerGui.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/MinecraftServerGui.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java
+index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b3788623900db41 100644
 --- a/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/net/minecraft/server/gui/MinecraftServerGui.java
-@@ -39,6 +_,11 @@
+@@ -39,6 +39,11 @@ public class MinecraftServerGui extends JComponent {
      private Thread logAppenderThread;
      private final Collection<Runnable> finalizers = Lists.newArrayList();
      final AtomicBoolean isClosing = new AtomicBoolean();
@@ -12,7 +20,7 @@
  
      public static MinecraftServerGui showFrameFor(final DedicatedServer server) {
          try {
-@@ -46,7 +_,7 @@
+@@ -46,7 +51,7 @@ public class MinecraftServerGui extends JComponent {
          } catch (Exception var3) {
          }
  
@@ -21,7 +29,7 @@
          final MinecraftServerGui minecraftServerGui = new MinecraftServerGui(server);
          jFrame.setDefaultCloseOperation(2);
          jFrame.add(minecraftServerGui);
-@@ -54,7 +_,7 @@
+@@ -54,7 +59,7 @@ public class MinecraftServerGui extends JComponent {
          jFrame.setLocationRelativeTo(null);
          jFrame.setVisible(true);
          // Paper start - Improve ServerGUI
@@ -30,7 +38,7 @@
          try {
              jFrame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png"))));
          } catch (java.io.IOException ignore) {
-@@ -64,7 +_,7 @@
+@@ -64,7 +69,7 @@ public class MinecraftServerGui extends JComponent {
              @Override
              public void windowClosing(WindowEvent event) {
                  if (!minecraftServerGui.isClosing.getAndSet(true)) {
@@ -39,7 +47,7 @@
                      server.halt(true);
                      minecraftServerGui.runFinalizers();
                  }
-@@ -112,7 +_,7 @@
+@@ -112,7 +117,7 @@ public class MinecraftServerGui extends JComponent {
  
      private JComponent buildChatPanel() {
          JPanel jPanel = new JPanel(new BorderLayout());
@@ -48,7 +56,7 @@
          JScrollPane jScrollPane = new JScrollPane(jTextArea, 22, 30);
          jTextArea.setEditable(false);
          jTextArea.setFont(MONOSPACED);
-@@ -121,10 +_,43 @@
+@@ -121,10 +126,43 @@ public class MinecraftServerGui extends JComponent {
              String trimmed = jTextField.getText().trim();
              if (!trimmed.isEmpty()) {
                  this.server.handleConsoleInput(trimmed, this.server.createCommandSourceStack());
@@ -92,7 +100,7 @@
          jTextArea.addFocusListener(new FocusAdapter() {
              @Override
              public void focusGained(FocusEvent event) {
-@@ -159,7 +_,7 @@
+@@ -159,7 +197,7 @@ public class MinecraftServerGui extends JComponent {
      }
  
      private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); // CraftBukkit // Paper
@@ -101,7 +109,7 @@
          if (!SwingUtilities.isEventDispatchThread()) {
              SwingUtilities.invokeLater(() -> this.print(textArea, scrollPane, line));
          } else {
-@@ -170,16 +_,29 @@
+@@ -170,10 +208,11 @@ public class MinecraftServerGui extends JComponent {
                  flag = verticalScrollBar.getValue() + verticalScrollBar.getSize().getHeight() + MONOSPACED.getSize() * 4 > verticalScrollBar.getMaximum();
              }
  
@@ -115,10 +123,10 @@
  
              if (flag) {
                  verticalScrollBar.setValue(Integer.MAX_VALUE);
-             }
+@@ -181,6 +220,18 @@ public class MinecraftServerGui extends JComponent {
          }
      }
-+
+ 
 +    // Purpur start - GUI Improvements
 +    public static class CommandHistory extends java.util.LinkedList<String> {
 +        @Override
@@ -130,6 +138,7 @@
 +        }
 +    }
 +    // Purpur end - GUI Improvements
- 
++
      // Paper start - Add onboarding message for initial server start
      private JComponent buildOnboardingPanel() {
+         String onboardingLink = "https://docs.papermc.io/paper/next-steps";
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch
index a082bca56..492afe687 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/gui/StatsComponent.java b/net/minecraft/server/gui/StatsComponent.java
+index 35fd539eb2bfe60ad17ab1e558a01273666acc54..103ff139dae918c991413ce9df61da3e22ee458a 100644
 --- a/net/minecraft/server/gui/StatsComponent.java
 +++ b/net/minecraft/server/gui/StatsComponent.java
-@@ -43,7 +_,7 @@
+@@ -43,7 +43,7 @@ public class StatsComponent extends JComponent {
          }
          this.msgs[0] = "Memory use: " + l / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)";
          this.msgs[1] = "Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms";
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch
index f28a3de6d..d93005827 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
+index cfbf34964288526e93d0a5b212c1b60296c10430..d638821595138ef972163925136eb57207b31719 100644
 --- a/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -348,6 +_,7 @@
+@@ -348,6 +348,7 @@ public class ServerPlayerGameMode {
                  }
                  return false;
              }
@@ -8,7 +16,7 @@
          }
          // CraftBukkit end
  
-@@ -461,6 +_,7 @@
+@@ -461,6 +462,7 @@ public class ServerPlayerGameMode {
      public InteractionHand interactHand;
      public ItemStack interactItemStack;
      public InteractionResult useItemOn(ServerPlayer player, Level level, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
@@ -16,7 +24,7 @@
          BlockPos blockPos = hitResult.getBlockPos();
          BlockState blockState = level.getBlockState(blockPos);
          boolean cancelledBlock = false;
-@@ -503,7 +_,7 @@
+@@ -503,7 +505,7 @@ public class ServerPlayerGameMode {
              boolean flag = !player.getMainHandItem().isEmpty() || !player.getOffhandItem().isEmpty();
              boolean flag1 = player.isSecondaryUseActive() && flag;
              ItemStack itemStack = stack.copy();
@@ -25,7 +33,7 @@
                  InteractionResult interactionResult = blockState.useItemOn(player.getItemInHand(hand), level, player, hand, hitResult);
                  if (interactionResult.consumesAction()) {
                      CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(player, blockPos, itemStack);
-@@ -549,4 +_,18 @@
+@@ -549,4 +551,18 @@ public class ServerPlayerGameMode {
      public void setLevel(ServerLevel serverLevel) {
          this.level = serverLevel;
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch
index ab71931ac..8ad2a3512 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/level/WorldGenRegion.java b/net/minecraft/server/level/WorldGenRegion.java
+index 11fed81a4696ba18440e755c3b8a5ca39ed8a6b1..18367ee56288c4cc60b66555583a8900e7a47daf 100644
 --- a/net/minecraft/server/level/WorldGenRegion.java
 +++ b/net/minecraft/server/level/WorldGenRegion.java
-@@ -314,6 +_,7 @@
+@@ -314,6 +314,7 @@ public class WorldGenRegion implements WorldGenLevel {
              return true;
          } else {
              // Paper start - Buffer OOB setBlock calls
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch
index 5dc2e1705..39200036e 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+index ebf4d4516233c002b33084f1679044b23869d848..20ba45054c243fbb85e50cf0bdf75648730cb0bc 100644
 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -273,7 +_,7 @@
+@@ -273,7 +273,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
                          ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!");
                          ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(string1)); // Spigot
                      } else {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch
index 3fc9d014a..de97b7831 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
+index 465559113071a47e706f77a5b0996597ee986b3d..1b966dc52b067cd9d1fa9f500b692e3f75f1cc90 100644
 --- a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-@@ -37,6 +_,7 @@
+@@ -37,6 +37,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
          } else {
              this.hasRequestedStatus = true;
              // this.connection.send(new ClientboundStatusResponsePacket(this.status)); // Paper
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch
index 998d2f057..872e58918 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/server/players/SleepStatus.java b/net/minecraft/server/players/SleepStatus.java
+index 2a7ae521654ad5c9f392baa5562e64bb71b13097..3a3e6992563236141db687084aeec9684437a7db 100644
 --- a/net/minecraft/server/players/SleepStatus.java
 +++ b/net/minecraft/server/players/SleepStatus.java
-@@ -15,7 +_,7 @@
+@@ -15,7 +15,7 @@ public class SleepStatus {
  
      public boolean areEnoughDeepSleeping(int requiredSleepPercentage, List<ServerPlayer> sleepingPlayers) {
          // CraftBukkit start
@@ -9,7 +17,7 @@
          boolean anyDeepSleep = sleepingPlayers.stream().anyMatch(Player::isSleepingLongEnough);
          return anyDeepSleep && i >= this.sleepersNeeded(requiredSleepPercentage);
          // CraftBukkit end
-@@ -43,7 +_,7 @@
+@@ -43,7 +43,7 @@ public class SleepStatus {
          for (ServerPlayer serverPlayer : players) {
              if (!serverPlayer.isSpectator()) {
                  this.activePlayers++;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch
index a9e87d51d..72394ada2 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/stats/ServerRecipeBook.java b/net/minecraft/stats/ServerRecipeBook.java
+index 736a52c23da313bec6b25a9d1abf08816462403c..2f4f90bf428deb682fe9ec8c1218ae31ebaeea7c 100644
 --- a/net/minecraft/stats/ServerRecipeBook.java
 +++ b/net/minecraft/stats/ServerRecipeBook.java
-@@ -106,6 +_,7 @@
+@@ -106,6 +106,7 @@ public class ServerRecipeBook extends RecipeBook {
      private void loadRecipes(List<ResourceKey<Recipe<?>>> recipes, Consumer<ResourceKey<Recipe<?>>> output, Predicate<ResourceKey<Recipe<?>>> isRecognized) {
          for (ResourceKey<Recipe<?>> resourceKey : recipes) {
              if (!isRecognized.test(resourceKey)) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch
index b8d231182..77e244ab1 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/util/StringUtil.java b/net/minecraft/util/StringUtil.java
+index 77947e6915facee44588943fcd3e5b513de37e77..c3a99fe7b49858bc0ca9a7f800b0db40465f6901 100644
 --- a/net/minecraft/util/StringUtil.java
 +++ b/net/minecraft/util/StringUtil.java
-@@ -87,6 +_,7 @@
+@@ -87,6 +87,7 @@ public class StringUtil {
  
      // Paper start - Username validation
      public static boolean isReasonablePlayerName(final String name) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch
index a70c7a253..fdab2bc20 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/damagesource/CombatRules.java b/net/minecraft/world/damagesource/CombatRules.java
+index d5524038314591a10c9f08a68e2ac91f6079a897..bf82de45bf98e8605a1fdb69803f75f471c4af43 100644
 --- a/net/minecraft/world/damagesource/CombatRules.java
 +++ b/net/minecraft/world/damagesource/CombatRules.java
-@@ -15,7 +_,7 @@
+@@ -15,7 +15,7 @@ public class CombatRules {
  
      public static float getDamageAfterAbsorb(LivingEntity entity, float damage, DamageSource damageSource, float armorValue, float armorToughness) {
          float f = 2.0F + armorToughness / 4.0F;
@@ -9,7 +17,7 @@
          float f2 = f1 / 25.0F;
          ItemStack weaponItem = damageSource.getWeaponItem();
          float f3;
-@@ -30,7 +_,7 @@
+@@ -30,7 +30,7 @@ public class CombatRules {
      }
  
      public static float getDamageAfterMagicAbsorb(float damage, float enchantModifiers) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch
index 2bc01f621..4923cf813 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/damagesource/CombatTracker.java b/net/minecraft/world/damagesource/CombatTracker.java
+index 4cec197634fac341cca1ed108f1ecb0561f72461..aa6213ca382e4901363317df1e30332c5166f271 100644
 --- a/net/minecraft/world/damagesource/CombatTracker.java
 +++ b/net/minecraft/world/damagesource/CombatTracker.java
-@@ -64,7 +_,7 @@
+@@ -64,7 +64,7 @@ public class CombatTracker {
  
      private Component getMessageForAssistedFall(Entity entity, Component entityDisplayName, String hasWeaponTranslationKey, String noWeaponTranslationKey) {
          ItemStack itemStack = entity instanceof LivingEntity livingEntity ? livingEntity.getMainHandItem() : ItemStack.EMPTY;
@@ -9,7 +17,7 @@
              ? Component.translatable(hasWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName, itemStack.getDisplayName())
              : Component.translatable(noWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName);
      }
-@@ -108,6 +_,15 @@
+@@ -108,6 +108,15 @@ public class CombatTracker {
                  Component component = ComponentUtils.wrapInSquareBrackets(Component.translatable(string + ".link")).withStyle(INTENTIONAL_GAME_DESIGN_STYLE);
                  return Component.translatable(string + ".message", this.mob.getDisplayName(), component);
              } else {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch
index 581f8d027..39e8984d1 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java
+index bb021fc9de91f8c4f79e6a753d57fa157efbbda7..5fa92eef9c6b88cf96d3fe427e4d4f16953e8094 100644
 --- a/net/minecraft/world/damagesource/DamageSource.java
 +++ b/net/minecraft/world/damagesource/DamageSource.java
-@@ -30,6 +_,8 @@
+@@ -30,6 +30,8 @@ public class DamageSource {
      @Nullable
      private org.bukkit.block.BlockState fromBlockSnapshot; // Captured block snapshot when the eventBlockDamager is not relevant (e.g. for bad respawn point explosions the block is already removed)
      private boolean critical; // Supports arrows and sweeping damage
@@ -9,7 +17,7 @@
  
      public DamageSource knownCause(final org.bukkit.event.entity.EntityDamageEvent.DamageCause cause) {
          final DamageSource damageSource = this.copy();
-@@ -42,6 +_,30 @@
+@@ -42,6 +44,30 @@ public class DamageSource {
          return this.knownCause;
      }
  
@@ -40,7 +48,7 @@
      @Nullable
      public Entity eventEntityDamager() {
          return this.eventEntityDamager;
-@@ -103,6 +_,8 @@
+@@ -103,6 +129,8 @@ public class DamageSource {
          damageSource.eventBlockDamager = this.eventBlockDamager;
          damageSource.fromBlockSnapshot = this.fromBlockSnapshot;
          damageSource.critical = this.critical;
@@ -49,7 +57,7 @@
          return damageSource;
      }
      // CraftBukkit end
-@@ -169,11 +_,20 @@
+@@ -169,12 +197,21 @@ public class DamageSource {
          } else {
              Component component = this.causingEntity == null ? this.directEntity.getDisplayName() : this.causingEntity.getDisplayName();
              ItemStack itemStack = this.causingEntity instanceof LivingEntity livingEntity1 ? livingEntity1.getMainHandItem() : ItemStack.EMPTY;
@@ -59,7 +67,7 @@
                  : Component.translatable(string, livingEntity.getDisplayName(), component);
          }
      }
-+
+ 
 +    // Purpur start - Component related conveniences
 +    public Component getLocalizedDeathMessage(String str, LivingEntity entity) {
 +        net.kyori.adventure.text.Component name = io.papermc.paper.adventure.PaperAdventure.asAdventure(entity.getDisplayName());
@@ -68,6 +76,7 @@
 +        return io.papermc.paper.adventure.PaperAdventure.asVanilla(component);
 +    }
 +    // Purpur end - Component related conveniences
- 
++
      public String getMsgId() {
          return this.type().msgId();
+     }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch
index 29006dbaf..340fc92bc 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/damagesource/DamageSources.java b/net/minecraft/world/damagesource/DamageSources.java
+index cc206ecff2d95f0398ca424c178a336ad80cc396..7afad362801082e5f2e3aceda864ad2a7d4e5ebb 100644
 --- a/net/minecraft/world/damagesource/DamageSources.java
 +++ b/net/minecraft/world/damagesource/DamageSources.java
-@@ -42,6 +_,8 @@
+@@ -42,6 +42,8 @@ public class DamageSources {
      private final DamageSource stalagmite;
      private final DamageSource outsideBorder;
      private final DamageSource genericKill;
@@ -9,7 +17,7 @@
  
      public DamageSources(RegistryAccess registry) {
          this.damageTypes = registry.lookupOrThrow(Registries.DAMAGE_TYPE);
-@@ -70,6 +_,8 @@
+@@ -70,6 +72,8 @@ public class DamageSources {
          this.stalagmite = this.source(DamageTypes.STALAGMITE);
          this.outsideBorder = this.source(DamageTypes.OUTSIDE_BORDER);
          this.genericKill = this.source(DamageTypes.GENERIC_KILL);
@@ -18,11 +26,10 @@
      }
  
      private DamageSource source(ResourceKey<DamageType> damageTypeKey) {
-@@ -83,6 +_,18 @@
-     private DamageSource source(ResourceKey<DamageType> damageTypeKey, @Nullable Entity causingEntity, @Nullable Entity directEntity) {
+@@ -84,6 +88,18 @@ public class DamageSources {
          return new DamageSource(this.damageTypes.getOrThrow(damageTypeKey), causingEntity, directEntity);
      }
-+
+ 
 +    // Purpur start - Dont run with scissor
 +    public DamageSource scissors() {
 +        return this.scissors;
@@ -34,6 +41,7 @@
 +        return this.stonecutter;
 +    }
 +    // Purpur end - Stonecutter damage
- 
++
      public DamageSource inFire() {
          return this.inFire;
+     }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch
index ea284de7b..07ad40bb5 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/effect/HungerMobEffect.java b/net/minecraft/world/effect/HungerMobEffect.java
+index 0890694ae96b6cd60079c34066e7a6e288f038e8..6c0e6bd2a171edc57dec71af178764454de73313 100644
 --- a/net/minecraft/world/effect/HungerMobEffect.java
 +++ b/net/minecraft/world/effect/HungerMobEffect.java
-@@ -12,7 +_,7 @@
+@@ -12,7 +12,7 @@ class HungerMobEffect extends MobEffect {
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
          if (entity instanceof Player player) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch
index 0e8d7e3f7..a452fe5a8 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/effect/PoisonMobEffect.java b/net/minecraft/world/effect/PoisonMobEffect.java
+index 75327fd96858fd508ea63a6983e5cbc655a8800f..73cfc61ac3f8e33e6b9f4fd08a292266c0adb535 100644
 --- a/net/minecraft/world/effect/PoisonMobEffect.java
 +++ b/net/minecraft/world/effect/PoisonMobEffect.java
-@@ -12,8 +_,8 @@
+@@ -12,8 +12,8 @@ public class PoisonMobEffect extends MobEffect {
  
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch
index f19f319af..7540118d0 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/effect/RegenerationMobEffect.java b/net/minecraft/world/effect/RegenerationMobEffect.java
+index 76cffa4d4d18d6c04749d941dbdf5eb60aed4095..81481267a1577721dcc405f39a4c350bd59ac9a2 100644
 --- a/net/minecraft/world/effect/RegenerationMobEffect.java
 +++ b/net/minecraft/world/effect/RegenerationMobEffect.java
-@@ -11,7 +_,7 @@
+@@ -11,7 +11,7 @@ class RegenerationMobEffect extends MobEffect {
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
          if (entity.getHealth() < entity.getMaxHealth()) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch
index f2d21d380..34e9a4a1a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/effect/SaturationMobEffect.java b/net/minecraft/world/effect/SaturationMobEffect.java
+index c192165910f6b139df6f604d0bce989061efa9cb..622c23f4570d07de8bee9623bf900aabb3331ded 100644
 --- a/net/minecraft/world/effect/SaturationMobEffect.java
 +++ b/net/minecraft/world/effect/SaturationMobEffect.java
-@@ -16,7 +_,8 @@
+@@ -16,7 +16,8 @@ class SaturationMobEffect extends InstantenousMobEffect {
              int oldFoodLevel = player.getFoodData().foodLevel;
              org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, amplifier + 1 + oldFoodLevel);
              if (!event.isCancelled()) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch
index 767637659..2e631656d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/effect/WitherMobEffect.java b/net/minecraft/world/effect/WitherMobEffect.java
+index 1fc9e1ad541c46124183a401b2a7d99aea69cecf..881271f0bc77a8a8a7d31daad9a8188bebaca67b 100644
 --- a/net/minecraft/world/effect/WitherMobEffect.java
 +++ b/net/minecraft/world/effect/WitherMobEffect.java
-@@ -12,7 +_,7 @@
+@@ -12,7 +12,7 @@ public class WitherMobEffect extends MobEffect {
  
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch
index ff1e039a1..63e22f75f 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/EntitySelector.java b/net/minecraft/world/entity/EntitySelector.java
+index 15daba9062d54a5bdf335c3645a3227ccb5a8e06..1842cbe25cc0f9be937caf0a78e915bd3d6ea1e5 100644
 --- a/net/minecraft/world/entity/EntitySelector.java
 +++ b/net/minecraft/world/entity/EntitySelector.java
-@@ -28,6 +_,8 @@
+@@ -28,6 +28,8 @@ public final class EntitySelector {
          return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks;
      };
      // Paper end - Ability to control player's insomnia and phantoms
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch
index 5fc5f32fc..1cfdf2301 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
+index 96e1f8f40a0af4350155f192ac2126b523c9f0f5..9950fccc0a708e701b81fcabc9e8f370e6d3a19d 100644
 --- a/net/minecraft/world/entity/EntityType.java
 +++ b/net/minecraft/world/entity/EntityType.java
-@@ -1105,6 +_,16 @@
+@@ -1105,6 +1105,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return register(vanillaEntityId(key), builder);
      }
  
@@ -17,7 +25,7 @@
      public static ResourceLocation getKey(EntityType<?> entityType) {
          return BuiltInRegistries.ENTITY_TYPE.getKey(entityType);
      }
-@@ -1335,6 +_,16 @@
+@@ -1335,6 +1345,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return this.category;
      }
  
@@ -34,7 +42,7 @@
      public String getDescriptionId() {
          return this.descriptionId;
      }
-@@ -1394,7 +_,11 @@
+@@ -1394,7 +1414,11 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
                  entity.load(input);
              },
              // Paper end - Don't fire sync event during generation
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch
index 46ae0daeb..becc82013 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java
+index f8d94181e97630d9d551553e3a504d7e3ae36f96..66ae0b340c7e9ebccfeaee786577e27916ace38c 100644
 --- a/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/net/minecraft/world/entity/ExperienceOrb.java
-@@ -358,7 +_,7 @@
+@@ -358,7 +358,7 @@ public class ExperienceOrb extends Entity {
      public void playerTouch(Player entity) {
          if (entity instanceof ServerPlayer serverPlayer) {
              if (entity.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(serverPlayer.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent
@@ -9,7 +17,7 @@
                  entity.take(this, 1);
                  int i = this.repairPlayerItems(serverPlayer, this.getValue());
                  if (i > 0) {
-@@ -374,7 +_,7 @@
+@@ -374,7 +374,7 @@ public class ExperienceOrb extends Entity {
      }
  
      private int repairPlayerItems(ServerPlayer player, int value) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch
index 384908afc..df9d35680 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/GlowSquid.java b/net/minecraft/world/entity/GlowSquid.java
+index aab9adb8313c4b18279c7fd7500ef04bda09c6c1..f0c452ddc4b299a930de261722cc41a89aa78eeb 100644
 --- a/net/minecraft/world/entity/GlowSquid.java
 +++ b/net/minecraft/world/entity/GlowSquid.java
-@@ -27,6 +_,13 @@
+@@ -27,6 +27,13 @@ public class GlowSquid extends Squid {
          super(entityType, level);
      }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch
index 4cd99d012..62fd5eaa5 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
+index a87accd5fe14102e7a2938f991a8ed0b9accd1bb..c7515f7f24e39d6931dcf18574cb47d754983903 100644
 --- a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
 +++ b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
-@@ -29,6 +_,7 @@
+@@ -29,6 +29,7 @@ public class RangedAttribute extends Attribute {
  
      @Override
      public double sanitizeValue(double value) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch
index c457ae742..363ed0c8d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
+index 57befff1f0675e889304a6258258384d8de02c87..b0ca555cc3b565a8be8d01fe10b139ed27a2a2c3 100644
 --- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-@@ -86,7 +_,7 @@
+@@ -86,7 +86,7 @@ public class AcquirePoi {
                              };
                              // Paper start - optimise POI access
                              final java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch
index f90e63ebd..5ce650e75 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
+index 296ecffbbce931b42c67ea523373a61cea23acf4..b2eec24be3635f2c19da9b147211fe6cb454c780 100644
 --- a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
 +++ b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
-@@ -55,7 +_,7 @@
+@@ -55,7 +55,7 @@ public class InteractWithDoor {
                              Node nextNode = path.getNextNode();
                              BlockPos blockPos = previousNode.asBlockPos();
                              BlockState blockState = level.getBlockState(blockPos);
@@ -9,7 +17,7 @@
                                  DoorBlock doorBlock = (DoorBlock)blockState.getBlock();
                                  if (!doorBlock.isOpen(blockState)) {
                                      // CraftBukkit start - entities opening doors
-@@ -72,7 +_,7 @@
+@@ -72,7 +72,7 @@ public class InteractWithDoor {
  
                              BlockPos blockPos1 = nextNode.asBlockPos();
                              BlockState blockState1 = level.getBlockState(blockPos1);
@@ -18,7 +26,7 @@
                                  DoorBlock doorBlock1 = (DoorBlock)blockState1.getBlock();
                                  if (!doorBlock1.isOpen(blockState1)) {
                                      // CraftBukkit start - entities opening doors
-@@ -118,7 +_,7 @@
+@@ -118,7 +118,7 @@ public class InteractWithDoor {
                      iterator.remove();
                  } else {
                      BlockState blockState = level.getBlockState(blockPos);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch
index 2bbc2776e..cf000baab 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java b/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
+index 400e6d49144b3e5803901938dcd2ac4e52e9c131..45c45afeffcfba3558bdf46cbe39ff60004ffc01 100644
 --- a/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
 +++ b/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
-@@ -46,6 +_,7 @@
+@@ -46,6 +46,7 @@ public class ShowTradesToPlayer extends Behavior<Villager> {
  
      @Override
      public boolean canStillUse(ServerLevel level, Villager entity, long gameTime) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch
index 6fbb7bf98..38fb9266e 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
+index 6eaf0bd944349cd0c6084462ac385fa2caafe933..be59d0c27a83b329ec3f97c029cfb9c114e22472 100644
 --- a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-@@ -22,6 +_,7 @@
+@@ -22,6 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
  
      @Override
      public boolean canUse() {
@@ -8,7 +16,7 @@
          if (!this.llama.isLeashed() && !this.llama.inCaravan()) {
              List<Entity> entities = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity1 -> {
                  EntityType<?> type = entity1.getType();
-@@ -71,6 +_,7 @@
+@@ -71,6 +72,7 @@ public class LlamaFollowCaravanGoal extends Goal {
  
      @Override
      public boolean canContinueToUse() {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch
index f623c03a9..8c393c6a9 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java b/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
+index 722f378bb3726200b6fe88948bf1e1d3514a7b5c..e337e22c2cf82b0c1cab3fe0a9ff894c0c718716 100644
 --- a/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
-@@ -116,9 +_,9 @@
+@@ -116,9 +116,9 @@ public class RangedBowAttackGoal<T extends Monster & RangedAttackMob> extends Go
                  }
  
                  this.mob.lookAt(target, 30.0F, 30.0F);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch
index cb39bb4e0..301465055 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java b/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
+index 878d7813b3f2f52bef336c6d855d738bc2f83491..d0f94f065d2ecf6ca6b47ac49422ffa656a18f55 100644
 --- a/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
-@@ -58,7 +_,7 @@
+@@ -58,7 +58,7 @@ public class RunAroundLikeCrazyGoal extends Goal {
              if (firstPassenger instanceof Player player) {
                  int temper = this.horse.getTemper();
                  int maxTemper = this.horse.getMaxTemper();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch
index b072c14f4..05776a70a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/goal/SwellGoal.java b/net/minecraft/world/entity/ai/goal/SwellGoal.java
+index 243a552f6f0c8c2bd25c0209c95e3bca08734711..38fd0196a0f5a90e39fa4eb8592f89bf6b88ccf5 100644
 --- a/net/minecraft/world/entity/ai/goal/SwellGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/SwellGoal.java
-@@ -55,6 +_,14 @@
+@@ -55,6 +55,14 @@ public class SwellGoal extends Goal {
              this.creeper.setSwellDir(-1);
          } else {
              this.creeper.setSwellDir(1);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch
index 7e2366a32..a251b0edc 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
+index 066faa704338c573472381e1ebd063e0d52aaaa4..1f96fd5085bacb4c584576c7cb9f51e7898e9b03 100644
 --- a/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
 +++ b/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
-@@ -56,7 +_,7 @@
+@@ -56,7 +56,7 @@ public class NearestBedSensor extends Sensor<Mob> {
              // Paper start - optimise POI access
              java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();
              // don't ask me why it's unbounded. ask mojang.
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch
index df5fd519b..1c6a59b57 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
+index 2f8920d8ee765d057a22d76f24f7d7dc1b0b17ca..6f0fcaeaba2fec2ad944d63550f0c3e29bd9133c 100644
 --- a/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 +++ b/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-@@ -64,6 +_,10 @@
+@@ -64,6 +64,10 @@ public class TargetingConditions {
              return false;
          } else if (this.selector != null && !this.selector.test(target, level)) {
              return false;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch
index d6070948c..959b3c8cd 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java
+index 912b099a51269f92f250c7d6094ad41817749f93..c1c9d056f5c78d26c777728c09b2481f9ccd1c3b 100644
 --- a/net/minecraft/world/entity/ambient/Bat.java
 +++ b/net/minecraft/world/entity/ambient/Bat.java
-@@ -233,7 +_,7 @@
+@@ -233,7 +233,7 @@ public class Bat extends AmbientCreature {
          } else {
              int maxLocalRawBrightness = level.getMaxLocalRawBrightness(pos);
              int i = 4;
@@ -9,7 +17,7 @@
                  i = 7;
              } else if (randomSource.nextBoolean()) {
                  return false;
-@@ -245,6 +_,11 @@
+@@ -245,6 +245,11 @@ public class Bat extends AmbientCreature {
          }
      }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch
index 3c0826a05..1159b0003 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/AbstractCow.java b/net/minecraft/world/entity/animal/AbstractCow.java
+index dd8ea03ba823996a5c97562e357650ab34d0e32e..4e81bc7215c845b316bcd46ce29f49af7f986088 100644
 --- a/net/minecraft/world/entity/animal/AbstractCow.java
 +++ b/net/minecraft/world/entity/animal/AbstractCow.java
-@@ -39,7 +_,7 @@
+@@ -39,7 +39,7 @@ public abstract class AbstractCow extends Animal {
          this.goalSelector.addGoal(0, new FloatGoal(this));
          this.goalSelector.addGoal(1, new PanicGoal(this, 2.0));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0));
@@ -9,7 +17,7 @@
          this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25));
          this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
-@@ -95,6 +_,10 @@
+@@ -95,6 +95,10 @@ public abstract class AbstractCow extends Animal {
              ItemStack itemStack = ItemUtils.createFilledResult(itemInHand, player, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit
              player.setItemInHand(hand, itemStack);
              return InteractionResult.SUCCESS;
@@ -20,7 +28,7 @@
          } else {
              return super.mobInteract(player, hand);
          }
-@@ -104,4 +_,67 @@
+@@ -104,4 +108,67 @@ public abstract class AbstractCow extends Animal {
      public EntityDimensions getDefaultDimensions(Pose pose) {
          return this.isBaby() ? BABY_DIMENSIONS : super.getDefaultDimensions(pose);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch
index e8f8ff304..9c422e7de 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Animal.java b/net/minecraft/world/entity/animal/Animal.java
+index cdf44c2586db396f1afdcbae4174b8b4fb00f48e..235f6514328338d28c2bf967bcd06f1413f12c65 100644
 --- a/net/minecraft/world/entity/animal/Animal.java
 +++ b/net/minecraft/world/entity/animal/Animal.java
-@@ -143,7 +_,7 @@
+@@ -143,7 +143,7 @@ public abstract class Animal extends AgeableMob {
          ItemStack itemInHand = player.getItemInHand(hand);
          if (this.isFood(itemInHand)) {
              int age = this.getAge();
@@ -9,7 +17,7 @@
                  final ItemStack breedCopy = itemInHand.copy(); // Paper - Fix EntityBreedEvent copying
                  this.usePlayerItem(player, hand, itemInHand);
                  this.setInLove(serverPlayer, breedCopy); // Paper - Fix EntityBreedEvent copying
-@@ -235,10 +_,20 @@
+@@ -235,10 +235,20 @@ public abstract class Animal extends AgeableMob {
      public void spawnChildFromBreeding(ServerLevel level, Animal mate) {
          AgeableMob breedOffspring = this.getBreedOffspring(level, mate);
          if (breedOffspring != null) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch
index b8bee71f9..d58b4b91b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
+index 7d20de1741e5e9219dea84fe5692f31c05fa82a2..5b9d8c85f91396287b0deb4deac30e2c136cc461 100644
 --- a/net/minecraft/world/entity/animal/Cat.java
 +++ b/net/minecraft/world/entity/animal/Cat.java
-@@ -354,6 +_,14 @@
+@@ -354,6 +354,14 @@ public class Cat extends TamableAnimal {
          return this.isTame() && otherAnimal instanceof Cat cat && cat.isTame() && super.canMate(otherAnimal);
      }
  
@@ -15,7 +23,7 @@
      @Nullable
      @Override
      public SpawnGroupData finalizeSpawn(
-@@ -452,7 +_,7 @@
+@@ -452,7 +460,7 @@ public class Cat extends TamableAnimal {
      }
  
      private void tryToTame(Player player) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch
index 0e09ac94d..404732a4e 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java
+index 4bb273b11dbfbc6557c6771f79aa63f5f69d03cf..f4a6f17bb158146e7287ab46930cd57c0ffb9454 100644
 --- a/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/net/minecraft/world/entity/animal/Dolphin.java
-@@ -74,6 +_,7 @@
+@@ -74,6 +74,7 @@ public class Dolphin extends AgeableWaterCreature {
      private static final boolean DEFAULT_GOT_FISH = false;
      @Nullable
      public BlockPos treasurePos;
@@ -8,7 +16,7 @@
  
      public Dolphin(EntityType<? extends Dolphin> entityType, Level level) {
          super(entityType, level);
-@@ -90,6 +_,7 @@
+@@ -90,6 +91,7 @@ public class Dolphin extends AgeableWaterCreature {
          this.setAirSupply(this.getMaxAirSupply());
          this.setXRot(0.0F);
          SpawnGroupData spawnGroupData1 = Objects.requireNonNullElseGet(spawnGroupData, () -> new AgeableMob.AgeableMobGroupData(0.1F));
@@ -16,7 +24,7 @@
          return super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData1);
      }
  
-@@ -156,17 +_,19 @@
+@@ -156,17 +158,19 @@ public class Dolphin extends AgeableWaterCreature {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new BreathAirGoal(this));
          this.goalSelector.addGoal(0, new TryFindWaterGoal(this));
@@ -37,7 +45,7 @@
      }
  
      public static AttributeSupplier.Builder createAttributes() {
-@@ -399,6 +_,7 @@
+@@ -399,6 +403,7 @@ public class Dolphin extends AgeableWaterCreature {
  
          @Override
          public boolean canUse() {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch
index 134e6108c..f4eb91f83 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java
+index 517c546cfc8eca2191df57289e6a22ac64fc867c..354c7a41407fc6518965d09bfe3089676b6da794 100644
 --- a/net/minecraft/world/entity/animal/Fox.java
 +++ b/net/minecraft/world/entity/animal/Fox.java
-@@ -346,6 +_,11 @@
+@@ -346,6 +346,11 @@ public class Fox extends Animal {
      }
  
      private void setTargetGoals() {
@@ -12,7 +20,7 @@
          if (this.getVariant() == Fox.Variant.RED) {
              this.targetSelector.addGoal(4, this.landTargetGoal);
              this.targetSelector.addGoal(4, this.turtleEggTargetGoal);
-@@ -373,6 +_,7 @@
+@@ -373,6 +378,7 @@ public class Fox extends Animal {
  
      public void setVariant(Fox.Variant variant) {
          this.entityData.set(DATA_TYPE_ID, variant.getId());
@@ -20,11 +28,10 @@
      }
  
      @Nullable
-@@ -702,6 +_,29 @@
-         return slot == EquipmentSlot.MAINHAND;
+@@ -703,6 +709,29 @@ public class Fox extends Animal {
      }
      // Paper end
-+
+ 
 +    // Purpur start - Tulips change fox type
 +    @Override
 +    public net.minecraft.world.InteractionResult mobInteract(Player player, net.minecraft.world.InteractionHand hand) {
@@ -47,6 +54,7 @@
 +        return super.mobInteract(player, hand);
 +    }
 +    // Purpur end - Tulips change fox type
- 
++
      @Override
      // Paper start - Cancellable death event
+     protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(ServerLevel level, DamageSource damageSource) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch
index 322e86a71..5b91c3343 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java
+index db309a1261778cc65da9b4bf5a962a372b83bba6..25e0438e1a98dc5f6aaabba8af2295cec871d6f1 100644
 --- a/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/net/minecraft/world/entity/animal/IronGolem.java
-@@ -58,13 +_,26 @@
+@@ -58,13 +58,26 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      private int remainingPersistentAngerTime;
      @Nullable
      private UUID persistentAngerTarget;
@@ -27,7 +35,7 @@
          this.goalSelector.addGoal(1, new MeleeAttackGoal(this, 1.0, true));
          this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9, 32.0F));
          this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6, false));
-@@ -142,6 +_,7 @@
+@@ -142,6 +155,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.putBoolean("PlayerCreated", this.isPlayerCreated());
@@ -35,7 +43,7 @@
          this.addPersistentAngerSaveData(output);
      }
  
-@@ -149,6 +_,7 @@
+@@ -149,6 +163,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      protected void readAdditionalSaveData(ValueInput input) {
          super.readAdditionalSaveData(input);
          this.setPlayerCreated(input.getBooleanOr("PlayerCreated", false));
@@ -43,7 +51,7 @@
          this.readPersistentAngerSaveData(this.level(), input);
      }
  
-@@ -268,6 +_,7 @@
+@@ -268,6 +283,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
                  float f = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
                  this.playSound(SoundEvents.IRON_GOLEM_REPAIR, 1.0F, f);
                  itemInHand.consume(1, player);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch
index 0666bfab4..6090de2e8 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java
+index 1f82848c97c5b52d6c4225b07a895f00d20c7d6c..32f3d5f66fb61074a2f9db751c0b3e16af9cf3ce 100644
 --- a/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -199,6 +_,13 @@
+@@ -199,6 +199,13 @@ public class MushroomCow extends AbstractCow implements Shearable {
          level.playSound(null, this, SoundEvents.MOOSHROOM_SHEAR, soundSource, 1.0F, 1.0F);
          this.convertTo(EntityType.COW, ConversionParams.single(this, false, false), cow -> {
              level.sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(0.5), this.getZ(), 1, 0.0, 0.0, 0.0, 0.0);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch
index 48b3a30ef..4653ac5ca 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java
+index e8b184f2e1a98e565a50ce6ae6cab248d5a6e89b..a304a09eb20b84033ea9b84cf577749fe842fc57 100644
 --- a/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/net/minecraft/world/entity/animal/Ocelot.java
-@@ -234,7 +_,7 @@
+@@ -234,7 +234,7 @@ public class Ocelot extends Animal {
      public boolean checkSpawnObstruction(LevelReader level) {
          if (level.isUnobstructed(this) && !level.containsAnyLiquid(this.getBoundingBox())) {
              BlockPos blockPos = this.blockPosition();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch
index 3758d8143..8ef58ddde 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
+index 155a51233895955d01c2ee73416e2daefc4dfd0f..858913db98c6f46867e5f5d3d1231e7f94b669ab 100644
 --- a/net/minecraft/world/entity/animal/Pig.java
 +++ b/net/minecraft/world/entity/animal/Pig.java
-@@ -142,6 +_,19 @@
+@@ -142,6 +142,19 @@ public class Pig extends Animal implements ItemSteerable {
      @Override
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          boolean isFood = this.isFood(player.getItemInHand(hand));
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch
index 869d2910f..33cf6c63d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java
+index d727e8e93e466b9bb91cbb43b9c1bbbccc56d486..0cbe162c952fe3cba5c33284d766aea514d6a40b 100644
 --- a/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/net/minecraft/world/entity/animal/PolarBear.java
-@@ -65,6 +_,29 @@
+@@ -65,6 +65,29 @@ public class PolarBear extends Animal implements NeutralMob {
          super(entityType, level);
      }
  
@@ -30,7 +38,7 @@
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel level, AgeableMob otherParent) {
-@@ -73,7 +_,7 @@
+@@ -73,7 +96,7 @@ public class PolarBear extends Animal implements NeutralMob {
  
      @Override
      public boolean isFood(ItemStack stack) {
@@ -39,7 +47,7 @@
      }
  
      @Override
-@@ -82,6 +_,12 @@
+@@ -82,6 +105,12 @@ public class PolarBear extends Animal implements NeutralMob {
          this.goalSelector.addGoal(0, new FloatGoal(this));
          this.goalSelector.addGoal(1, new PolarBear.PolarBearMeleeAttackGoal());
          this.goalSelector.addGoal(1, new PanicGoal(this, 2.0, mob -> mob.isBaby() ? DamageTypeTags.PANIC_CAUSES : DamageTypeTags.PANIC_ENVIRONMENTAL_CAUSES));
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch
index ea0874b61..228235742 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java
+index ac99590dad689f2cfffb9b9e2465f6a252d41e9c..880cb3bdbd389a798c202c4dd572bf2b74bc0847 100644
 --- a/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/net/minecraft/world/entity/animal/Rabbit.java
-@@ -404,10 +_,23 @@
+@@ -404,10 +404,23 @@ public class Rabbit extends Animal {
          }
  
          this.setVariant(randomRabbitVariant);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch
index a3cb9e147..13710bb56 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java
+index 1b3a020e35fb2f9a28be718415c51fde5b52d399..1a7c14f9307629386af0a62b3e19545728fa3a8d 100644
 --- a/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -46,15 +_,27 @@
+@@ -46,15 +46,27 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      private static final EntityDataAccessor<Byte> DATA_PUMPKIN_ID = SynchedEntityData.defineId(SnowGolem.class, EntityDataSerializers.BYTE);
      private static final byte PUMPKIN_FLAG = 16;
      private static final boolean DEFAULT_PUMPKIN = true;
@@ -30,7 +38,7 @@
          this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Mob.class, 10, true, false, (entity, level) -> entity instanceof Enemy));
-@@ -74,12 +_,14 @@
+@@ -74,12 +86,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.putBoolean("Pumpkin", this.hasPumpkin());
@@ -45,7 +53,7 @@
      }
  
      @Override
-@@ -153,6 +_,14 @@
+@@ -153,6 +167,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
              }
  
              return InteractionResult.SUCCESS;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch
index 83c0aed86..654f95073 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
+index 58e1bc90cbc32669fa6c66d214119f0c459ff38c..2e51e64991d326fc055520b6fefc76e80f7c2d97 100644
 --- a/net/minecraft/world/entity/animal/Squid.java
 +++ b/net/minecraft/world/entity/animal/Squid.java
-@@ -46,10 +_,29 @@
+@@ -46,10 +46,29 @@ public class Squid extends AgeableWaterCreature {
  
      public Squid(EntityType<? extends Squid> entityType, Level level) {
          super(entityType, level);
@@ -31,7 +39,7 @@
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
-@@ -127,6 +_,7 @@
+@@ -127,6 +146,7 @@ public class Squid extends AgeableWaterCreature {
          }
  
          if (this.isInWater()) {
@@ -39,7 +47,7 @@
              if (this.tentacleMovement < (float) Math.PI) {
                  float f = this.tentacleMovement / (float) Math.PI;
                  this.tentacleAngle = Mth.sin(f * f * (float) Math.PI) * (float) Math.PI * 0.25F;
-@@ -308,7 +_,7 @@
+@@ -308,7 +328,7 @@ public class Squid extends AgeableWaterCreature {
              int noActionTime = this.squid.getNoActionTime();
              if (noActionTime > 100) {
                  this.squid.movementVector = Vec3.ZERO;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch
index 3552d2bfc..a71d0a6a6 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/WaterAnimal.java b/net/minecraft/world/entity/animal/WaterAnimal.java
+index 2b5e091b6ebe17e30d8d0e73999e19eed49e9a9f..6ff9ca735eba1c3376f3bc4916d5ab76af782de1 100644
 --- a/net/minecraft/world/entity/animal/WaterAnimal.java
 +++ b/net/minecraft/world/entity/animal/WaterAnimal.java
-@@ -76,8 +_,7 @@
+@@ -76,8 +76,7 @@ public abstract class WaterAnimal extends PathfinderMob {
          seaLevel = level.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.maximum.or(seaLevel);
          i = level.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.minimum.or(i);
          // Paper end - Make water animal spawn height configurable
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch
index 71d967ea2..8770df9cf 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
+index 75af1b92a0a60cffa3317d83bd599a3d4d26f93c..d5e5ea2a20739b81742b1a5323d19f2d01baec25 100644
 --- a/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -396,6 +_,7 @@
+@@ -396,6 +396,7 @@ public class Goat extends Animal {
  
      // Paper start - Goat ram API
      public void ram(net.minecraft.world.entity.LivingEntity entity) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch
index 3a614d8c8..d8348fdde 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
+index 1e2b629641e5fa1040307461dbbf03ad2d75ba00..5e3382351b1b5728750534f64babc85c4da3ac54 100644
 --- a/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -78,6 +_,7 @@
+@@ -78,6 +78,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
      private Llama caravanHead;
      @Nullable
      public Llama caravanTail; // Paper
@@ -8,7 +16,7 @@
  
      public Llama(EntityType<? extends Llama> entityType, Level level) {
          super(entityType, level);
-@@ -112,6 +_,7 @@
+@@ -112,6 +113,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
          super.addAdditionalSaveData(output);
          output.store("Variant", Llama.Variant.LEGACY_CODEC, this.getVariant());
          output.putInt("Strength", this.getStrength());
@@ -16,7 +24,7 @@
      }
  
      @Override
-@@ -119,6 +_,7 @@
+@@ -119,6 +121,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
          this.setStrength(input.getIntOr("Strength", 0));
          super.readAdditionalSaveData(input);
          this.setVariant(input.read("Variant", Llama.Variant.LEGACY_CODEC).orElse(Llama.Variant.DEFAULT));
@@ -24,7 +32,7 @@
      }
  
      @Override
-@@ -400,6 +_,7 @@
+@@ -400,6 +403,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
  
      public void leaveCaravan() {
          if (this.caravanHead != null) {
@@ -32,7 +40,7 @@
              this.caravanHead.caravanTail = null;
          }
  
-@@ -407,6 +_,7 @@
+@@ -407,6 +411,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
      }
  
      public void joinCaravan(Llama caravanHead) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch
index a696b0e4b..147e242f6 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java
+index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fbe81c9bee 100644
 --- a/net/minecraft/world/entity/animal/wolf/Wolf.java
 +++ b/net/minecraft/world/entity/animal/wolf/Wolf.java
-@@ -99,6 +_,37 @@
+@@ -99,6 +99,37 @@ public class Wolf extends TamableAnimal implements NeutralMob {
          EntityType<?> type = entity.getType();
          return type == EntityType.SHEEP || type == EntityType.RABBIT || type == EntityType.FOX;
      };
@@ -38,7 +46,7 @@
      private static final float START_HEALTH = 8.0F;
      private static final float TAME_HEALTH = 40.0F;
      private static final float ARMOR_REPAIR_UNIT = 0.125F;
-@@ -121,12 +_,47 @@
+@@ -121,12 +152,47 @@ public class Wolf extends TamableAnimal implements NeutralMob {
          this.setPathfindingMalus(PathType.DANGER_POWDER_SNOW, -1.0F);
      }
  
@@ -86,7 +94,7 @@
          this.goalSelector.addGoal(4, new LeapAtTargetGoal(this, 0.4F));
          this.goalSelector.addGoal(5, new MeleeAttackGoal(this, 1.0, true));
          this.goalSelector.addGoal(6, new FollowOwnerGoal(this, 1.0, 10.0F, 2.0F));
-@@ -139,7 +_,7 @@
+@@ -139,7 +205,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
          this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
          this.targetSelector.addGoal(3, new HurtByTargetGoal(this).setAlertOthers());
          this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
@@ -95,7 +103,7 @@
          this.targetSelector.addGoal(6, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR));
          this.targetSelector.addGoal(7, new NearestAttackableTargetGoal<>(this, AbstractSkeleton.class, false));
          this.targetSelector.addGoal(8, new ResetUniversalAngerTargetGoal<>(this, true));
-@@ -230,6 +_,7 @@
+@@ -230,6 +296,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.store("CollarColor", DyeColor.LEGACY_ID_CODEC, this.getCollarColor());
@@ -103,7 +111,7 @@
          VariantUtils.writeVariant(output, this.getVariant());
          this.addPersistentAngerSaveData(output);
          this.getSoundVariant()
-@@ -244,6 +_,10 @@
+@@ -244,6 +311,10 @@ public class Wolf extends TamableAnimal implements NeutralMob {
          super.readAdditionalSaveData(input);
          VariantUtils.readVariant(input, Registries.WOLF_VARIANT).ifPresent(this::setVariant);
          this.setCollarColor(input.read("CollarColor", DyeColor.LEGACY_ID_CODEC).orElse(DEFAULT_COLLAR_COLOR));
@@ -114,7 +122,7 @@
          this.readPersistentAngerSaveData(this.level(), input);
          input.read("sound_variant", ResourceKey.codec(Registries.WOLF_SOUND_VARIANT))
              .flatMap(resourceKey -> this.registryAccess().lookupOrThrow(Registries.WOLF_SOUND_VARIANT).get((ResourceKey<WolfSoundVariant>)resourceKey))
-@@ -268,6 +_,10 @@
+@@ -268,6 +339,10 @@ public class Wolf extends TamableAnimal implements NeutralMob {
          }
  
          this.setSoundVariant(WolfSoundVariants.pickRandomSoundVariant(this.registryAccess(), level.getRandom()));
@@ -125,7 +133,7 @@
          return super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData);
      }
  
-@@ -318,6 +_,11 @@
+@@ -318,6 +393,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
      public void tick() {
          super.tick();
          if (this.isAlive()) {
@@ -137,7 +145,7 @@
              this.interestedAngleO = this.interestedAngle;
              if (this.isInterested()) {
                  this.interestedAngle = this.interestedAngle + (1.0F - this.interestedAngle) * 0.4F;
-@@ -519,13 +_,27 @@
+@@ -519,13 +599,27 @@ public class Wolf extends TamableAnimal implements NeutralMob {
              itemInHand.consume(1, player);
              this.tryToTame(player);
              return InteractionResult.SUCCESS_SERVER;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch
index b58f13a85..2344c51e7 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+index a0e0fad40838fa7d835f31e5ce4ae3ab40e0bfa4..5bff703ae4f95091620dec5347246d7c0cbe5d5e 100644
 --- a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 +++ b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-@@ -39,6 +_,24 @@
+@@ -39,6 +39,24 @@ public class EndCrystal extends Entity {
          this.setPos(x, y, z);
      }
  
@@ -25,7 +33,7 @@
      @Override
      protected Entity.MovementEmission getMovementEmission() {
          return Entity.MovementEmission.NONE;
-@@ -75,6 +_,8 @@
+@@ -75,6 +93,8 @@ public class EndCrystal extends Entity {
              }
          }
          // Paper end - Fix invulnerable end crystals
@@ -34,7 +42,7 @@
      }
  
      @Override
-@@ -115,15 +_,17 @@
+@@ -115,15 +135,17 @@ public class EndCrystal extends Entity {
                  }
                  // CraftBukkit end
                  if (!damageSource.is(DamageTypeTags.IS_EXPLOSION)) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch
index 8d855a599..4a9e11436 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+index 84d215a498d9bf6f1232bf4af5a4a98d3ba9b131..3389c79e18601d582f95fe3765c291d46706d015 100644
 --- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -961,6 +_,7 @@
+@@ -961,6 +961,7 @@ public class EnderDragon extends Mob implements Enemy {
  
      @Override
      protected boolean canRide(Entity entity) {
@@ -8,7 +16,7 @@
          return false;
      }
  
-@@ -996,7 +_,7 @@
+@@ -996,7 +997,7 @@ public class EnderDragon extends Mob implements Enemy {
          boolean flag = level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
          int i = 500;
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch
index ae41b8b7c..98aa37360 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
+index 030721328b05526c3f56d9875859ee8860a1d36b..f8aeb8364723cf09bbe7f4fad00ddede784338b6 100644
 --- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -79,6 +_,7 @@
+@@ -79,6 +79,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
      private static final TargetingConditions.Selector LIVING_ENTITY_SELECTOR = (entity, level) -> !entity.getType().is(EntityTypeTags.WITHER_FRIENDS)
          && entity.attackable();
      private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0).selector(LIVING_ENTITY_SELECTOR);
@@ -8,7 +16,7 @@
  
      public WitherBoss(EntityType<? extends WitherBoss> entityType, Level level) {
          super(entityType, level);
-@@ -87,6 +_,17 @@
+@@ -87,6 +88,17 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          this.xpReward = 50;
      }
  
@@ -26,7 +34,7 @@
      @Override
      protected PathNavigation createNavigation(Level level) {
          FlyingPathNavigation flyingPathNavigation = new FlyingPathNavigation(this, level);
-@@ -119,6 +_,7 @@
+@@ -119,6 +131,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.putInt("Invul", this.getInvulnerableTicks());
@@ -34,7 +42,7 @@
      }
  
      @Override
-@@ -128,6 +_,7 @@
+@@ -128,6 +141,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          if (this.hasCustomName()) {
              this.bossEvent.setName(this.getDisplayName());
          }
@@ -42,7 +50,7 @@
      }
  
      @Override
-@@ -271,7 +_,7 @@
+@@ -271,7 +285,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
                      level.explode(this, this.getX(), this.getEyeY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB);
                  }
                  // CraftBukkit end
@@ -51,7 +59,7 @@
                      // CraftBukkit start - Use relative location for far away sounds
                      // level.globalLevelEvent(1023, this.blockPosition(), 0);
                      int viewDistance = level.getCraftServer().getViewDistance() * 16;
-@@ -378,8 +_,10 @@
+@@ -378,8 +392,10 @@ public class WitherBoss extends Monster implements RangedAttackMob {
                  }
              }
  
@@ -64,7 +72,7 @@
              }
  
              this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
-@@ -576,6 +_,7 @@
+@@ -576,6 +592,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
  
      @Override
      protected boolean canRide(Entity entity) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch
index 8a3b604f5..2ea420da8 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
+index 46369e554be8c72e6fc2e6d58374dbfc77d94879..e2ffc9b4a95a7684a28b47ad93644c95f9eb5ec8 100644
 --- a/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -91,10 +_,13 @@
+@@ -91,10 +91,13 @@ public class ArmorStand extends LivingEntity {
      public boolean canTickSetByAPI = false;
      private boolean noTickEquipmentDirty = false;
      // Paper end - Allow ArmorStands not to tick
@@ -14,7 +22,7 @@
      }
  
      public ArmorStand(Level level, double x, double y, double z) {
-@@ -521,6 +_,7 @@
+@@ -521,6 +524,7 @@ public class ArmorStand extends LivingEntity {
      // Paper start - Allow ArmorStands not to tick
      @Override
      public void tick() {
@@ -22,7 +30,7 @@
          if (!this.canTick) {
              if (this.noTickEquipmentDirty) {
                  this.noTickEquipmentDirty = false;
-@@ -811,4 +_,18 @@
+@@ -811,4 +815,18 @@ public class ArmorStand extends LivingEntity {
          }
      }
      // Paper end
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch
index 4ed5565e9..5e9f2c569 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
+index 51804b611f469f2ab53e455e8c633b867b00cc88..d650d4f34fde0682ab76360408f7ff6a7d4b4c3a 100644
 --- a/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/net/minecraft/world/entity/item/ItemEntity.java
-@@ -56,6 +_,12 @@
+@@ -56,6 +56,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
      public boolean canMobPickup = true; // Paper - Item#canEntityPickup
      private int despawnRate = -1; // Paper - Alternative item-despawn-rate
      public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
@@ -13,7 +21,7 @@
  
      public ItemEntity(EntityType<? extends ItemEntity> entityType, Level level) {
          super(entityType, level);
-@@ -342,7 +_,16 @@
+@@ -342,7 +348,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      @Override
      public final boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
@@ -31,7 +39,7 @@
              return false;
          } else if (!level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && damageSource.getEntity() instanceof Mob) {
              return false;
-@@ -521,6 +_,12 @@
+@@ -521,6 +536,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
      public void setItem(ItemStack stack) {
          this.getEntityData().set(DATA_ITEM, stack);
          this.despawnRate = this.level().paperConfig().entities.spawning.altItemDespawnRate.enabled ? this.level().paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), this.level().spigotConfig.itemDespawnRate) : this.level().spigotConfig.itemDespawnRate; // Paper - Alternative item-despawn-rate
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch
index 39c0e7d9d..cde2380c9 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
+index 17d54d38dcec39eefeb989cd576cc640a36e82f5..ef070f8a9ab3a4676e2141f7c0bc20a000d0cc3a 100644
 --- a/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -238,4 +_,32 @@
+@@ -238,4 +238,32 @@ public class PrimedTnt extends Entity implements TraceableEntity {
          return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
      }
      // Paper end - Option to prevent TNT from moving in water
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch
index 10ddc966a..cf806f5ec 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/AbstractSkeleton.java b/net/minecraft/world/entity/monster/AbstractSkeleton.java
+index 894a3d988d0530d42d3a282b61cdb445a0f820ad..4e14f1a9ee22d08065a3e971c2aecc9363ebff13 100644
 --- a/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -158,10 +_,7 @@
+@@ -158,10 +158,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          this.reassessWeaponGoal();
          this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || random.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper - Add world settings for mobs picking up loot
          if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
@@ -12,7 +20,7 @@
                  this.setItemSlot(EquipmentSlot.HEAD, new ItemStack(random.nextFloat() < 0.1F ? Blocks.JACK_O_LANTERN : Blocks.CARVED_PUMPKIN));
                  this.setDropChance(EquipmentSlot.HEAD, 0.0F);
              }
-@@ -209,7 +_,7 @@
+@@ -209,7 +206,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          double squareRoot = Math.sqrt(d * d + d2 * d2);
          if (this.level() instanceof ServerLevel serverLevel) {
              Projectile.Delayed<AbstractArrow> delayedEntity = Projectile.spawnProjectileUsingShootDelayed( // Paper - delayed
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch
index b31fc41ee..d3d3f3199 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
+index eabc778ba06c14f3020391b9850ae1a283ecf106..d82fe9db4d074a0484d8c5e2998ff9faf87dfd6e 100644
 --- a/net/minecraft/world/entity/monster/Creeper.java
 +++ b/net/minecraft/world/entity/monster/Creeper.java
-@@ -55,6 +_,7 @@
+@@ -55,6 +55,7 @@ public class Creeper extends Monster {
      public int explosionRadius = 3;
      private int droppedSkulls;
      public @Nullable Entity entityIgniter; // CraftBukkit
@@ -8,7 +16,7 @@
  
      public Creeper(EntityType<? extends Creeper> entityType, Level level) {
          super(entityType, level);
-@@ -158,6 +_,27 @@
+@@ -158,6 +159,27 @@ public class Creeper extends Monster {
          return false; // CraftBukkit
      }
  
@@ -36,7 +44,7 @@
      @Override
      public SoundEvent getHurtSound(DamageSource damageSource) {
          return SoundEvents.CREEPER_HURT;
-@@ -240,14 +_,16 @@
+@@ -240,14 +262,16 @@ public class Creeper extends Monster {
      }
  
      public void explodeCreeper() {
@@ -55,7 +63,7 @@
              this.spawnLingeringCloud();
              this.triggerOnDeathMobEffects(serverLevel, Entity.RemovalReason.KILLED);
              this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
-@@ -258,6 +_,7 @@
+@@ -258,6 +282,7 @@ public class Creeper extends Monster {
              }
              // CraftBukkit end
          }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch
index 89708242d..b3155502a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java
+index f42f9c232fa588835654de0fdea36b9cdfa34571..84c6b5552f2b408b7b9f24a85b8c4fd54310c349 100644
 --- a/net/minecraft/world/entity/monster/Drowned.java
 +++ b/net/minecraft/world/entity/monster/Drowned.java
-@@ -83,10 +_,23 @@
+@@ -83,10 +83,23 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.goalSelector.addGoal(2, new Drowned.DrownedAttackGoal(this, 1.0, false));
          this.goalSelector.addGoal(5, new Drowned.DrownedGoToBeachGoal(this, 1.0));
          this.goalSelector.addGoal(6, new Drowned.DrownedSwimUpGoal(this, 1.0, this.level().getSeaLevel()));
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch
index 10b7ca4d0..03862908b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
+index 4edd94ac765d2ab107612504b67e6e07da609313..ddb916856cff7179eca474738dfbba910408434c 100644
 --- a/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/net/minecraft/world/entity/monster/EnderMan.java
-@@ -101,7 +_,7 @@
+@@ -101,7 +101,7 @@ public class EnderMan extends Monster implements NeutralMob {
          this.goalSelector.addGoal(11, new EnderMan.EndermanTakeBlockGoal(this));
          this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt));
          this.targetSelector.addGoal(2, new HurtByTargetGoal(this));
@@ -9,7 +17,7 @@
          this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false));
      }
  
-@@ -216,7 +_,7 @@
+@@ -216,7 +216,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      boolean isBeingStaredBy(Player player) {
          // Paper start - EndermanAttackPlayerEvent
@@ -18,7 +26,7 @@
          final com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent event = new com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent((org.bukkit.entity.Enderman) getBukkitEntity(), (org.bukkit.entity.Player) player.getBukkitEntity());
          event.setCancelled(!shouldAttack);
          return event.callEvent();
-@@ -372,6 +_,7 @@
+@@ -372,6 +372,7 @@ public class EnderMan extends Monster implements NeutralMob {
      public boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
          if (this.isInvulnerableTo(level, damageSource)) {
              return false;
@@ -26,7 +34,7 @@
          } else {
              AbstractThrownPotion abstractThrownPotion1 = damageSource.getDirectEntity() instanceof AbstractThrownPotion abstractThrownPotion
                  ? abstractThrownPotion
-@@ -388,6 +_,7 @@
+@@ -388,6 +389,7 @@ public class EnderMan extends Monster implements NeutralMob {
              } else {
                  boolean flag = abstractThrownPotion1 != null && this.hurtWithCleanWater(level, damageSource, abstractThrownPotion1, amount);
  
@@ -34,7 +42,7 @@
                  if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper - EndermanEscapeEvent
                  for (int i = 0; i < 64; i++) {
                      if (this.teleport()) {
-@@ -431,7 +_,7 @@
+@@ -431,7 +433,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      @Override
      public boolean requiresCustomPersistence() {
@@ -43,7 +51,7 @@
      }
  
      static class EndermanFreezeWhenLookedAt extends Goal {
-@@ -475,6 +_,7 @@
+@@ -475,6 +477,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
          @Override
          public boolean canUse() {
@@ -51,7 +59,7 @@
              return this.enderman.getCarriedBlock() != null
                  && getServerLevel(this.enderman).getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)
                  && this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0;
-@@ -624,6 +_,7 @@
+@@ -624,6 +627,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
          @Override
          public boolean canUse() {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch
index b8e9ee681..aaaa30b97 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
+index f448aac89c6125246c730a71e7ee21c8168d7003..50eefb77a6c346b2643324f526c5c01d5e667ce4 100644
 --- a/net/minecraft/world/entity/monster/Endermite.java
 +++ b/net/minecraft/world/entity/monster/Endermite.java
-@@ -30,12 +_,23 @@
+@@ -30,12 +30,23 @@ public class Endermite extends Monster {
      private static final int MAX_LIFE = 2400;
      private static final int DEFAULT_LIFE = 0;
      public int life = 0;
@@ -24,7 +32,7 @@
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-@@ -81,12 +_,14 @@
+@@ -81,12 +92,14 @@ public class Endermite extends Monster {
      protected void readAdditionalSaveData(ValueInput input) {
          super.readAdditionalSaveData(input);
          this.life = input.getIntOr("Lifetime", 0);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch
index c833d4fc6..69c5af221 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Monster.java b/net/minecraft/world/entity/monster/Monster.java
+index 5ef9566b16a4d0300ee45a993c46e734db156416..04d5910d736dee2a88a2602f4a98495459277157 100644
 --- a/net/minecraft/world/entity/monster/Monster.java
 +++ b/net/minecraft/world/entity/monster/Monster.java
-@@ -88,6 +_,14 @@
+@@ -88,6 +88,14 @@ public abstract class Monster extends PathfinderMob implements Enemy {
      }
  
      public static boolean isDarkEnoughToSpawn(ServerLevelAccessor level, BlockPos pos, RandomSource random) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch
index e09de7e71..208d0b387 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
+index 666d50b738622d26cc15ccc3c11414490296abf6..dd808ce350aa8755df69a84ba5e779f82a76a960 100644
 --- a/net/minecraft/world/entity/monster/Phantom.java
 +++ b/net/minecraft/world/entity/monster/Phantom.java
-@@ -174,7 +_,11 @@
+@@ -174,7 +174,11 @@ public class Phantom extends Mob implements Enemy {
          ServerLevelAccessor level, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData spawnGroupData
      ) {
          this.anchorPoint = this.blockPosition().above(5);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch
index e15c2cd73..fd9a836a3 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
+index 9d84bf2cffee25404eebbefdc9cc3f37ebc386b0..2b9a72b8742bf13c69df5ce0c905d47a92b9d8bc 100644
 --- a/net/minecraft/world/entity/monster/Ravager.java
 +++ b/net/minecraft/world/entity/monster/Ravager.java
-@@ -74,6 +_,7 @@
+@@ -74,6 +74,7 @@ public class Ravager extends Raider {
      protected void registerGoals() {
          super.registerGoals();
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -8,7 +16,7 @@
          this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0, true));
          this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 0.4));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
-@@ -154,7 +_,7 @@
+@@ -154,7 +155,7 @@ public class Ravager extends Raider {
                  )) {
                      BlockState blockState = serverLevel.getBlockState(blockPos);
                      Block block = blockState.getBlock();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch
index a64e3c08d..51f790d5c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
+index f667fc5ff1ea4149cb25608e0d12f9f73f86095e..ff16e0dd78687f4c9a0bce5ede4eda30e2a06263 100644
 --- a/net/minecraft/world/entity/monster/Shulker.java
 +++ b/net/minecraft/world/entity/monster/Shulker.java
-@@ -94,6 +_,21 @@
+@@ -94,6 +94,21 @@ public class Shulker extends AbstractGolem implements Enemy {
          this.lookControl = new Shulker.ShulkerLookControl(this);
      }
  
@@ -22,7 +30,7 @@
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F, 0.02F, true));
-@@ -461,11 +_,21 @@
+@@ -461,11 +476,21 @@ public class Shulker extends AbstractGolem implements Enemy {
      private void hitByShulkerBullet() {
          Vec3 vec3 = this.position();
          AABB boundingBox = this.getBoundingBox();
@@ -48,7 +56,7 @@
                  if (shulker != null) {
                      shulker.setVariant(this.getVariant());
                      shulker.snapTo(vec3);
-@@ -573,7 +_,7 @@
+@@ -573,7 +598,7 @@ public class Shulker extends AbstractGolem implements Enemy {
      }
  
      public Optional<DyeColor> getVariant() {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch
index 9d99390b1..68223089a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
+index afa584e2aba6bebfb2dd343215b043c983281853..4b9e60d930bc3a4bfe9aad2e81391e57cfc45d40 100644
 --- a/net/minecraft/world/entity/monster/Strider.java
 +++ b/net/minecraft/world/entity/monster/Strider.java
-@@ -392,6 +_,19 @@
+@@ -392,6 +392,19 @@ public class Strider extends Animal implements ItemSteerable {
      @Override
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          boolean isFood = this.isFood(player.getItemInHand(hand));
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch
index 26ace8b3e..ad253561b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java
+index 835b522a77fc4e1ec84bd5134e12233a02b66a66..71d84306788be023bc949400d30966548d968c86 100644
 --- a/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/net/minecraft/world/entity/monster/Vindicator.java
-@@ -131,6 +_,11 @@
+@@ -131,6 +131,11 @@ public class Vindicator extends AbstractIllager {
          RandomSource random = level.getRandom();
          this.populateDefaultEquipmentSlots(random, difficulty);
          this.populateDefaultEquipmentEnchantments(level, random, difficulty);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch
index c07653823..3a178db7c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
+index a23607874a72723914cbfeea0ad1c51236c044d8..e8f54f358b0af0a6755912df7cceb2909da9f0a9 100644
 --- a/net/minecraft/world/entity/monster/Zombie.java
 +++ b/net/minecraft/world/entity/monster/Zombie.java
-@@ -117,7 +_,19 @@
+@@ -117,7 +117,19 @@ public class Zombie extends Monster {
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0));
          this.targetSelector.addGoal(1, new HurtByTargetGoal(this).setAlertOthers(ZombifiedPiglin.class));
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
@@ -21,7 +29,7 @@
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
-@@ -551,10 +_,7 @@
+@@ -551,10 +563,7 @@ public class Zombie extends Monster {
          }
  
          if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch
index cd7502ad9..741dfc975 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
+index 822712eaff2f6c579d982734ab14a00c02182770..1be7c756d56cca63347d97f7896b491f3a343fa4 100644
 --- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -113,6 +_,12 @@
+@@ -113,6 +113,12 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
              this.maybeAlertOthers();
          }
  
@@ -13,16 +21,16 @@
          super.customServerAiStep(level);
      }
  
-@@ -159,6 +_,12 @@
-             this.playFirstAngerSoundIn = FIRST_ANGER_SOUND_DELAY.sample(this.random);
+@@ -160,6 +166,12 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
              this.ticksUntilNextAlert = ALERT_INTERVAL.sample(this.random);
          }
-+
+ 
 +        // Purpur start - Toggle for Zombified Piglin death always counting as player kill when angry
 +        if (livingEntity instanceof Player player && this.level().purpurConfig.zombifiedPiglinCountAsPlayerKillWhenAngry) {
 +            this.setLastHurtByPlayer(player, this.tickCount);
 +        }
 +        // Purpur end - Toggle for Zombified Piglin death always counting as player kill when angry
- 
++
          return super.setTarget(livingEntity, reason); // CraftBukkit
      }
+ 
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
index ae53e80fd..a55fc423a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/net/minecraft/world/entity/monster/piglin/PiglinAi.java
+index 4b1a3772f9e6b9e4efcf11e14b0fb882512ec86d..2841c765b2bd804f08bd0e603b4b29cf8a801fab 100644
 --- a/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 +++ b/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -661,13 +_,23 @@
+@@ -661,7 +661,10 @@ public class PiglinAi {
  
      public static boolean isWearingSafeArmor(LivingEntity entity) {
          for (EquipmentSlot equipmentSlot : EquipmentSlotGroup.ARMOR) {
@@ -12,16 +20,17 @@
                  return true;
              }
          }
- 
+@@ -669,6 +672,13 @@ public class PiglinAi {
          return false;
      }
-+
+ 
 +    // Purpur start - piglins ignore gold-trimmed armor
 +    private static boolean isWearingGoldTrim(net.minecraft.world.item.ItemStack itemstack) {
 +        net.minecraft.world.item.equipment.trim.ArmorTrim armorTrim = itemstack.getComponents().get(net.minecraft.core.component.DataComponents.TRIM);
 +        return armorTrim != null && armorTrim.material().is(net.minecraft.world.item.equipment.trim.TrimMaterials.GOLD);
 +    }
 +    // Purpur end - piglins ignore gold-trimmed armor
- 
++
      private static void stopWalking(Piglin piglin) {
          piglin.getBrain().eraseMemory(MemoryModuleType.WALK_TARGET);
+         piglin.getNavigation().stop();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/Villager.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
index d87abdef5..c95beba62 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
+index e1e2bdb35866a8f32a41f6efd24ad77cf916b2e9..98303277236f2205f20e3db29f17f576ba2a7938 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
-@@ -178,6 +_,8 @@
+@@ -178,6 +178,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          MemoryModuleType.MEETING_POINT,
          (villager, poiType) -> poiType.is(PoiTypes.MEETING)
      );
@@ -9,7 +17,7 @@
  
      public Villager(EntityType<? extends Villager> entityType, Level level) {
          this(entityType, level, VillagerType.PLAINS);
-@@ -196,6 +_,57 @@
+@@ -196,6 +198,57 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          this.setVillagerData(this.getVillagerData().withType(villagerType).withProfession(level.registryAccess(), VillagerProfession.NONE));
      }
  
@@ -67,7 +75,7 @@
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>)super.getBrain();
-@@ -292,11 +_,24 @@
+@@ -292,11 +345,24 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          // Paper start - EAR 2
          this.customServerAiStep(level, false);
      }
@@ -94,7 +102,7 @@
          profilerFiller.pop();
          if (this.assignProfessionWhenSpawned) {
              this.assignProfessionWhenSpawned = false;
-@@ -368,6 +_,7 @@
+@@ -368,6 +434,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
                      return InteractionResult.CONSUME;
                  }
  
@@ -102,7 +110,7 @@
                  this.startTrading(player);
              }
  
-@@ -504,7 +_,7 @@
+@@ -504,7 +571,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      public void updateDemand() {
          for (MerchantOffer merchantOffer : this.getOffers()) {
@@ -111,7 +119,7 @@
          }
      }
  
-@@ -697,7 +_,7 @@
+@@ -697,7 +764,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
      public boolean canBreed() {
@@ -120,7 +128,7 @@
      }
  
      private boolean hungry() {
-@@ -919,6 +_,7 @@
+@@ -919,6 +986,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
  
      public void spawnGolemIfNeeded(ServerLevel serverLevel, long gameTime, int minVillagerAmount) {
@@ -128,7 +136,7 @@
          if (this.wantsToSpawnGolem(gameTime)) {
              AABB aabb = this.getBoundingBox().inflate(10.0, 10.0, 10.0);
              List<Villager> entitiesOfClass = serverLevel.getEntitiesOfClass(Villager.class, aabb);
-@@ -992,6 +_,12 @@
+@@ -992,6 +1060,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
      public void startSleeping(BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch
index 0c82ef476..efae2a07a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
+index c2573946dd1244eb5d1ef2be7823211064daa80d..93ed977260f369677028bbd8396862f344dfeaa3 100644
 --- a/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -60,6 +_,13 @@
+@@ -60,6 +60,13 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          super(entityType, level);
      }
  
@@ -14,7 +22,7 @@
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-@@ -80,7 +_,7 @@
+@@ -80,7 +87,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
                      this,
                      new ItemStack(Items.MILK_BUCKET),
                      SoundEvents.WANDERING_TRADER_REAPPEARED,
@@ -23,7 +31,7 @@
                  )
              );
          this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
-@@ -124,8 +_,10 @@
+@@ -124,8 +131,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
                      return InteractionResult.CONSUME;
                  }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch
index efaa61512..dbf4df0d7 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+index fce3f0f81d3195045cdc9ad7320f1d92f033c36d..352f55882ea77e8d89942e6c58ef3b4b78eec887 100644
 --- a/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -137,7 +_,17 @@
+@@ -137,7 +137,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
              int i1 = pos.getX() + this.random.nextInt(maxDistance * 2) - maxDistance;
              int i2 = pos.getZ() + this.random.nextInt(maxDistance * 2) - maxDistance;
              int height = level.getHeight(Heightmap.Types.WORLD_SURFACE, i1, i2);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
index de4745d8e..a8cd2801a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/projectile/AbstractArrow.java b/net/minecraft/world/entity/projectile/AbstractArrow.java
+index 11adb3eacce9d46f15e6c5216e9b2494df158baf..5a27dfa9ea24a93e7bd09cfed8190d7ca772d33e 100644
 --- a/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -76,6 +_,7 @@
+@@ -76,6 +76,7 @@ public abstract class AbstractArrow extends Projectile {
      public ItemStack pickupItemStack = this.getDefaultPickupItem();
      @Nullable
      public ItemStack firedFromWeapon = null;
@@ -8,7 +16,7 @@
  
      protected AbstractArrow(EntityType<? extends AbstractArrow> entityType, Level level) {
          super(entityType, level);
-@@ -349,7 +_,7 @@
+@@ -349,7 +350,7 @@ public abstract class AbstractArrow extends Projectile {
          this.setInGround(false);
          Vec3 deltaMovement = this.getDeltaMovement();
          this.setDeltaMovement(deltaMovement.multiply(this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F));
@@ -17,16 +25,16 @@
      }
  
      public boolean isInGround() {
-@@ -572,6 +_,12 @@
-     public ItemStack getWeaponItem() {
+@@ -573,6 +574,12 @@ public abstract class AbstractArrow extends Projectile {
          return this.firedFromWeapon;
      }
-+
+ 
 +    // Purpur start - Add an option to fix MC-3304 projectile looting
 +    public void setActualEnchantments(net.minecraft.world.item.enchantment.ItemEnchantments actualEnchantments) {
 +        this.actualEnchantments = actualEnchantments;
 +    }
 +    // Purpur end - Add an option to fix MC-3304 projectile looting
- 
++
      protected SoundEvent getDefaultHitGroundSoundEvent() {
          return SoundEvents.ARROW_HIT;
+     }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch
index 7215ffe71..b01bf180c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/projectile/Snowball.java b/net/minecraft/world/entity/projectile/Snowball.java
+index 677b4b681f9c2c09a8ae3cfdec72102265547a7b..d8f9fb603fd2e3e5c1dfc05face7f42b4844daf4 100644
 --- a/net/minecraft/world/entity/projectile/Snowball.java
 +++ b/net/minecraft/world/entity/projectile/Snowball.java
-@@ -52,9 +_,39 @@
+@@ -52,10 +52,40 @@ public class Snowball extends ThrowableItemProjectile {
      protected void onHitEntity(EntityHitResult result) {
          super.onHitEntity(result);
          Entity entity = result.getEntity();
@@ -8,7 +16,7 @@
 +        int i = entity.level().purpurConfig.snowballDamage >= 0 ? entity.level().purpurConfig.snowballDamage : entity instanceof Blaze ? 3 : 0; // Purpur - Add configurable snowball damage
          entity.hurt(this.damageSources().thrown(this, this.getOwner()), i);
      }
-+
+ 
 +    // Purpur start - options to extinguish fire blocks with snowballs - borrowed and modified code from ThrownPotion#onHitBlock and ThrownPotion#dowseFire
 +    @Override
 +    protected void onHitBlock(net.minecraft.world.phys.BlockHitResult blockHitResult) {
@@ -38,6 +46,7 @@
 +        }
 +    }
 +    // Purpur end - options to extinguish fire blocks with snowballs
- 
++
      @Override
      protected void onHit(HitResult result) {
+         super.onHit(result);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch
index 16d2b28e9..24d3e9942 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+index 5aa63c90e1c0605faef76588efdc7c3903be4605..ebc7db0fc6e8fb8f4bd19945e61287b2ff61cdbc 100644
 --- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -129,9 +_,10 @@
+@@ -129,9 +129,10 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
                              return;
                          }
                          // CraftBukkit end
@@ -12,7 +20,7 @@
                                  endermite.snapTo(preTeleportX, preTeleportY, preTeleportZ, preTeleportYRot, preTeleportXRot); // Paper - spawn endermite at pre teleport position as teleport has been moved up
                                  serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
                              }
-@@ -151,7 +_,7 @@
+@@ -151,7 +152,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
                          if (serverPlayer1 != null) {
                              serverPlayer1.resetFallDistance();
                              serverPlayer1.resetCurrentImpulseContext();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch
index cb2639bfb..af485b01d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/projectile/ThrownTrident.java b/net/minecraft/world/entity/projectile/ThrownTrident.java
+index bc04812ec840e255c0ae8651bf7a43e0f562aa9c..b6826fc742640e7f8311bd0269aa0d8a6a9b2db4 100644
 --- a/net/minecraft/world/entity/projectile/ThrownTrident.java
 +++ b/net/minecraft/world/entity/projectile/ThrownTrident.java
-@@ -66,7 +_,7 @@
+@@ -66,7 +66,7 @@ public class ThrownTrident extends AbstractArrow {
  
          Entity owner = this.getOwner();
          int i = this.entityData.get(ID_LOYALTY);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch
index 53c42c6f9..726cdaf3d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/projectile/WitherSkull.java b/net/minecraft/world/entity/projectile/WitherSkull.java
+index 2419c1db39c9ffbc54352c7fa5e0ac1ef813c13a..5f20dded96fac2dd5d1b0282e7f8487344beb4ee 100644
 --- a/net/minecraft/world/entity/projectile/WitherSkull.java
 +++ b/net/minecraft/world/entity/projectile/WitherSkull.java
-@@ -94,7 +_,7 @@
+@@ -94,7 +94,7 @@ public class WitherSkull extends AbstractHurtingProjectile {
          super.onHit(result);
          if (!this.level().isClientSide) {
              // CraftBukkit start
@@ -9,17 +17,17 @@
              if (event.callEvent()) {
                  this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB);
              }
-@@ -102,6 +_,13 @@
-             this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+@@ -103,6 +103,13 @@ public class WitherSkull extends AbstractHurtingProjectile {
          }
      }
-+
+ 
 +    // Purpur start - Add canSaveToDisk to Entity
 +    @Override
 +    public boolean canSaveToDisk() {
 +        return false;
 +    }
 +    // Purpur end - Add canSaveToDisk to Entity
- 
++
      @Override
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         builder.define(DATA_DANGEROUS, false);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raids.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raids.java.patch
index c0e2ddf74..834b4360a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raids.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raids.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/raid/Raids.java b/net/minecraft/world/entity/raid/Raids.java
+index b8de00c5f13257d0b79b44b19fbfb88a3ca20353..fc5c1acec3cc2afed40589be6f8e159c3426c08e 100644
 --- a/net/minecraft/world/entity/raid/Raids.java
 +++ b/net/minecraft/world/entity/raid/Raids.java
-@@ -29,6 +_,7 @@
+@@ -29,6 +29,7 @@ import net.minecraft.world.phys.Vec3;
  
  public class Raids extends SavedData {
      private static final String RAID_FILE_ID = "raids";
@@ -8,7 +16,7 @@
      public static final Codec<Raids> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
                  Raids.RaidWithId.CODEC
-@@ -81,6 +_,17 @@
+@@ -81,6 +82,17 @@ public class Raids extends SavedData {
  
      public void tick(ServerLevel level) {
          this.tick++;
@@ -26,7 +34,7 @@
          Iterator<Raid> iterator = this.raidMap.values().iterator();
  
          while (iterator.hasNext()) {
-@@ -148,11 +_,13 @@
+@@ -148,11 +160,13 @@ public class Raids extends SavedData {
                      // }
  
                      if (!raid.isStarted() || (raid.isInProgress() && raid.getRaidOmenLevel() < raid.getMaxRaidOmenLevel())) { // CraftBukkit - fixed a bug with raid: players could add up Bad Omen level even when the raid had finished
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch
index 018fcd5d3..46ee56b89 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/vehicle/AbstractBoat.java b/net/minecraft/world/entity/vehicle/AbstractBoat.java
+index df360ff06d10fc7f996055dce5148825539e9261..4dcf6daa146645f096ac8815588c837715073c22 100644
 --- a/net/minecraft/world/entity/vehicle/AbstractBoat.java
 +++ b/net/minecraft/world/entity/vehicle/AbstractBoat.java
-@@ -436,6 +_,7 @@
+@@ -436,6 +436,7 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
              float groundFriction = this.getGroundFriction();
              if (groundFriction > 0.0F) {
                  this.landFriction = groundFriction;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch
index dfb044e11..b157dcf4e 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java b/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
+index 090b19752fbfc856d9fbf118510afc6cda2b9989..325ec57df2885f5e81b8a6b61e3a9fed9484b30f 100644
 --- a/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
 +++ b/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
-@@ -391,7 +_,7 @@
+@@ -391,7 +391,7 @@ public class NewMinecartBehavior extends MinecartBehavior {
      private Vec3 calculateBoostTrackSpeed(Vec3 speed, BlockPos pos, BlockState state) {
          if (state.is(Blocks.POWERED_RAIL) && state.getValue(PoweredRailBlock.POWERED)) {
              if (speed.length() > 0.01) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch
index c8d066068..de8fb0d1d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java b/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
+index 0d09b0809e7b224538cf5cfac9e36ec5ba10b709..4d224dc127d245556892e761fa4927a76e4b8e9a 100644
 --- a/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
 +++ b/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
-@@ -243,8 +_,8 @@
+@@ -243,8 +243,8 @@ public class OldMinecartBehavior extends MinecartBehavior {
              Vec3 deltaMovement1 = this.getDeltaMovement();
              double d13 = deltaMovement1.horizontalDistance();
              if (d13 > 0.01) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodData.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodData.java.patch
index a44cdd312..b19dc3b32 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodData.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodData.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/food/FoodData.java b/net/minecraft/world/food/FoodData.java
+index a1b99dea0fa5860a01158897006e1065050c029b..d1080acfe91bd1ca28e21ffc68a928dc0f233be3 100644
 --- a/net/minecraft/world/food/FoodData.java
 +++ b/net/minecraft/world/food/FoodData.java
-@@ -39,6 +_,7 @@
+@@ -39,6 +39,7 @@ public class FoodData {
          int oldFoodLevel = this.foodLevel;
          org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(serverPlayer, foodProperties.nutrition() + oldFoodLevel, stack);
          if (!event.isCancelled()) {
@@ -8,7 +16,7 @@
              this.add(event.getFoodLevel() - oldFoodLevel, foodProperties.saturation());
          }
          serverPlayer.getBukkitEntity().sendHealthUpdate();
-@@ -87,7 +_,7 @@
+@@ -87,7 +88,7 @@ public class FoodData {
              this.tickTimer++;
              if (this.tickTimer >= this.starvationRate) { // CraftBukkit - add regen rate manipulation
                  if (player.getHealth() > 10.0F || difficulty == Difficulty.HARD || player.getHealth() > 1.0F && difficulty == Difficulty.NORMAL) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodProperties.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodProperties.java.patch
index 87515c815..52eeffb51 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodProperties.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodProperties.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/food/FoodProperties.java b/net/minecraft/world/food/FoodProperties.java
+index 793e4528755fa5688efbad75418188e693ad0157..20f702c8266eb54a8835861188eb937f4732e078 100644
 --- a/net/minecraft/world/food/FoodProperties.java
 +++ b/net/minecraft/world/food/FoodProperties.java
-@@ -42,9 +_,11 @@
+@@ -42,9 +42,11 @@ public record FoodProperties(int nutrition, float saturation, boolean canAlwaysE
          level.playSound(null, entity.getX(), entity.getY(), entity.getZ(), consumable.sound().value(), SoundSource.NEUTRAL, 1.0F, random.triangle(1.0F, 0.4F));
          if (entity instanceof Player player) {
              player.getFoodData().eat(this, stack, (net.minecraft.server.level.ServerPlayer) player); // CraftBukkit
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch
index bca7321cd..76656b9e9 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
+index 06846950348954328c07f64cd9b3359e79a1a468..4354aafdd29c397d1318ae71dc365e7ca0aa781c 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -65,6 +_,7 @@
+@@ -65,6 +65,7 @@ public abstract class AbstractContainerMenu {
      @Nullable
      private ContainerSynchronizer synchronizer;
      private boolean suppressRemoteUpdates;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch
index 1626289f6..4a3f4e719 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/inventory/AbstractFurnaceMenu.java b/net/minecraft/world/inventory/AbstractFurnaceMenu.java
+index b42d55c1c0c405ce3ce073138343e74fa036fa65..b86e49b09a036532e7dbd56bc52b13cefe77f75b 100644
 --- a/net/minecraft/world/inventory/AbstractFurnaceMenu.java
 +++ b/net/minecraft/world/inventory/AbstractFurnaceMenu.java
-@@ -121,7 +_,13 @@
+@@ -121,7 +121,13 @@ public abstract class AbstractFurnaceMenu extends RecipeBookMenu {
              } else if (index != 1 && index != 0) {
                  if (this.canSmelt(item)) {
                      if (!this.moveItemStackTo(item, 0, 1, false)) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch
index 88ef4768c..cc811f49b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/inventory/AnvilMenu.java b/net/minecraft/world/inventory/AnvilMenu.java
+index 2346e1fc0c94084c3bb95c00be8aac36ae5f26ae..c75ad34d2e8b51999abbbca960bdda4973e356dc 100644
 --- a/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/net/minecraft/world/inventory/AnvilMenu.java
-@@ -21,6 +_,12 @@
+@@ -21,6 +21,12 @@ import net.minecraft.world.level.block.AnvilBlock;
  import net.minecraft.world.level.block.state.BlockState;
  import org.slf4j.Logger;
  
@@ -13,7 +21,7 @@
  public class AnvilMenu extends ItemCombinerMenu {
      public static final int INPUT_SLOT = 0;
      public static final int ADDITIONAL_SLOT = 1;
-@@ -50,6 +_,10 @@
+@@ -50,6 +56,10 @@ public class AnvilMenu extends ItemCombinerMenu {
      private org.bukkit.craftbukkit.inventory.view.CraftAnvilView bukkitEntity;
      // CraftBukkit end
      public boolean bypassEnchantmentLevelRestriction = false; // Paper - bypass anvil level restrictions
@@ -24,7 +32,7 @@
  
      public AnvilMenu(int containerId, Inventory playerInventory) {
          this(containerId, playerInventory, ContainerLevelAccess.NULL);
-@@ -75,12 +_,17 @@
+@@ -75,12 +85,17 @@ public class AnvilMenu extends ItemCombinerMenu {
  
      @Override
      protected boolean mayPickup(Player player, boolean hasStack) {
@@ -43,7 +51,7 @@
              player.giveExperienceLevels(-this.cost.get());
          }
  
-@@ -133,13 +_,19 @@
+@@ -133,13 +148,19 @@ public class AnvilMenu extends ItemCombinerMenu {
  
      @Override
      public void createResult() {
@@ -64,7 +72,7 @@
              ItemStack itemStack = item.copy();
              ItemStack item1 = this.inputSlots.getItem(1);
              ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(EnchantmentHelper.getEnchantmentsForCrafting(itemStack));
-@@ -197,23 +_,34 @@
+@@ -197,23 +218,34 @@ public class AnvilMenu extends ItemCombinerMenu {
                          int intValue = entry.getIntValue();
                          intValue = level == intValue ? intValue + 1 : Math.max(intValue, level);
                          Enchantment enchantment = holder.value();
@@ -103,7 +111,7 @@
                                  intValue = enchantment.getMaxLevel();
                              }
  
-@@ -242,6 +_,54 @@
+@@ -242,6 +274,54 @@ public class AnvilMenu extends ItemCombinerMenu {
                  if (!this.itemName.equals(item.getHoverName().getString())) {
                      i1 = 1;
                      i += i1;
@@ -158,7 +166,7 @@
                      itemStack.set(DataComponents.CUSTOM_NAME, Component.literal(this.itemName));
                  }
              } else if (item.has(DataComponents.CUSTOM_NAME)) {
-@@ -266,6 +_,12 @@
+@@ -266,6 +346,12 @@ public class AnvilMenu extends ItemCombinerMenu {
                  this.onlyRenaming = true;
              }
  
@@ -171,7 +179,7 @@
              if (this.cost.get() >= this.maximumRepairCost && !this.player.hasInfiniteMaterials()) { // CraftBukkit
                  itemStack = ItemStack.EMPTY;
              }
-@@ -286,6 +_,13 @@
+@@ -286,6 +372,13 @@ public class AnvilMenu extends ItemCombinerMenu {
  
              org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), itemStack); // CraftBukkit
              this.broadcastChanges();
@@ -185,7 +193,7 @@
          } else {
              org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), ItemStack.EMPTY); // CraftBukkit
              this.cost.set(AnvilMenu.DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
-@@ -294,7 +_,7 @@
+@@ -294,7 +387,7 @@ public class AnvilMenu extends ItemCombinerMenu {
      }
  
      public static int calculateIncreasedRepairCost(int oldRepairCost) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ArmorSlot.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ArmorSlot.java.patch
index 2b2579163..cca628093 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ArmorSlot.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ArmorSlot.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/inventory/ArmorSlot.java b/net/minecraft/world/inventory/ArmorSlot.java
+index 0a440ea37d14cd840cf87a99264ace5ccde7c073..dec920727401de7f5bcc6c7e50f9dd325367ee90 100644
 --- a/net/minecraft/world/inventory/ArmorSlot.java
 +++ b/net/minecraft/world/inventory/ArmorSlot.java
-@@ -47,7 +_,7 @@
+@@ -47,7 +47,7 @@ class ArmorSlot extends Slot {
      @Override
      public boolean mayPickup(Player player) {
          ItemStack item = this.getItem();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch
index b6a6515d1..b8b3025fc 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/inventory/EnchantmentMenu.java b/net/minecraft/world/inventory/EnchantmentMenu.java
+index cf9ab4c9fba11f5a0b293978853e205de81d6fc7..d0d6ae9c9c432f8bd5d9c91113fc5491e321afad 100644
 --- a/net/minecraft/world/inventory/EnchantmentMenu.java
 +++ b/net/minecraft/world/inventory/EnchantmentMenu.java
-@@ -63,6 +_,22 @@
+@@ -63,6 +63,22 @@ public class EnchantmentMenu extends AbstractContainerMenu {
                  return access.getLocation();
              }
              // CraftBukkit end
@@ -23,7 +31,7 @@
          };
          // Paper end - Add missing InventoryHolders
          this.access = access;
-@@ -83,6 +_,16 @@
+@@ -83,6 +99,16 @@ public class EnchantmentMenu extends AbstractContainerMenu {
                  return EnchantmentMenu.EMPTY_SLOT_LAPIS_LAZULI;
              }
          });
@@ -40,7 +48,7 @@
          this.addStandardInventorySlots(playerInventory, 8, 84);
          this.addDataSlot(DataSlot.shared(this.costs, 0));
          this.addDataSlot(DataSlot.shared(this.costs, 1));
-@@ -299,7 +_,7 @@
+@@ -299,7 +325,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
      @Override
      public void removed(Player player) {
          super.removed(player);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch
index f30e76901..b6a58bc96 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/inventory/GrindstoneMenu.java b/net/minecraft/world/inventory/GrindstoneMenu.java
+index 18c15a7657e6fd994a8f17d0812c822d6adc8eab..e3892bc545d614a2e9e1bbc8589f1189b1b73038 100644
 --- a/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/net/minecraft/world/inventory/GrindstoneMenu.java
-@@ -91,11 +_,13 @@
+@@ -91,11 +91,13 @@ public class GrindstoneMenu extends AbstractContainerMenu {
              @Override
              public void onTake(Player player, ItemStack stack) {
                  access.execute((level, blockPos) -> {
@@ -15,7 +23,7 @@
                          // Paper end - Fire BlockExpEvent on grindstone use
                      }
  
-@@ -124,7 +_,7 @@
+@@ -124,7 +126,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
                  for (Entry<Holder<Enchantment>> entry : enchantmentsForCrafting.entrySet()) {
                      Holder<Enchantment> holder = entry.getKey();
                      int intValue = entry.getIntValue();
@@ -24,7 +32,7 @@
                          i += holder.value().getMinCost(intValue);
                      }
                  }
-@@ -202,15 +_,75 @@
+@@ -202,15 +204,75 @@ public class GrindstoneMenu extends AbstractContainerMenu {
  
              for (Entry<Holder<Enchantment>> entry : enchantmentsForCrafting.entrySet()) {
                  Holder<Enchantment> holder = entry.getKey();
@@ -102,7 +110,7 @@
          if (item.is(Items.ENCHANTED_BOOK) && itemEnchantments.isEmpty()) {
              item = item.transmuteCopy(Items.BOOK);
          }
-@@ -222,6 +_,23 @@
+@@ -222,6 +284,23 @@ public class GrindstoneMenu extends AbstractContainerMenu {
          }
  
          item.set(DataComponents.REPAIR_COST, i);
@@ -126,7 +134,7 @@
          return item;
      }
  
-@@ -278,7 +_,9 @@
+@@ -278,7 +357,9 @@ public class GrindstoneMenu extends AbstractContainerMenu {
                  return ItemStack.EMPTY;
              }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch
index 9899e30a5..ef679a8f0 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/inventory/ItemCombinerMenu.java b/net/minecraft/world/inventory/ItemCombinerMenu.java
+index 34d52c941395645e77de810855b14012c259cf02..c605bd700fd9f5a6596a2bf9648492786306b025 100644
 --- a/net/minecraft/world/inventory/ItemCombinerMenu.java
 +++ b/net/minecraft/world/inventory/ItemCombinerMenu.java
-@@ -156,7 +_,9 @@
+@@ -156,7 +156,9 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
                  return ItemStack.EMPTY;
              }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch
index bb43e3ee4..32f367c83 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/BowItem.java b/net/minecraft/world/item/BowItem.java
+index c4c8775de328d40bb8218d993872be5249e8174d..ce1ce18410fc1d47d999c918a8f880b43bf9797c 100644
 --- a/net/minecraft/world/item/BowItem.java
 +++ b/net/minecraft/world/item/BowItem.java
-@@ -28,6 +_,11 @@
+@@ -28,6 +28,11 @@ public class BowItem extends ProjectileWeaponItem {
              return false;
          } else {
              ItemStack projectile = player.getProjectile(stack);
@@ -12,7 +20,7 @@
              if (projectile.isEmpty()) {
                  return false;
              } else {
-@@ -38,7 +_,7 @@
+@@ -38,7 +43,7 @@ public class BowItem extends ProjectileWeaponItem {
                  } else {
                      List<ItemStack> list = draw(stack, projectile, player);
                      if (level instanceof ServerLevel serverLevel && !list.isEmpty()) {
@@ -21,7 +29,7 @@
                      }
  
                      level.playSound(
-@@ -89,7 +_,7 @@
+@@ -89,7 +94,7 @@ public class BowItem extends ProjectileWeaponItem {
      public InteractionResult use(Level level, Player player, InteractionHand hand) {
          ItemStack itemInHand = player.getItemInHand(hand);
          boolean flag = !player.getProjectile(itemInHand).isEmpty();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BucketItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BucketItem.java.patch
index a0e1bb7ac..cc8e98983 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BucketItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BucketItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/BucketItem.java b/net/minecraft/world/item/BucketItem.java
+index de287715568f358dd83383d68f845df9a7b5a117..8c7be8a71348a3e66c8bf6b6cb39fe002c20bdb0 100644
 --- a/net/minecraft/world/item/BucketItem.java
 +++ b/net/minecraft/world/item/BucketItem.java
-@@ -147,7 +_,7 @@
+@@ -147,7 +147,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
              // CraftBukkit end
              if (!flag) {
                  return hitResult != null && this.emptyContents(entity, level, hitResult.getBlockPos().relative(hitResult.getDirection()), null, direction, clicked, itemstack, hand); // CraftBukkit
@@ -9,7 +17,7 @@
                  int x = pos.getX();
                  int y = pos.getY();
                  int z = pos.getZ();
-@@ -156,7 +_,7 @@
+@@ -156,7 +156,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
                  );
  
                  for (int i = 0; i < 8; i++) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch
index c2e3f0e41..defe28570 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/CrossbowItem.java b/net/minecraft/world/item/CrossbowItem.java
+index 0b5bb8588a46661771b1261104c6b4bc77d0e093..70dcdd2b635c49fefd359c974ee034a73561d998 100644
 --- a/net/minecraft/world/item/CrossbowItem.java
 +++ b/net/minecraft/world/item/CrossbowItem.java
-@@ -66,7 +_,7 @@
+@@ -66,7 +66,7 @@ public class CrossbowItem extends ProjectileWeaponItem {
          ItemStack itemInHand = player.getItemInHand(hand);
          ChargedProjectiles chargedProjectiles = itemInHand.get(DataComponents.CHARGED_PROJECTILES);
          if (chargedProjectiles != null && !chargedProjectiles.isEmpty()) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/DyeColor.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/DyeColor.java.patch
index e53cc098b..cff91067f 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/DyeColor.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/DyeColor.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/DyeColor.java b/net/minecraft/world/item/DyeColor.java
+index 76bb211843eee94334fbba87e5fa5ba5430f89ba..c9cde255117b46690b2b6670d009a00b051af016 100644
 --- a/net/minecraft/world/item/DyeColor.java
 +++ b/net/minecraft/world/item/DyeColor.java
-@@ -126,4 +_,10 @@
+@@ -126,4 +126,10 @@ public enum DyeColor implements StringRepresentable {
      private static CraftingInput makeCraftColorInput(DyeColor first, DyeColor second) {
          return CraftingInput.of(2, 1, List.of(new ItemStack(DyeItem.byColor(first)), new ItemStack(DyeItem.byColor(second))));
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EggItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EggItem.java.patch
index 7bd1d11bf..6bda7cb7c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EggItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EggItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/EggItem.java b/net/minecraft/world/item/EggItem.java
+index 2dc15a06572401c22fa4b8009fa1cdc3ceef0473..75ce17c1fa8c74981c44f3dab7e82351eef3b2f3 100644
 --- a/net/minecraft/world/item/EggItem.java
 +++ b/net/minecraft/world/item/EggItem.java
-@@ -24,7 +_,7 @@
+@@ -24,7 +24,7 @@ public class EggItem extends Item implements ProjectileItem {
      public InteractionResult use(Level level, Player player, InteractionHand hand) {
          ItemStack itemInHand = player.getItemInHand(hand);
          // Paper start
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EndCrystalItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EndCrystalItem.java.patch
index baee5e0ab..df1d792d6 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EndCrystalItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EndCrystalItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/EndCrystalItem.java b/net/minecraft/world/item/EndCrystalItem.java
+index 05ec512839898f96d9769bb0d00f6ba11dda0c4b..6e4a3c9c090a68bf5785a01d815c275411859c7b 100644
 --- a/net/minecraft/world/item/EndCrystalItem.java
 +++ b/net/minecraft/world/item/EndCrystalItem.java
-@@ -24,7 +_,7 @@
+@@ -24,7 +24,7 @@ public class EndCrystalItem extends Item {
          Level level = context.getLevel();
          BlockPos clickedPos = context.getClickedPos();
          BlockState blockState = level.getBlockState(clickedPos);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch
index de340dafe..7b5865c70 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/EnderpearlItem.java b/net/minecraft/world/item/EnderpearlItem.java
+index 0b4464b23a85c237026b31ab224f599fea42d2ee..411ddda1003ac1b9bb75735154ffe8996ab8b6f3 100644
 --- a/net/minecraft/world/item/EnderpearlItem.java
 +++ b/net/minecraft/world/item/EnderpearlItem.java
-@@ -24,7 +_,7 @@
+@@ -24,7 +24,7 @@ public class EnderpearlItem extends Item {
          if (level instanceof ServerLevel serverLevel) {
              // CraftBukkit start
              // Paper start - PlayerLaunchProjectileEvent
@@ -9,7 +17,7 @@
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemInHand), (org.bukkit.entity.Projectile) thrownEnderpearl.projectile().getBukkitEntity());
              if (event.callEvent() && thrownEnderpearl.attemptSpawn()) {
                  if (event.shouldConsume()) {
-@@ -44,6 +_,7 @@
+@@ -44,6 +44,7 @@ public class EnderpearlItem extends Item {
                      0.4F / (level.getRandom().nextFloat() * 0.4F + 0.8F)
                  );
                  player.awardStat(Stats.ITEM_USED.get(this));
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch
index 404e14df5..b751ce289 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
+index da16f4831c875e07c25d7ed041bed493db614658..373822831e3025e0365f2bf1a41013450f8b0e00 100644
 --- a/net/minecraft/world/item/ItemStack.java
 +++ b/net/minecraft/world/item/ItemStack.java
-@@ -450,6 +_,7 @@
+@@ -450,6 +450,7 @@ public final class ItemStack implements DataComponentHolder {
                      // revert back all captured blocks
                      for (org.bukkit.block.BlockState blockstate : blocks) {
                          ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace();
@@ -8,7 +16,7 @@
                      }
  
                      SignItem.openSign = null; // SPIGOT-6758 - Reset on early return
-@@ -473,6 +_,7 @@
+@@ -473,6 +474,7 @@ public final class ItemStack implements DataComponentHolder {
                          if (!(block.getBlock() instanceof net.minecraft.world.level.block.BaseEntityBlock)) { // Containers get placed automatically
                              block.onPlace(serverLevel, newPos, oldBlock, true, context);
                          }
@@ -16,7 +24,7 @@
  
                          serverLevel.notifyAndUpdatePhysics(newPos, null, oldBlock, block, serverLevel.getBlockState(newPos), updateFlags, net.minecraft.world.level.block.Block.UPDATE_LIMIT); // send null chunk as chunk.k() returns false by this point
                      }
-@@ -593,6 +_,26 @@
+@@ -593,6 +595,26 @@ public final class ItemStack implements DataComponentHolder {
          return this.isDamageableItem() && this.getDamageValue() > 0;
      }
  
@@ -43,16 +51,16 @@
      public int getDamageValue() {
          return Mth.clamp(this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage());
      }
-@@ -1205,6 +_,12 @@
-     public boolean isEnchanted() {
+@@ -1206,6 +1228,12 @@ public final class ItemStack implements DataComponentHolder {
          return !this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).isEmpty();
      }
-+
+ 
 +    // Purpur start - Config to allow unsafe enchants
 +    public boolean hasEnchantment(Holder<Enchantment> enchantment) {
 +        return this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).getLevel(enchantment) > 0;
 +    }
 +    // Purpur end - Config to allow unsafe enchants
- 
++
      public ItemEnchantments getEnchantments() {
          return this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY);
+     }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch
index d55a9feff..91ca8c7b6 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/Items.java b/net/minecraft/world/item/Items.java
+index b89a7fae0321cbce09faf1503ddc57ca5acaa148..4d5a0b1bc794a3029b0724c6dddeffa6f549a7d5 100644
 --- a/net/minecraft/world/item/Items.java
 +++ b/net/minecraft/world/item/Items.java
-@@ -383,7 +_,7 @@
+@@ -383,7 +383,7 @@ public class Items {
      public static final Item PURPUR_BLOCK = registerBlock(Blocks.PURPUR_BLOCK);
      public static final Item PURPUR_PILLAR = registerBlock(Blocks.PURPUR_PILLAR);
      public static final Item PURPUR_STAIRS = registerBlock(Blocks.PURPUR_STAIRS);
@@ -9,7 +17,7 @@
      public static final Item CREAKING_HEART = registerBlock(Blocks.CREAKING_HEART);
      public static final Item CHEST = registerBlock(Blocks.CHEST, properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY));
      public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE);
-@@ -2092,7 +_,7 @@
+@@ -2092,7 +2092,7 @@ public class Items {
          "sweet_berries", createBlockItemWithCustomItemName(Blocks.SWEET_BERRY_BUSH), new Item.Properties().food(Foods.SWEET_BERRIES)
      );
      public static final Item GLOW_BERRIES = registerItem(
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/MapItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/MapItem.java.patch
index e4abe0ae9..abc98ee9b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/MapItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/MapItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/MapItem.java b/net/minecraft/world/item/MapItem.java
+index ba0b254d43651bca1f29b5272af05d068fc37ba8..780793750c99185e8139a1cd0ad52bc7b80899a9 100644
 --- a/net/minecraft/world/item/MapItem.java
 +++ b/net/minecraft/world/item/MapItem.java
-@@ -194,6 +_,7 @@
+@@ -194,6 +194,7 @@ public class MapItem extends Item {
      public static void renderBiomePreviewMap(ServerLevel serverLevel, ItemStack stack) {
          MapItemSavedData savedData = getSavedData(stack, serverLevel);
          if (savedData != null) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/NameTagItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/NameTagItem.java.patch
index 2a8639361..6ed030138 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/NameTagItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/NameTagItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/NameTagItem.java b/net/minecraft/world/item/NameTagItem.java
+index a928124ee46a10e9033f771970198e36712917a6..65ff8078474d5039238e9398d8cfc12e79cc6524 100644
 --- a/net/minecraft/world/item/NameTagItem.java
 +++ b/net/minecraft/world/item/NameTagItem.java
-@@ -24,6 +_,7 @@
+@@ -24,6 +24,7 @@ public class NameTagItem extends Item {
  
                  LivingEntity newEntity = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
                  newEntity.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch
index 3fa0c2dfa..f03218c49 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/ProjectileWeaponItem.java b/net/minecraft/world/item/ProjectileWeaponItem.java
+index f35c8b81a55a9b8dbeb7c918d657cf65189642bd..f12b9e4e8a78c713782af548d1cb15ef363305b4 100644
 --- a/net/minecraft/world/item/ProjectileWeaponItem.java
 +++ b/net/minecraft/world/item/ProjectileWeaponItem.java
-@@ -106,6 +_,8 @@
+@@ -106,6 +106,8 @@ public abstract class ProjectileWeaponItem extends Item {
              abstractArrow.setCritArrow(true);
          }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ShovelItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ShovelItem.java.patch
index c583f3853..8b262d960 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ShovelItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ShovelItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/ShovelItem.java b/net/minecraft/world/item/ShovelItem.java
+index 887ac9f547ceaf76fd533ae47239a64c29a64b18..a290ad578498da07093ea31080cc3fbc87aa3778 100644
 --- a/net/minecraft/world/item/ShovelItem.java
 +++ b/net/minecraft/world/item/ShovelItem.java
-@@ -46,9 +_,12 @@
+@@ -46,9 +46,12 @@ public class ShovelItem extends Item {
              BlockState blockState1 = FLATTENABLES.get(blockState.getBlock());
              BlockState blockState2 = null;
              Runnable afterAction = null; // Paper
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SnowballItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SnowballItem.java.patch
index 9c09ecb72..e318e2bc2 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SnowballItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SnowballItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/SnowballItem.java b/net/minecraft/world/item/SnowballItem.java
+index bef1a8faa8e9567c9707ffb2b34c278c75581e35..fa3a9501134226f269882a14900b924df7d25046 100644
 --- a/net/minecraft/world/item/SnowballItem.java
 +++ b/net/minecraft/world/item/SnowballItem.java
-@@ -26,7 +_,7 @@
+@@ -26,7 +26,7 @@ public class SnowballItem extends Item implements ProjectileItem {
          // CraftBukkit start - moved down
          if (level instanceof ServerLevel serverLevel) {
              // Paper start - PlayerLaunchProjectileEvent
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ThrowablePotionItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ThrowablePotionItem.java.patch
index 5cf5ead6e..1cf6ac9bd 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ThrowablePotionItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ThrowablePotionItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/ThrowablePotionItem.java b/net/minecraft/world/item/ThrowablePotionItem.java
+index 92a2a9c84d8f0a44dffee22834f5ae6c6b4fec43..e2cdb3d43eca6e0e52fb00fbf3801f4b0983c19b 100644
 --- a/net/minecraft/world/item/ThrowablePotionItem.java
 +++ b/net/minecraft/world/item/ThrowablePotionItem.java
-@@ -24,7 +_,7 @@
+@@ -24,7 +24,7 @@ public abstract class ThrowablePotionItem extends PotionItem implements Projecti
          ItemStack itemInHand = player.getItemInHand(hand);
          if (level instanceof ServerLevel serverLevel) {
              // Paper start - PlayerLaunchProjectileEvent
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/TridentItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/TridentItem.java.patch
index 16aa72e60..b39354074 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/TridentItem.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/TridentItem.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
+index 2c38f40e87e711942c41c0740fbb2b4080ab9bcf..44b616ad2740d6ba9c8b2579ecd14edde64fffbb 100644
 --- a/net/minecraft/world/item/TridentItem.java
 +++ b/net/minecraft/world/item/TridentItem.java
-@@ -83,7 +_,7 @@
+@@ -83,7 +83,7 @@ public class TridentItem extends Item implements ProjectileItem {
                          if (tridentSpinAttackStrength == 0.0F) {
                              ItemStack itemStack = stack.copyWithCount(1); // Paper
                              Projectile.Delayed<ThrownTrident> tridentDelayed = Projectile.spawnProjectileFromRotationDelayed( // Paper - PlayerLaunchProjectileEvent(
@@ -9,7 +17,7 @@
                              );
                              // Paper start - PlayerLaunchProjectileEvent
                              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), (org.bukkit.entity.Projectile) tridentDelayed.projectile().getBukkitEntity());
-@@ -93,6 +_,7 @@
+@@ -93,6 +93,7 @@ public class TridentItem extends Item implements ProjectileItem {
                                  return false;
                              }
                              ThrownTrident thrownTrident = tridentDelayed.projectile(); // Paper - PlayerLaunchProjectileEvent
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch
index 65243f097..2df1cf905 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java b/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
+index 41e1e076a4567d3d3202cf8e426a1ebb391d85e8..2d710dd3f20cbea06c16f14a558b575b369c6ca2 100644
 --- a/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
 +++ b/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java
-@@ -20,6 +_,12 @@
+@@ -20,6 +20,12 @@ public record ClearAllStatusEffectsConsumeEffect() implements ConsumeEffect {
      @Override
      // CraftBukkit start
      public boolean apply(Level level, ItemStack stack, LivingEntity entity, org.bukkit.event.entity.EntityPotionEffectEvent.Cause cause) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch
index fcee0a726..16063c0d9 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/crafting/Ingredient.java b/net/minecraft/world/item/crafting/Ingredient.java
+index 879c8fe1f20decc793cfa39e686b61d521bd76ba..9c383a1028988cdd3de8b29ba72a4d7bd2a37c7e 100644
 --- a/net/minecraft/world/item/crafting/Ingredient.java
 +++ b/net/minecraft/world/item/crafting/Ingredient.java
-@@ -36,6 +_,7 @@
+@@ -36,6 +36,7 @@ public final class Ingredient implements StackedContents.IngredientInfo<io.paper
      // CraftBukkit start
      @javax.annotation.Nullable
      private java.util.Set<ItemStack> itemStacks; // Paper - Improve exact choice recipe ingredients
@@ -8,7 +16,7 @@
  
      public boolean isExact() {
          return this.itemStacks != null;
-@@ -88,6 +_,11 @@
+@@ -88,6 +89,11 @@ public final class Ingredient implements StackedContents.IngredientInfo<io.paper
              return this.itemStacks.contains(stack); // Paper - Improve exact choice recipe ingredients (hashing FTW!)
          }
          // CraftBukkit end
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/EnchantmentHelper.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/EnchantmentHelper.java.patch
index 0a9b7d077..56bdecfaa 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/EnchantmentHelper.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/EnchantmentHelper.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/net/minecraft/world/item/enchantment/EnchantmentHelper.java
+index 66234431b265e0596275ca468cd40f8da98c22e2..e0cc0b49ea47bb38f7f4fe5ef3c793b0009d03c9 100644
 --- a/net/minecraft/world/item/enchantment/EnchantmentHelper.java
 +++ b/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-@@ -606,4 +_,58 @@
+@@ -606,4 +606,58 @@ public class EnchantmentHelper {
      interface EnchantmentVisitor {
          void accept(Holder<Enchantment> enchantment, int level);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch
index 9671562b1..5790ba50d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/enchantment/ItemEnchantments.java b/net/minecraft/world/item/enchantment/ItemEnchantments.java
+index 6040b73a5351c3eb166250566b5c2385cee39ee0..29619b87fe19c66934fe5aaee8a9641960091bf5 100644
 --- a/net/minecraft/world/item/enchantment/ItemEnchantments.java
 +++ b/net/minecraft/world/item/enchantment/ItemEnchantments.java
-@@ -32,7 +_,7 @@
+@@ -32,7 +32,7 @@ public class ItemEnchantments implements TooltipProvider {
      private static final java.util.Comparator<Holder<Enchantment>> ENCHANTMENT_ORDER = java.util.Comparator.comparing(Holder::getRegisteredName);
      public static final ItemEnchantments EMPTY = new ItemEnchantments(new it.unimi.dsi.fastutil.objects.Object2IntAVLTreeMap<>(ENCHANTMENT_ORDER));
      // Paper end - sort enchantments
@@ -9,7 +17,7 @@
      public static final Codec<ItemEnchantments> CODEC = Codec.unboundedMap(Enchantment.CODEC, LEVEL_CODEC)
          .xmap(
              map -> new net.minecraft.world.item.enchantment.ItemEnchantments(net.minecraft.Util.make(new it.unimi.dsi.fastutil.objects.Object2IntAVLTreeMap<>(ENCHANTMENT_ORDER), m -> m.putAll(map))), // Paper - sort enchantments
-@@ -50,7 +_,7 @@
+@@ -50,7 +50,7 @@ public class ItemEnchantments implements TooltipProvider {
  
          for (Entry<Holder<Enchantment>> entry : enchantments.object2IntEntrySet()) {
              int intValue = entry.getIntValue();
@@ -18,7 +26,7 @@
                  throw new IllegalArgumentException("Enchantment " + entry.getKey() + " has invalid level " + intValue);
              }
          }
-@@ -133,13 +_,13 @@
+@@ -133,13 +133,13 @@ public class ItemEnchantments implements TooltipProvider {
              if (level <= 0) {
                  this.enchantments.removeInt(enchantment);
              } else {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch
index d173c48d1..f98f96602 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/item/trading/MerchantOffer.java b/net/minecraft/world/item/trading/MerchantOffer.java
+index 64c99df8ff305fa28c75dc03fc5ef8c61634ad84..e1452d0694cad3db1800f8610fc095bf98f5f15f 100644
 --- a/net/minecraft/world/item/trading/MerchantOffer.java
 +++ b/net/minecraft/world/item/trading/MerchantOffer.java
-@@ -143,8 +_,13 @@
+@@ -143,8 +143,13 @@ public class MerchantOffer {
      }
  
      public void updateDemand() {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch
index e016949ae..898447b76 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/BaseSpawner.java b/net/minecraft/world/level/BaseSpawner.java
+index 42f44222a8dd61f70d4583b0ca82a16400baaa5a..41ba9f234e840fadee3c8a52ba9655b97a8b7381 100644
 --- a/net/minecraft/world/level/BaseSpawner.java
 +++ b/net/minecraft/world/level/BaseSpawner.java
-@@ -61,6 +_,7 @@
+@@ -61,6 +61,7 @@ public abstract class BaseSpawner {
      }
  
      public boolean isNearPlayer(Level level, BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/EntityGetter.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/EntityGetter.java.patch
index 73e6f74b1..922445db5 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/EntityGetter.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/EntityGetter.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/EntityGetter.java b/net/minecraft/world/level/EntityGetter.java
+index 9175a7e4e6076626cb46144c5858c2f2474f1858..452b6df03152dbd2311774bf4872983d3df92665 100644
 --- a/net/minecraft/world/level/EntityGetter.java
 +++ b/net/minecraft/world/level/EntityGetter.java
-@@ -185,7 +_,7 @@
+@@ -185,7 +185,7 @@ public interface EntityGetter extends ca.spottedleaf.moonrise.patches.chunk_syst
  
      default boolean hasNearbyAlivePlayer(double x, double y, double z, double distance) {
          for (Player player : this.players()) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
index dc002e072..00a862191 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
+index be16627136f7b3979e62308f58b96a2b16ee9f62..a0f3795f3aee1541ddab81da3cd8391f0a70e03d 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -160,11 +_,55 @@
+@@ -160,11 +160,55 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
      }
      // Paper end - add paper world config
  
@@ -56,7 +64,7 @@
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -840,6 +_,8 @@
+@@ -840,6 +884,8 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
          // Paper end - getblock optimisations - cache world height/sections
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -65,7 +73,7 @@
          this.generator = generator;
          this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
  
-@@ -2124,4 +_,14 @@
+@@ -2124,4 +2170,14 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
              return this.id;
          }
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch
index 6ce413c7d..8e1cecbe3 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
+index 4f647507d06d45a65b4b1793219d90c65e110225..f0f5aa48af099c8244cd59da2c1dac6744a41abe 100644
 --- a/net/minecraft/world/level/NaturalSpawner.java
 +++ b/net/minecraft/world/level/NaturalSpawner.java
-@@ -261,7 +_,7 @@
+@@ -261,7 +261,7 @@ public final class NaturalSpawner {
                      mutableBlockPos.set(x, y, z);
                      double d = x + 0.5;
                      double d1 = z + 0.5;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/ServerExplosion.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/ServerExplosion.java.patch
index 5fb2b122d..7bb435028 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/ServerExplosion.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/ServerExplosion.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
+index 07e4025ca6c9c31905db2e6921138a0ded479dde..b80924fbe054b00fe5117df896358e330f41e993 100644
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
-@@ -648,6 +_,23 @@
+@@ -648,6 +648,23 @@ public class ServerExplosion implements Explosion {
          this.directMappedBlockCache = new ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache[BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH];
          this.mutablePos = new BlockPos.MutableBlockPos();
          // Paper end - collision optimisations
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AnvilBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AnvilBlock.java.patch
index a21b8a6a3..e34a1a502 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AnvilBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AnvilBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/AnvilBlock.java b/net/minecraft/world/level/block/AnvilBlock.java
+index e8bac6deb63e0f94fb5f8b38602b2e3333e5fa8d..b14736c25cfdd94c6e3f159e53865150b06edef6 100644
 --- a/net/minecraft/world/level/block/AnvilBlock.java
 +++ b/net/minecraft/world/level/block/AnvilBlock.java
-@@ -54,6 +_,53 @@
+@@ -54,6 +54,53 @@ public class AnvilBlock extends FallingBlock {
          return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getClockWise());
      }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AzaleaBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AzaleaBlock.java.patch
index 066e2cfd6..35cb9cc33 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AzaleaBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AzaleaBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/AzaleaBlock.java b/net/minecraft/world/level/block/AzaleaBlock.java
+index 435a455ad2ec3dfb142d570a51a720bc6c49dac3..32a1dc20202bad7a15794e98cdc1bf2fb2ad5308 100644
 --- a/net/minecraft/world/level/block/AzaleaBlock.java
 +++ b/net/minecraft/world/level/block/AzaleaBlock.java
-@@ -50,6 +_,20 @@
+@@ -50,6 +50,20 @@ public class AzaleaBlock extends VegetationBlock implements BonemealableBlock {
  
      @Override
      public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos, BlockState state) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch
index fd6497469..6e51d1d3f 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java b/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
+index fb6e9194440b85487660f91aea7e34fdf086187b..2653ae5bf66f2b117f86e4df04d9cc307ba09011 100644
 --- a/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
 +++ b/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
-@@ -39,6 +_,7 @@
+@@ -39,6 +39,7 @@ public abstract class BaseCoralPlantTypeBlock extends Block implements SimpleWat
      }
  
      protected static boolean scanForWater(BlockState state, BlockGetter level, BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BedBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BedBlock.java.patch
index e0980cdaf..bc38f1263 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BedBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BedBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/BedBlock.java b/net/minecraft/world/level/block/BedBlock.java
+index e72ead9ff6541f821a61ad3c50fe068a8c8bb69d..a6f4db5c99d332ac26a52d5174f75e7dc9f51fe5 100644
 --- a/net/minecraft/world/level/block/BedBlock.java
 +++ b/net/minecraft/world/level/block/BedBlock.java
-@@ -98,7 +_,7 @@
+@@ -98,7 +98,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
                  }
  
                  Vec3 center = pos.getCenter();
@@ -9,7 +17,7 @@
                  return InteractionResult.SUCCESS_SERVER;
              } else if (state.getValue(OCCUPIED)) {
                  if (!BedBlock.canSetSpawn(level)) return this.explodeBed(state, level, pos); // Paper - check explode first
-@@ -146,7 +_,7 @@
+@@ -146,7 +146,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
          }
  
          Vec3 center = pos.getCenter();
@@ -18,7 +26,7 @@
          return InteractionResult.SUCCESS_SERVER;
       }
      // CraftBukkit end
-@@ -167,7 +_,7 @@
+@@ -167,7 +167,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
      @Override
      public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch
index 20fb7e9e1..5fed7564b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/BigDripleafBlock.java b/net/minecraft/world/level/block/BigDripleafBlock.java
+index e1193bcb666b7d38c511df7c1ebddb5897cefa8f..29248afa290b3143375f0538b4dfc80a63f8945f 100644
 --- a/net/minecraft/world/level/block/BigDripleafBlock.java
 +++ b/net/minecraft/world/level/block/BigDripleafBlock.java
-@@ -254,7 +_,7 @@
+@@ -254,7 +254,7 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone
              playTiltSound(level, pos, sound);
          }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch
index 5459a3f25..41da42e1a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/Blocks.java b/net/minecraft/world/level/block/Blocks.java
+index ff2743d808f3c309bf098b98a6fcba7d019f54c1..941c57083803d69503e83c3ccbbb2759ba3db605 100644
 --- a/net/minecraft/world/level/block/Blocks.java
 +++ b/net/minecraft/world/level/block/Blocks.java
-@@ -6571,6 +_,7 @@
+@@ -6571,6 +6571,7 @@ public class Blocks {
          BlockBehaviour.Properties.of()
              .mapColor(MapColor.PLANT)
              .forceSolidOff()
@@ -8,7 +16,7 @@
              .instabreak()
              .sound(SoundType.AZALEA)
              .noOcclusion()
-@@ -6582,6 +_,7 @@
+@@ -6582,6 +6583,7 @@ public class Blocks {
          BlockBehaviour.Properties.of()
              .mapColor(MapColor.PLANT)
              .forceSolidOff()
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch
index 86ef53933..22b6ae7b1 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/BubbleColumnBlock.java b/net/minecraft/world/level/block/BubbleColumnBlock.java
+index ab93da06d9e9858668aa796db497f282afa7020a..23a9c30baf8d33855703d45c2739fd5072d81adc 100644
 --- a/net/minecraft/world/level/block/BubbleColumnBlock.java
 +++ b/net/minecraft/world/level/block/BubbleColumnBlock.java
-@@ -98,9 +_,9 @@
+@@ -98,9 +98,9 @@ public class BubbleColumnBlock extends Block implements BucketPickup {
          if (blockState.is(Blocks.BUBBLE_COLUMN)) {
              return blockState;
          } else if (blockState.is(Blocks.SOUL_SAND)) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch
index 4fec7e3b9..8d58cd9ae 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CactusBlock.java b/net/minecraft/world/level/block/CactusBlock.java
+index d4fbf130e23a959be8268085067b3bea1541be9a..2e79ce7e02aaa4abcef1507bba71e0305b6c696f 100644
 --- a/net/minecraft/world/level/block/CactusBlock.java
 +++ b/net/minecraft/world/level/block/CactusBlock.java
-@@ -22,7 +_,7 @@
+@@ -22,7 +22,7 @@ import net.minecraft.world.level.pathfinder.PathComputationType;
  import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
  
@@ -9,7 +17,7 @@
      public static final MapCodec<CactusBlock> CODEC = simpleCodec(CactusBlock::new);
      public static final IntegerProperty AGE = BlockStateProperties.AGE_15;
      public static final int MAX_AGE = 15;
-@@ -117,7 +_,7 @@
+@@ -117,7 +117,7 @@ public class CactusBlock extends Block {
      protected boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) {
          for (Direction direction : Direction.Plane.HORIZONTAL) {
              BlockState blockState = level.getBlockState(pos.relative(direction));
@@ -18,7 +26,7 @@
                  return false;
              }
          }
-@@ -141,4 +_,34 @@
+@@ -141,4 +141,34 @@ public class CactusBlock extends Block {
      protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
          return false;
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch
index c78b443f8..4fe0a3acc 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CakeBlock.java b/net/minecraft/world/level/block/CakeBlock.java
+index cdd138a1d25a23fe3ca783383b45226154242ef0..fb820f05c5b9cbb1d4a99e26421ae639a1955365 100644
 --- a/net/minecraft/world/level/block/CakeBlock.java
 +++ b/net/minecraft/world/level/block/CakeBlock.java
-@@ -109,6 +_,7 @@
+@@ -109,6 +109,7 @@ public class CakeBlock extends Block {
              org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, 2 + oldFoodLevel);
  
              if (!event.isCancelled()) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch
index 6557f2a69..e98a492ef 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CampfireBlock.java b/net/minecraft/world/level/block/CampfireBlock.java
+index 028e2ad8bcb23b3f9f80a5ec551204bb2d7db1ae..642550d59e17330437028a84830520f394a41728 100644
 --- a/net/minecraft/world/level/block/CampfireBlock.java
 +++ b/net/minecraft/world/level/block/CampfireBlock.java
-@@ -124,7 +_,7 @@
+@@ -124,7 +124,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
          return this.defaultBlockState()
              .setValue(WATERLOGGED, flag)
              .setValue(SIGNAL_FIRE, this.isSmokeSource(level.getBlockState(clickedPos.below())))
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CauldronBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CauldronBlock.java.patch
index 6ead2196b..b3e57598a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CauldronBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CauldronBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CauldronBlock.java b/net/minecraft/world/level/block/CauldronBlock.java
+index d58b49e550cfa683f753db2a913fddf307a1bba2..62ee64b97dfb2f1426d43cf1f8b0b0b6ec63b5b1 100644
 --- a/net/minecraft/world/level/block/CauldronBlock.java
 +++ b/net/minecraft/world/level/block/CauldronBlock.java
-@@ -32,8 +_,8 @@
+@@ -32,8 +32,8 @@ public class CauldronBlock extends AbstractCauldronBlock {
  
      protected static boolean shouldHandlePrecipitation(Level level, Biome.Precipitation precipitation) {
          return precipitation == Biome.Precipitation.RAIN
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch
index 631c2fafe..554dcf564 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CaveVinesBlock.java b/net/minecraft/world/level/block/CaveVinesBlock.java
+index 4e1a81c01a5c51a977e4fe9d2465e4ef20aab6d4..d67f278e8cb630b680cad22f4117a9545576bf0f 100644
 --- a/net/minecraft/world/level/block/CaveVinesBlock.java
 +++ b/net/minecraft/world/level/block/CaveVinesBlock.java
-@@ -92,4 +_,11 @@
+@@ -92,4 +92,11 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements CaveVines {
      public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos, BlockState state) {
          level.setBlock(pos, state.setValue(BERRIES, true), 2);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch
index 54d2fa463..19f63b6f7 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/ChangeOverTimeBlock.java b/net/minecraft/world/level/block/ChangeOverTimeBlock.java
+index ba7dbfa3f95bf93f3e50b17aa48b772a3047b74d..d42062a86c1278b71bc085cc3fb29a69039873de 100644
 --- a/net/minecraft/world/level/block/ChangeOverTimeBlock.java
 +++ b/net/minecraft/world/level/block/ChangeOverTimeBlock.java
-@@ -51,7 +_,7 @@
+@@ -51,7 +51,7 @@ public interface ChangeOverTimeBlock<T extends Enum<T>> {
          }
  
          float f = (float)(i1 + 1) / (i1 + i + 1);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
index 92f2abf28..b450ae3a2 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/ChestBlock.java b/net/minecraft/world/level/block/ChestBlock.java
+index c4937d1b482e2ec60961bda62ad6cc155f0ce8f7..43f9d4b8a7ab4cd0a1a5dee9d0c0c7790894a2ae 100644
 --- a/net/minecraft/world/level/block/ChestBlock.java
 +++ b/net/minecraft/world/level/block/ChestBlock.java
-@@ -337,6 +_,7 @@
+@@ -337,6 +337,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
      }
  
      public static boolean isBlockedChestByBlock(BlockGetter level, BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CoralBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CoralBlock.java.patch
index 690cfe031..69eb34f5d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CoralBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CoralBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CoralBlock.java b/net/minecraft/world/level/block/CoralBlock.java
+index e0be02eaa07d40d0738931383426517d20fe3b0b..b747af5f3c65f4b79a304b0e903f7b824fb03d8d 100644
 --- a/net/minecraft/world/level/block/CoralBlock.java
 +++ b/net/minecraft/world/level/block/CoralBlock.java
-@@ -65,6 +_,7 @@
+@@ -65,6 +65,7 @@ public class CoralBlock extends Block {
      }
  
      protected boolean scanForWater(BlockGetter level, BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CropBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CropBlock.java.patch
index 667d7f96f..b7dc18f7d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CropBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CropBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/CropBlock.java b/net/minecraft/world/level/block/CropBlock.java
+index a38ce03a4dab6c83a0b54f47fd3c36d6da46fa24..b370b955ac8636275dfada4f38a7ca10297f7dac 100644
 --- a/net/minecraft/world/level/block/CropBlock.java
 +++ b/net/minecraft/world/level/block/CropBlock.java
-@@ -169,7 +_,7 @@
+@@ -169,7 +169,7 @@ public class CropBlock extends VegetationBlock implements BonemealableBlock {
      @Override
      protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier effectApplier) {
          if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(level, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
@@ -9,7 +17,7 @@
              serverLevel.destroyBlock(pos, true, entity);
          }
  
-@@ -204,4 +_,15 @@
+@@ -204,4 +204,15 @@ public class CropBlock extends VegetationBlock implements BonemealableBlock {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(AGE);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch
index 235a738f9..50ec7387a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/DoorBlock.java b/net/minecraft/world/level/block/DoorBlock.java
+index 7f40ccfe379ab284424d730213b343e17239dc0c..2fa6a85b0f1694d0989905a421198c6495271beb 100644
 --- a/net/minecraft/world/level/block/DoorBlock.java
 +++ b/net/minecraft/world/level/block/DoorBlock.java
-@@ -199,6 +_,7 @@
+@@ -199,6 +199,7 @@ public class DoorBlock extends Block {
      protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
          if (!this.type.canOpenByHand()) {
              return InteractionResult.PASS;
@@ -8,7 +16,7 @@
          } else {
              state = state.cycle(OPEN);
              level.setBlock(pos, state, 10);
-@@ -287,4 +_,18 @@
+@@ -287,4 +288,18 @@ public class DoorBlock extends Block {
      public static boolean isWoodenDoor(BlockState state) {
          return state.getBlock() instanceof DoorBlock doorBlock && doorBlock.type().canOpenByHand();
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DragonEggBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DragonEggBlock.java.patch
index d08f61da6..6beae5d0a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DragonEggBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DragonEggBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/DragonEggBlock.java b/net/minecraft/world/level/block/DragonEggBlock.java
+index 5c2f10486e3aed090c6545a86276e6927e424cb2..9ed7ffb10e0a172fe5f3dd4613922428af82e5db 100644
 --- a/net/minecraft/world/level/block/DragonEggBlock.java
 +++ b/net/minecraft/world/level/block/DragonEggBlock.java
-@@ -46,6 +_,7 @@
+@@ -46,6 +46,7 @@ public class DragonEggBlock extends FallingBlock {
      }
  
      private void teleport(BlockState state, Level level, BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
index c04018815..5e2edfb4b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
+index a31ac95237515b874f59941ec24c74e2c357b3d8..9883e6d1a1b76155c8ba1817fda6615b4742e18e 100644
 --- a/net/minecraft/world/level/block/FarmBlock.java
 +++ b/net/minecraft/world/level/block/FarmBlock.java
-@@ -112,7 +_,7 @@
+@@ -112,7 +112,7 @@ public class FarmBlock extends Block {
      public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) {
          super.fallOn(level, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage.
          if (level instanceof ServerLevel serverLevel
@@ -9,7 +17,7 @@
              && entity instanceof LivingEntity
              && (entity instanceof Player || serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))
              && entity.getBbWidth() * entity.getBbWidth() * entity.getBbHeight() > 0.512F) {
-@@ -129,6 +_,28 @@
+@@ -129,6 +129,28 @@ public class FarmBlock extends Block {
                      return;
                  }
  
@@ -38,7 +46,7 @@
                  if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState())) {
                      return;
                  }
-@@ -177,7 +_,7 @@
+@@ -177,7 +199,7 @@ public class FarmBlock extends Block {
              }
          }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch
index 7dd50302a..4d67f68a8 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
+index fe11f3ec82ebdbdf3d024d7273fb16b6823b1ece..daaf0ddee9192fa24a70954ce52b381560fcbc1f 100644
 --- a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 +++ b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
-@@ -34,12 +_,12 @@
+@@ -34,12 +34,12 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
  
      @Override
      public BlockState getStateForPlacement(RandomSource random) {
@@ -15,7 +23,7 @@
      }
  
      @Override
-@@ -55,7 +_,7 @@
+@@ -55,7 +55,7 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
          } else if (this == Blocks.CAVE_VINES) {
              modifier = level.spigotConfig.caveVinesModifier;
          }
@@ -24,7 +32,7 @@
              // Spigot end
              BlockPos blockPos = pos.relative(this.growthDirection);
              if (this.canGrowInto(level.getBlockState(blockPos))) {
-@@ -75,11 +_,11 @@
+@@ -75,11 +75,11 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
      }
  
      public BlockState getMaxAgeState(BlockState state) {
@@ -38,7 +46,7 @@
      }
  
      protected BlockState updateBodyAfterConvertedFromHead(BlockState head, BlockState body) {
-@@ -137,13 +_,13 @@
+@@ -137,13 +137,13 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
      @Override
      public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos, BlockState state) {
          BlockPos blockPos = pos.relative(this.growthDirection);
@@ -54,7 +62,7 @@
          }
      }
  
-@@ -155,4 +_,6 @@
+@@ -155,4 +155,6 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
      protected GrowingPlantHeadBlock getHeadBlock() {
          return this;
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/HayBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/HayBlock.java.patch
index 1b21c6e0a..c360a6c80 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/HayBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/HayBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/HayBlock.java b/net/minecraft/world/level/block/HayBlock.java
+index cdde0a25e0a499d7575c00796143a033feb1f22f..999ecf16180b0a862cf8527ce532acf725ba869a 100644
 --- a/net/minecraft/world/level/block/HayBlock.java
 +++ b/net/minecraft/world/level/block/HayBlock.java
-@@ -23,6 +_,6 @@
+@@ -23,6 +23,6 @@ public class HayBlock extends RotatedPillarBlock {
  
      @Override
      public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/IceBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/IceBlock.java.patch
index 0f5251d57..cde67e4af 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/IceBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/IceBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/IceBlock.java b/net/minecraft/world/level/block/IceBlock.java
+index be7141a4009036bcf3f92bba5d0ad74459e99bfa..a4d735a4365fdaf9e602315aa1176dfd5db77ff5 100644
 --- a/net/minecraft/world/level/block/IceBlock.java
 +++ b/net/minecraft/world/level/block/IceBlock.java
-@@ -40,7 +_,7 @@
+@@ -40,7 +40,7 @@ public class IceBlock extends HalfTransparentBlock {
      public void afterDestroy(Level level, BlockPos pos, ItemStack stack) {
          // Paper end - Improve Block#breakNaturally API
          if (!EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_ICE_MELTING)) {
@@ -9,7 +17,7 @@
                  level.removeBlock(pos, false);
                  return;
              }
-@@ -65,7 +_,7 @@
+@@ -65,7 +65,7 @@ public class IceBlock extends HalfTransparentBlock {
              return;
          }
          // CraftBukkit end
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/KelpBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/KelpBlock.java.patch
index b0ce9ac1a..73ba4b2c1 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/KelpBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/KelpBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/KelpBlock.java b/net/minecraft/world/level/block/KelpBlock.java
+index 8e3f2518e705a4b8988a1c9da730f0c89f21bdce..6e6212fd891dcaea0d0a398a73416f31d2cb2406 100644
 --- a/net/minecraft/world/level/block/KelpBlock.java
 +++ b/net/minecraft/world/level/block/KelpBlock.java
-@@ -72,4 +_,11 @@
+@@ -72,4 +72,11 @@ public class KelpBlock extends GrowingPlantHeadBlock implements LiquidBlockConta
      protected FluidState getFluidState(BlockState state) {
          return Fluids.WATER.getSource(false);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch
index ef0559942..cc6f84645 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/LiquidBlock.java b/net/minecraft/world/level/block/LiquidBlock.java
+index 7320b416e8d660419018b0699f49ab6f45a3373b..ae609e0603a78423c4c89b7efb9c41ab8fe7aa52 100644
 --- a/net/minecraft/world/level/block/LiquidBlock.java
 +++ b/net/minecraft/world/level/block/LiquidBlock.java
-@@ -134,7 +_,7 @@
+@@ -134,7 +134,7 @@ public class LiquidBlock extends Block implements BucketPickup {
  
      @Override
      protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving) {
@@ -9,7 +17,7 @@
              level.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(level, pos)); // Paper - Configurable speed for water flowing over lava
          }
      }
-@@ -169,7 +_,7 @@
+@@ -169,7 +169,7 @@ public class LiquidBlock extends Block implements BucketPickup {
          BlockState neighborState,
          RandomSource random
      ) {
@@ -18,7 +26,7 @@
              scheduledTickAccess.scheduleTick(pos, state.getFluidState().getType(), this.fluid.getTickDelay(level));
          }
  
-@@ -178,7 +_,7 @@
+@@ -178,7 +178,7 @@ public class LiquidBlock extends Block implements BucketPickup {
  
      @Override
      protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block neighborBlock, @Nullable Orientation orientation, boolean movedByPiston) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/MagmaBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/MagmaBlock.java.patch
index f9d8ca928..0d49ba600 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/MagmaBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/MagmaBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/MagmaBlock.java b/net/minecraft/world/level/block/MagmaBlock.java
+index db83c3630064a6875b477021a1f78bdf59c4ddc3..bbf8447cf986015f8a2e55f39d7b4f0dd9abcb23 100644
 --- a/net/minecraft/world/level/block/MagmaBlock.java
 +++ b/net/minecraft/world/level/block/MagmaBlock.java
-@@ -28,7 +_,7 @@
+@@ -28,7 +28,7 @@ public class MagmaBlock extends Block {
  
      @Override
      public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch
index f3f45c58f..0b822418a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java
+index 6c5629a6f5f91496a55eb0bf281ceae1567915b1..f408bdd8083210b2ef660e6194610462a3e113b6 100644
 --- a/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/net/minecraft/world/level/block/NetherPortalBlock.java
-@@ -67,7 +_,7 @@
+@@ -67,7 +67,7 @@ public class NetherPortalBlock extends Block implements Portal {
      protected void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
          if (level.spigotConfig.enableZombiePigmenPortalSpawns && level.dimensionType().natural() // Spigot
              && level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)
@@ -9,7 +17,7 @@
              && level.anyPlayerCloseEnoughForSpawning(pos)) {
              while (level.getBlockState(pos).is(this)) {
                  pos = pos.below();
-@@ -125,7 +_,7 @@
+@@ -125,7 +125,7 @@ public class NetherPortalBlock extends Block implements Portal {
      @Override
      public int getPortalTransitionTime(ServerLevel level, Entity entity) {
          return entity instanceof Player player
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherWartBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherWartBlock.java.patch
index 362dae20a..a5eddff7f 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherWartBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherWartBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/NetherWartBlock.java b/net/minecraft/world/level/block/NetherWartBlock.java
+index a8cb58de6223006150bc49b95e5964b8fc42cecc..d25e2a37abb5e4c98116048fe2e96194149763ca 100644
 --- a/net/minecraft/world/level/block/NetherWartBlock.java
 +++ b/net/minecraft/world/level/block/NetherWartBlock.java
-@@ -16,7 +_,7 @@
+@@ -16,7 +16,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty;
  import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
  
@@ -9,7 +17,7 @@
      public static final MapCodec<NetherWartBlock> CODEC = simpleCodec(NetherWartBlock::new);
      public static final int MAX_AGE = 3;
      public static final IntegerProperty AGE = BlockStateProperties.AGE_3;
-@@ -65,4 +_,34 @@
+@@ -65,4 +65,34 @@ public class NetherWartBlock extends VegetationBlock {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(AGE);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NoteBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NoteBlock.java.patch
index 42c3d0b22..3e5b5ff0f 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NoteBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NoteBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/NoteBlock.java b/net/minecraft/world/level/block/NoteBlock.java
+index 9467d5226797f67565edf8a46fd5b48135337410..7560d49b1952dba22e88758b15a24540ca576bbb 100644
 --- a/net/minecraft/world/level/block/NoteBlock.java
 +++ b/net/minecraft/world/level/block/NoteBlock.java
-@@ -101,7 +_,7 @@
+@@ -101,7 +101,7 @@ public class NoteBlock extends Block {
      }
  
      private void playNote(@Nullable Entity entity, BlockState state, Level level, BlockPos pos) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ObserverBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ObserverBlock.java.patch
index 3202a8cee..645943b7c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ObserverBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ObserverBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/ObserverBlock.java b/net/minecraft/world/level/block/ObserverBlock.java
+index bd2aa00ce8b78c16f6107064dd00bfbb072df0df..9fa1ed439ef9adba44f3d4738688a95fb4625b68 100644
 --- a/net/minecraft/world/level/block/ObserverBlock.java
 +++ b/net/minecraft/world/level/block/ObserverBlock.java
-@@ -81,6 +_,7 @@
+@@ -81,6 +81,7 @@ public class ObserverBlock extends DirectionalBlock {
          RandomSource random
      ) {
          if (state.getValue(FACING) == direction && !state.getValue(POWERED)) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch
index cad7d9a3c..e4ca5bf71 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/PointedDripstoneBlock.java b/net/minecraft/world/level/block/PointedDripstoneBlock.java
+index ef164fb4f24412e506b8abce74d509e8be6c4676..85e9aecc2045e1599488d6a137f5f9713fb1a245 100644
 --- a/net/minecraft/world/level/block/PointedDripstoneBlock.java
 +++ b/net/minecraft/world/level/block/PointedDripstoneBlock.java
-@@ -193,20 +_,20 @@
+@@ -193,20 +193,20 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
  
      @VisibleForTesting
      public static void maybeTransferFluid(BlockState state, ServerLevel level, BlockPos pos, float randChance) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch
index f6c12cc4c..9a7ea47d6 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/PoweredRailBlock.java b/net/minecraft/world/level/block/PoweredRailBlock.java
+index e4c4a6b4a6ea41b1fdb006cfc70dfb68dcd056c0..0c78c9003d93d0a36da9318910b6f0769932d39a 100644
 --- a/net/minecraft/world/level/block/PoweredRailBlock.java
 +++ b/net/minecraft/world/level/block/PoweredRailBlock.java
-@@ -28,7 +_,7 @@
+@@ -28,7 +28,7 @@ public class PoweredRailBlock extends BaseRailBlock {
      }
  
      protected boolean findPoweredRailSignal(Level level, BlockPos pos, BlockState state, boolean searchForward, int recursionCount) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch
index c5ac40711..accf3ce80 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/RespawnAnchorBlock.java b/net/minecraft/world/level/block/RespawnAnchorBlock.java
+index 5b9d67d671ea70d4a8920a7f190d240c920971ac..f0b4ea2065f98f5430bba89f1a86ea5e8791aa1f 100644
 --- a/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -160,7 +_,7 @@
+@@ -160,7 +160,7 @@ public class RespawnAnchorBlock extends Block {
          };
          Vec3 center = pos2.getCenter();
          level.explode(
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch
index aa23616be..a9baf469c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/SculkShriekerBlock.java b/net/minecraft/world/level/block/SculkShriekerBlock.java
+index 757f8453e147875ab9f14d9726bb734ef27447c9..f8c9a6d7c9f1a9d2afd820244017a709db79e080 100644
 --- a/net/minecraft/world/level/block/SculkShriekerBlock.java
 +++ b/net/minecraft/world/level/block/SculkShriekerBlock.java
-@@ -118,7 +_,7 @@
+@@ -118,7 +118,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo
      @Nullable
      @Override
      public BlockState getStateForPlacement(BlockPlaceContext context) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SlabBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SlabBlock.java.patch
index 9e9c9b817..3f0dbdb3a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SlabBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SlabBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/SlabBlock.java b/net/minecraft/world/level/block/SlabBlock.java
+index a71d72147db9766fa16bdb6254d8eb6f2f7dba7b..66b9862563932faf0044810bde7bd3fb522c109b 100644
 --- a/net/minecraft/world/level/block/SlabBlock.java
 +++ b/net/minecraft/world/level/block/SlabBlock.java
-@@ -144,4 +_,25 @@
+@@ -144,4 +144,25 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
                  return false;
          }
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch
index ca87324a4..e7d8c0245 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/SnowLayerBlock.java b/net/minecraft/world/level/block/SnowLayerBlock.java
+index 9131098e3ae4e6ffdf1491eb62537e385f75b6b2..ddedc08a96e500a390421d39be36590f37f49d24 100644
 --- a/net/minecraft/world/level/block/SnowLayerBlock.java
 +++ b/net/minecraft/world/level/block/SnowLayerBlock.java
-@@ -76,6 +_,7 @@
+@@ -76,6 +76,7 @@ public class SnowLayerBlock extends Block {
      @Override
      protected boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) {
          BlockState blockState = level.getBlockState(pos.below());
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpawnerBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpawnerBlock.java.patch
index 0b505b086..851ae96e5 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpawnerBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpawnerBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/SpawnerBlock.java b/net/minecraft/world/level/block/SpawnerBlock.java
+index e8d7b6adbcb84e8d89067b54318e0feb3c3276a6..dc2846e26e778b2885fd9c558081c7677d48169a 100644
 --- a/net/minecraft/world/level/block/SpawnerBlock.java
 +++ b/net/minecraft/world/level/block/SpawnerBlock.java
-@@ -14,6 +_,7 @@
+@@ -14,6 +14,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
  import net.minecraft.world.level.block.state.BlockState;
  
  public class SpawnerBlock extends BaseEntityBlock {
@@ -8,7 +16,7 @@
      public static final MapCodec<SpawnerBlock> CODEC = simpleCodec(SpawnerBlock::new);
  
      @Override
-@@ -38,6 +_,62 @@
+@@ -38,6 +39,62 @@ public class SpawnerBlock extends BaseEntityBlock {
          );
      }
  
@@ -71,7 +79,7 @@
      @Override
      protected void spawnAfterBreak(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) {
          super.spawnAfterBreak(state, level, pos, stack, dropExperience);
-@@ -46,6 +_,7 @@
+@@ -46,6 +103,7 @@ public class SpawnerBlock extends BaseEntityBlock {
  
      @Override
      public int getExpDrop(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch
index ab343ffb3..a1b700f57 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/SpongeBlock.java b/net/minecraft/world/level/block/SpongeBlock.java
+index 6764a77998e23de08eaf3a82a0cc0006868e1c3e..f7b6c0029e8d35ebf0fad380b8bc3b1530e2f8f1 100644
 --- a/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/net/minecraft/world/level/block/SpongeBlock.java
-@@ -53,8 +_,8 @@
+@@ -53,8 +53,8 @@ public class SpongeBlock extends Block {
          org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(level); // CraftBukkit - Use BlockStateListPopulator
          BlockPos.breadthFirstTraversal(
                  pos,
@@ -11,7 +19,7 @@
                  (validPos, queueAdder) -> {
                      for (Direction direction : ALL_DIRECTIONS) {
                          queueAdder.accept(validPos.relative(direction));
-@@ -68,7 +_,7 @@
+@@ -68,7 +68,7 @@ public class SpongeBlock extends Block {
                          BlockState blockState = blockList.getBlockState(blockPos);
                          FluidState fluidState = blockList.getFluidState(blockPos);
                          // CraftBukkit end
@@ -20,7 +28,7 @@
                              return BlockPos.TraversalNodeStatus.SKIP;
                          } else if (blockState.getBlock() instanceof BucketPickup bucketPickup
                              && !bucketPickup.pickupBlock(null, blockList, blockPos, blockState).isEmpty()) { // CraftBukkit
-@@ -76,6 +_,10 @@
+@@ -76,6 +76,10 @@ public class SpongeBlock extends Block {
                          } else {
                              if (blockState.getBlock() instanceof LiquidBlock) {
                                  blockList.setBlock(blockPos, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/StonecutterBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/StonecutterBlock.java.patch
index 8cfd145db..07fd3eca1 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/StonecutterBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/StonecutterBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/StonecutterBlock.java b/net/minecraft/world/level/block/StonecutterBlock.java
+index 6d1ab251e7d09ada7edcde7f52ca49ae5efe16b6..a58c94a40bad1d60b970b06decde9851692a8b63 100644
 --- a/net/minecraft/world/level/block/StonecutterBlock.java
 +++ b/net/minecraft/world/level/block/StonecutterBlock.java
-@@ -93,4 +_,14 @@
+@@ -93,4 +93,14 @@ public class StonecutterBlock extends Block {
      protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
          return false;
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch
index f388f13ce..5b35dbe92 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/SugarCaneBlock.java b/net/minecraft/world/level/block/SugarCaneBlock.java
+index a8de37e173e244d7a16c19ac8805e0e4327c837a..baa56c6422c0924bb8b7c5a78db17acf784f28d6 100644
 --- a/net/minecraft/world/level/block/SugarCaneBlock.java
 +++ b/net/minecraft/world/level/block/SugarCaneBlock.java
-@@ -19,7 +_,7 @@
+@@ -19,7 +19,7 @@ import net.minecraft.world.level.material.FluidState;
  import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
  
@@ -9,7 +17,7 @@
      public static final MapCodec<SugarCaneBlock> CODEC = simpleCodec(SugarCaneBlock::new);
      public static final IntegerProperty AGE = BlockStateProperties.AGE_15;
      private static final VoxelShape SHAPE = Block.column(12.0, 0.0, 16.0);
-@@ -112,4 +_,34 @@
+@@ -112,4 +112,34 @@ public class SugarCaneBlock extends Block {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(AGE);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch
index 165f005db..1bcf0bc9d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/TurtleEggBlock.java b/net/minecraft/world/level/block/TurtleEggBlock.java
+index 8ee103e2752290db4cb4b22bb3552bf80e2ceb92..a23626dbfacf98ef1bc7918ca35406fa71307bed 100644
 --- a/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/net/minecraft/world/level/block/TurtleEggBlock.java
-@@ -156,7 +_,7 @@
+@@ -156,7 +156,7 @@ public class TurtleEggBlock extends Block {
  
      private boolean shouldUpdateHatchLevel(Level level) {
          float timeOfDay = level.getTimeOfDay(1.0F);
@@ -9,7 +17,7 @@
      }
  
      @Override
-@@ -189,9 +_,32 @@
+@@ -189,9 +189,32 @@ public class TurtleEggBlock extends Block {
      }
  
      private boolean canDestroyEgg(ServerLevel level, Entity entity) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch
index 89633d8f7..b9597f65a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/TwistingVinesBlock.java b/net/minecraft/world/level/block/TwistingVinesBlock.java
+index afb77747ea6966c435aca4b667bfbbc909f52232..361aaca76ae0375782310af0e03241625f08f7bd 100644
 --- a/net/minecraft/world/level/block/TwistingVinesBlock.java
 +++ b/net/minecraft/world/level/block/TwistingVinesBlock.java
-@@ -34,4 +_,11 @@
+@@ -34,4 +34,11 @@ public class TwistingVinesBlock extends GrowingPlantHeadBlock {
      protected boolean canGrowInto(BlockState state) {
          return NetherVines.isValidGrowthState(state);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/VegetationBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/VegetationBlock.java.patch
index af22ad6c3..75def5000 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/VegetationBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/VegetationBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/VegetationBlock.java b/net/minecraft/world/level/block/VegetationBlock.java
+index 0aa7c1084fd6ed35260469572cdd914d87f3922a..a1b5e815425fccbc601c8062fcc24598512e47dd 100644
 --- a/net/minecraft/world/level/block/VegetationBlock.java
 +++ b/net/minecraft/world/level/block/VegetationBlock.java
-@@ -61,4 +_,24 @@
+@@ -61,4 +61,24 @@ public abstract class VegetationBlock extends Block {
      protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
          return pathComputationType == PathComputationType.AIR && !this.hasCollision || super.isPathfindable(state, pathComputationType);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch
index be28707f2..2076e02c3 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/WeepingVinesBlock.java b/net/minecraft/world/level/block/WeepingVinesBlock.java
+index f4ff810cdd4206711312a4fffba18f4b30a5701f..96fb69aaf9ed020a328ff609d49f88ab29a69952 100644
 --- a/net/minecraft/world/level/block/WeepingVinesBlock.java
 +++ b/net/minecraft/world/level/block/WeepingVinesBlock.java
-@@ -34,4 +_,11 @@
+@@ -34,4 +34,11 @@ public class WeepingVinesBlock extends GrowingPlantHeadBlock {
      protected boolean canGrowInto(BlockState state) {
          return NetherVines.isValidGrowthState(state);
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch
index d92c3e43b..40daf6dc6 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/WitherSkullBlock.java b/net/minecraft/world/level/block/WitherSkullBlock.java
+index 0b6debe0e55e404e6f34b3bc437fe7c7a30cec7c..a70f552fddc58efdce770c36abb548ef8359d939 100644
 --- a/net/minecraft/world/level/block/WitherSkullBlock.java
 +++ b/net/minecraft/world/level/block/WitherSkullBlock.java
-@@ -71,6 +_,7 @@
+@@ -71,6 +71,7 @@ public class WitherSkullBlock extends SkullBlock {
                          );
                          witherBoss.yBodyRot = blockPatternMatch.getForwards().getAxis() == Direction.Axis.X ? 0.0F : 90.0F;
                          witherBoss.makeInvulnerable();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch
index 4cb4b65da..317fc5486 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+index 36a72a11d28f99bfe85868461925b778cc01478e..57eae0dbb614f57e2a352613c7490145bbfeb5a1 100644
 --- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -186,6 +_,21 @@
+@@ -186,6 +186,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
          }
  
          ItemStack itemStack = furnace.items.get(1);
@@ -22,7 +30,7 @@
          ItemStack itemStack1 = furnace.items.get(0);
          boolean flag1 = !itemStack1.isEmpty();
          boolean flag2 = !itemStack.isEmpty();
-@@ -269,6 +_,8 @@
+@@ -269,6 +284,8 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
          if (flag) {
              setChanged(level, pos, state);
          }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch
index f196366ed..19bee4dfc 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+index 503c8625cd77a564e55fc1427137d43a5cc12d9e..c2e15c6e1c6bfc5a9d89afc9b8aa9551bad2cc8f 100644
 --- a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -143,6 +_,16 @@
+@@ -143,6 +143,16 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
  
      public double getEffectRange() {
          if (this.effectRange < 0) {
@@ -17,7 +25,7 @@
              return this.levels * 10 + 10;
          } else {
              return effectRange;
-@@ -172,6 +_,7 @@
+@@ -172,6 +182,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
          int y = pos.getY();
          int z = pos.getZ();
          BlockPos blockPos;
@@ -25,7 +33,7 @@
          if (blockEntity.lastCheckY < y) {
              blockPos = pos;
              blockEntity.checkingBeamSections = Lists.newArrayList();
-@@ -201,6 +_,7 @@
+@@ -201,6 +212,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
                      }
                  }
              } else {
@@ -33,7 +41,7 @@
                  if (section == null || blockState.getLightBlock() >= 15 && !blockState.is(Blocks.BEDROCK)) {
                      blockEntity.checkingBeamSections.clear();
                      blockEntity.lastCheckY = height;
-@@ -220,7 +_,7 @@
+@@ -220,7 +232,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
                  blockEntity.levels = updateBase(level, x, y, z);
              }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch
index 8abc6fa2c..e5095c266 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/entity/BlockEntity.java b/net/minecraft/world/level/block/entity/BlockEntity.java
+index 5986825d6a381eeb445dd424dd127864aa703163..a5ade8268a74738170caf519e7e45e13862bc39d 100644
 --- a/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -105,6 +_,10 @@
+@@ -105,6 +105,10 @@ public abstract class BlockEntity {
          input.read("PublicBukkitValues", CompoundTag.CODEC)
              .ifPresent(this.persistentDataContainer::putAll);
          // Paper end - read persistent data container
@@ -11,7 +19,7 @@
      }
  
      public final void loadWithComponents(ValueInput input) {
-@@ -117,6 +_,11 @@
+@@ -117,6 +121,11 @@ public abstract class BlockEntity {
      }
  
      protected void saveAdditional(ValueOutput output) {
@@ -23,7 +31,7 @@
      }
  
      public final CompoundTag saveWithFullMetadata(HolderLookup.Provider registries) {
-@@ -402,4 +_,17 @@
+@@ -402,4 +411,17 @@ public abstract class BlockEntity {
              return this.blockEntity.getNameForReporting() + "@" + this.blockEntity.getBlockPos();
          }
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch
index 8f0100363..43d9bef68 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
+index 5dd044c13e09423af43330df565bfe6ce88a883c..39a45a32b1c82e6d7641a1609384a902d0414659 100644
 --- a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-@@ -30,6 +_,7 @@
+@@ -30,6 +30,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
      private static final RandomSource RANDOM = RandomSource.create();
      @Nullable
      private Component name;
@@ -8,7 +16,7 @@
  
      public EnchantingTableBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.ENCHANTING_TABLE, pos, state);
-@@ -39,12 +_,14 @@
+@@ -39,12 +40,14 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
      protected void saveAdditional(ValueOutput output) {
          super.saveAdditional(output);
          output.storeNullable("CustomName", ComponentSerialization.CODEC, this.name);
@@ -23,7 +31,7 @@
      }
  
      public static void bookAnimationTick(Level level, BlockPos pos, BlockState state, EnchantingTableBlockEntity enchantingTable) {
-@@ -136,4 +_,22 @@
+@@ -136,4 +139,22 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
      public void removeComponentsFromTag(ValueOutput output) {
          output.discard("CustomName");
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch
index d9530e11b..387f1fba3 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/entity/SignBlockEntity.java b/net/minecraft/world/level/block/entity/SignBlockEntity.java
+index be1b138a78d8cb87956d531a801d85e677ca6f4a..2e0b2b55031343e32b4972c0f0017e950d56652d 100644
 --- a/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -148,16 +_,32 @@
+@@ -148,16 +148,32 @@ public class SignBlockEntity extends BlockEntity {
          return this.setText(updater.apply(text), isFrontText);
      }
  
@@ -35,11 +43,10 @@
                  );
              }
          }
-@@ -306,6 +_,27 @@
-         // CraftBukkit - this
+@@ -307,6 +323,27 @@ public class SignBlockEntity extends BlockEntity {
          return new CommandSourceStack(commandSource, Vec3.atCenterOf(pos), Vec2.ZERO, level, 2, string, component, level.getServer(), player); // Paper - Fix commands from signs not firing command events
      }
-+
+ 
 +    // Purpur start - Signs allow color codes
 +    public ClientboundBlockEntityDataPacket getTranslatedUpdatePacket(boolean filtered, boolean front) {
 +        try (net.minecraft.util.ProblemReporter.ScopedCollector scopedCollector = new net.minecraft.util.ProblemReporter.ScopedCollector(this.problemPath(), LOGGER)) {
@@ -60,6 +67,7 @@
 +        }
 +    }
 +    // Purpur end - Signs allow color codes
- 
++
      @Override
      public ClientboundBlockEntityDataPacket getUpdatePacket() {
+         return ClientboundBlockEntityDataPacket.create(this);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch
index bc6293606..ba0f14c2d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/block/piston/PistonStructureResolver.java b/net/minecraft/world/level/block/piston/PistonStructureResolver.java
+index ad143a92569f5b420ccaa2089758b2fb3b4ab7c5..5a3660e02bc805e9a35a81b8a61f07b3f20b5ba9 100644
 --- a/net/minecraft/world/level/block/piston/PistonStructureResolver.java
 +++ b/net/minecraft/world/level/block/piston/PistonStructureResolver.java
-@@ -81,7 +_,7 @@
+@@ -81,7 +81,7 @@ public class PistonStructureResolver {
              return true;
          } else {
              int i = 1;
@@ -9,7 +17,7 @@
                  return false;
              } else {
                  while (isSticky(blockState)) {
-@@ -95,7 +_,7 @@
+@@ -95,7 +95,7 @@ public class PistonStructureResolver {
                          break;
                      }
  
@@ -18,7 +26,7 @@
                          return false;
                      }
                  }
-@@ -140,7 +_,7 @@
+@@ -140,7 +140,7 @@ public class PistonStructureResolver {
                          return true;
                      }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch
index accc2318d..c340859c5 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/chunk/storage/EntityStorage.java b/net/minecraft/world/level/chunk/storage/EntityStorage.java
+index f1f8575a4b37114ced3cdb1d2ea33a36a2db44fd..2afe96a69c09decbe972332d2d38f67427d880d8 100644
 --- a/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -108,6 +_,7 @@
+@@ -108,6 +108,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
                      }
                      // Paper end - Entity load/save limit per chunk
                      TagValueOutput tagValueOutput = TagValueOutput.createWithContext(scopedCollector.forChild(entity.problemPath()), entity.registryAccess());
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch
index 8f5ddb2d7..0c36e94ca 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+index 384f2cd090d6d23bd1308d6e82c24338f2bf55d1..77db68349aa73d33b86a867099c9395c96d5a02d 100644
 --- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -308,7 +_,7 @@
+@@ -308,7 +308,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
  
      // Paper start
      private static void printOversizedLog(String msg, Path file, int x, int z) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch
index 51e0ad919..bb76a4d9c 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/levelgen/DensityFunctions.java b/net/minecraft/world/level/levelgen/DensityFunctions.java
+index 04527a5c65ad630f794fed9071d485aedd02257a..77731406cb3dc417aa2fe1cb4352f3d2d7d498aa 100644
 --- a/net/minecraft/world/level/levelgen/DensityFunctions.java
 +++ b/net/minecraft/world/level/levelgen/DensityFunctions.java
-@@ -528,7 +_,7 @@
+@@ -528,7 +528,7 @@ public final class DensityFunctions {
              int i1 = z / 2;
              int i2 = x % 2;
              int i3 = z % 2;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch
index 5652d79c6..75d95289a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java
+index b3cfab9c82fe12694f5d2f56bd922828e51df680..d99bda335e7d3b49919fd6732b0052a9da70df70 100644
 --- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -38,13 +_,13 @@
+@@ -38,13 +38,13 @@ public class PhantomSpawner implements CustomSpawner {
                      int spawnAttemptMaxSeconds = level.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds;
                      this.nextTick += (spawnAttemptMinSeconds + randomSource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20;
                      // Paper end - Ability to control player's insomnia and phantoms
@@ -17,7 +25,7 @@
                                          ServerStatsCounter stats = serverPlayer.getStats();
                                          int i = Mth.clamp(stats.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
                                          int i1 = 24000;
-@@ -56,7 +_,7 @@
+@@ -56,7 +56,7 @@ public class PhantomSpawner implements CustomSpawner {
                                              FluidState fluidState = level.getFluidState(blockPos1);
                                              if (NaturalSpawner.isValidEmptySpawnBlock(level, blockPos1, blockState, fluidState, EntityType.PHANTOM)) {
                                                  SpawnGroupData spawnGroupData = null;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch
index 78e131bae..98381df1f 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java
+index ace1099a12c762b2e73b71dd3551cf351fedf067..1b06e44a267d2d4af844997ac0c557f30aaf9b15 100644
 --- a/net/minecraft/world/level/material/FlowingFluid.java
 +++ b/net/minecraft/world/level/material/FlowingFluid.java
-@@ -232,7 +_,7 @@
+@@ -232,7 +232,7 @@ public abstract class FlowingFluid extends Fluid {
              }
          }
  
@@ -9,16 +17,16 @@
              BlockState blockState1 = level.getBlockState(mutableBlockPos.setWithOffset(pos, Direction.DOWN));
              FluidState fluidState1 = blockState1.getFluidState();
              if (blockState1.isSolid() || this.isSourceBlockOfThisType(fluidState1)) {
-@@ -319,6 +_,12 @@
-     }
+@@ -320,6 +320,12 @@ public abstract class FlowingFluid extends Fluid {
  
      protected abstract boolean canConvertToSource(ServerLevel level);
-+
+ 
 +    // Purpur start - Implement infinite liquids
 +    protected int getRequiredSources(Level level) {
 +        return 2;
 +    }
 +    // Purpur end - Implement infinite liquids
- 
++
      protected void spreadTo(LevelAccessor level, BlockPos pos, BlockState blockState, Direction direction, FluidState fluidState) {
          if (blockState.getBlock() instanceof LiquidBlockContainer liquidBlockContainer) {
+             liquidBlockContainer.placeLiquid(level, pos, blockState, fluidState);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch
index 502b87bdc..55e8a23ee 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/material/LavaFluid.java b/net/minecraft/world/level/material/LavaFluid.java
+index 033f252248b671e35135269dd2df6e7ca4585604..43cdc2f8fdfdeb1426e386e0084087779ef62754 100644
 --- a/net/minecraft/world/level/material/LavaFluid.java
 +++ b/net/minecraft/world/level/material/LavaFluid.java
-@@ -189,7 +_,7 @@
+@@ -189,7 +189,7 @@ public abstract class LavaFluid extends FlowingFluid {
  
      @Override
      public int getTickDelay(LevelReader level) {
@@ -9,17 +17,17 @@
      }
  
      @Override
-@@ -210,6 +_,13 @@
-     private void fizz(LevelAccessor level, BlockPos pos) {
+@@ -211,6 +211,13 @@ public abstract class LavaFluid extends FlowingFluid {
          level.levelEvent(1501, pos, 0);
      }
-+
+ 
 +    // Purpur start - Implement infinite liquids
 +    @Override
 +    protected int getRequiredSources(Level level) {
 +        return level.purpurConfig.lavaInfiniteRequiredSources;
 +    }
 +    // Purpur end - Implement infinite liquids
- 
++
      @Override
      protected boolean canConvertToSource(ServerLevel level) {
+         return level.getGameRules().getBoolean(GameRules.RULE_LAVA_SOURCE_CONVERSION);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch
index 3bc14791b..6e6ab1788 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/material/WaterFluid.java b/net/minecraft/world/level/material/WaterFluid.java
+index 10e3c644e31650b0e1aad6349a83a763cf744ec8..b248fe1d66940c05d56fc322df61c52ece72e77f 100644
 --- a/net/minecraft/world/level/material/WaterFluid.java
 +++ b/net/minecraft/world/level/material/WaterFluid.java
-@@ -78,6 +_,13 @@
+@@ -78,6 +78,13 @@ public abstract class WaterFluid extends FlowingFluid {
          return level.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
      }
  
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch
index ef04724ea..83961f690 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+index 9e6b2bbc1f83d32d0332f036be4f1a0e18b826bf..db6baaa698fe93aba3fbd595158b568badd6cb8a 100644
 --- a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 +++ b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-@@ -240,7 +_,7 @@
+@@ -240,7 +240,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
                  if ((node == null || node.costMalus < 0.0F)
                      && verticalDeltaLimit > 0
                      && (cachedPathType != PathType.FENCE || this.canWalkOverFences())
@@ -9,7 +17,7 @@
                      && cachedPathType != PathType.TRAPDOOR
                      && cachedPathType != PathType.POWDER_SNOW) {
                      node = this.tryJumpOn(x, y, z, verticalDeltaLimit, nodeFloorLevel, direction, pathType, mutableBlockPos);
-@@ -493,7 +_,7 @@
+@@ -493,7 +493,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
              return PathType.TRAPDOOR;
          } else if (blockState.is(Blocks.POWDER_SNOW)) {
              return PathType.POWDER_SNOW;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch
index 925647acc..f23268c8d 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/portal/PortalShape.java b/net/minecraft/world/level/portal/PortalShape.java
+index b19260f442fe272efed8e61d1316bf0d6ff38023..0ecc5a49de322d531c33042858f8420d370f3805 100644
 --- a/net/minecraft/world/level/portal/PortalShape.java
 +++ b/net/minecraft/world/level/portal/PortalShape.java
-@@ -28,7 +_,7 @@
+@@ -28,7 +28,7 @@ public class PortalShape {
      public static final int MAX_WIDTH = 21;
      private static final int MIN_HEIGHT = 3;
      public static final int MAX_HEIGHT = 21;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch
index 138758dfe..5360b0bad 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+index c8f23011a8942a5be970c606f67142cbd202b97e..7bbeed6c998c91e68376d3f17a510d68e3cd0b27 100644
 --- a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-@@ -81,6 +_,7 @@
+@@ -81,6 +81,7 @@ public class MapItemSavedData extends SavedData {
      public final Map<String, MapDecoration> decorations = Maps.newLinkedHashMap();
      private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
      private int trackedDecorationCount;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch
index bc7b09181..dcb19997b 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java b/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
+index c4f29da30d63deb3f9eabafcf62a946ff148b6b7..f3083702286dfb7932f08e0b811eded7988cbab4 100644
 --- a/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
 +++ b/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java
-@@ -66,6 +_,11 @@
+@@ -66,6 +66,11 @@ public class EnchantedCountIncreaseFunction extends LootItemConditionalFunction
          Entity entity = context.getOptionalParameter(LootContextParams.ATTACKING_ENTITY);
          if (entity instanceof LivingEntity livingEntity) {
              int enchantmentLevel = EnchantmentHelper.getEnchantmentLevel(this.enchantment, livingEntity);
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch
index 1545fd15f..a041d8ed9 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch
@@ -1,6 +1,14 @@
+From 1e4693c6129676cacc2e29a157b5a69107c78543 Mon Sep 17 00:00:00 2001
+From: File <noreply+automated@papermc.io>
+Date: Sun, 20 Apr 1997 06:37:42 -0700
+Subject: [PATCH] purpur File Patches
+
+
+diff --git a/net/minecraft/world/phys/AABB.java b/net/minecraft/world/phys/AABB.java
+index 84f3073444ae9e11e5d11224d6af6474ced925e2..e53398996bbb278c6e06024d8ca945b364a44c10 100644
 --- a/net/minecraft/world/phys/AABB.java
 +++ b/net/minecraft/world/phys/AABB.java
-@@ -476,4 +_,10 @@
+@@ -476,4 +476,10 @@ public class AABB {
              return new AABB(this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ);
          }
      }
diff --git a/purpur-server/minecraft-patches/features/0001-Ridables.patch b/purpur-server/minecraft-patches/unapplied-features/0001-Ridables.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0001-Ridables.patch
rename to purpur-server/minecraft-patches/unapplied-features/0001-Ridables.patch
diff --git a/purpur-server/minecraft-patches/features/0002-Configurable-entity-base-attributes.patch b/purpur-server/minecraft-patches/unapplied-features/0002-Configurable-entity-base-attributes.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0002-Configurable-entity-base-attributes.patch
rename to purpur-server/minecraft-patches/unapplied-features/0002-Configurable-entity-base-attributes.patch
diff --git a/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch b/purpur-server/minecraft-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch
rename to purpur-server/minecraft-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch
diff --git a/purpur-server/minecraft-patches/features/0004-Giants-AI-settings.patch b/purpur-server/minecraft-patches/unapplied-features/0004-Giants-AI-settings.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0004-Giants-AI-settings.patch
rename to purpur-server/minecraft-patches/unapplied-features/0004-Giants-AI-settings.patch
diff --git a/purpur-server/minecraft-patches/features/0005-Chickens-can-retaliate.patch b/purpur-server/minecraft-patches/unapplied-features/0005-Chickens-can-retaliate.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0005-Chickens-can-retaliate.patch
rename to purpur-server/minecraft-patches/unapplied-features/0005-Chickens-can-retaliate.patch
diff --git a/purpur-server/minecraft-patches/features/0006-Minecart-settings-and-WASD-controls.patch b/purpur-server/minecraft-patches/unapplied-features/0006-Minecart-settings-and-WASD-controls.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0006-Minecart-settings-and-WASD-controls.patch
rename to purpur-server/minecraft-patches/unapplied-features/0006-Minecart-settings-and-WASD-controls.patch
diff --git a/purpur-server/minecraft-patches/features/0007-Villagers-follow-emerald-blocks.patch b/purpur-server/minecraft-patches/unapplied-features/0007-Villagers-follow-emerald-blocks.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0007-Villagers-follow-emerald-blocks.patch
rename to purpur-server/minecraft-patches/unapplied-features/0007-Villagers-follow-emerald-blocks.patch
diff --git a/purpur-server/minecraft-patches/features/0008-Implement-elytra-settings.patch b/purpur-server/minecraft-patches/unapplied-features/0008-Implement-elytra-settings.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0008-Implement-elytra-settings.patch
rename to purpur-server/minecraft-patches/unapplied-features/0008-Implement-elytra-settings.patch
diff --git a/purpur-server/minecraft-patches/features/0009-Configurable-jockey-options.patch b/purpur-server/minecraft-patches/unapplied-features/0009-Configurable-jockey-options.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0009-Configurable-jockey-options.patch
rename to purpur-server/minecraft-patches/unapplied-features/0009-Configurable-jockey-options.patch
diff --git a/purpur-server/minecraft-patches/features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/purpur-server/minecraft-patches/unapplied-features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to purpur-server/minecraft-patches/unapplied-features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/purpur-server/minecraft-patches/features/0011-Phantoms-burn-in-light.patch b/purpur-server/minecraft-patches/unapplied-features/0011-Phantoms-burn-in-light.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0011-Phantoms-burn-in-light.patch
rename to purpur-server/minecraft-patches/unapplied-features/0011-Phantoms-burn-in-light.patch
diff --git a/purpur-server/minecraft-patches/features/0012-Make-entity-breeding-times-configurable.patch b/purpur-server/minecraft-patches/unapplied-features/0012-Make-entity-breeding-times-configurable.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0012-Make-entity-breeding-times-configurable.patch
rename to purpur-server/minecraft-patches/unapplied-features/0012-Make-entity-breeding-times-configurable.patch
diff --git a/purpur-server/minecraft-patches/features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch b/purpur-server/minecraft-patches/unapplied-features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to purpur-server/minecraft-patches/unapplied-features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch
diff --git a/purpur-server/minecraft-patches/features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/purpur-server/minecraft-patches/unapplied-features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to purpur-server/minecraft-patches/unapplied-features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
diff --git a/purpur-server/minecraft-patches/features/0015-Add-mobGriefing-override-to-everything-affected.patch b/purpur-server/minecraft-patches/unapplied-features/0015-Add-mobGriefing-override-to-everything-affected.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0015-Add-mobGriefing-override-to-everything-affected.patch
rename to purpur-server/minecraft-patches/unapplied-features/0015-Add-mobGriefing-override-to-everything-affected.patch
diff --git a/purpur-server/minecraft-patches/features/0016-Add-EntityTeleportHinderedEvent.patch b/purpur-server/minecraft-patches/unapplied-features/0016-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0016-Add-EntityTeleportHinderedEvent.patch
rename to purpur-server/minecraft-patches/unapplied-features/0016-Add-EntityTeleportHinderedEvent.patch
diff --git a/purpur-server/minecraft-patches/features/0017-Toggle-for-water-sensitive-mob-damage.patch b/purpur-server/minecraft-patches/unapplied-features/0017-Toggle-for-water-sensitive-mob-damage.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0017-Toggle-for-water-sensitive-mob-damage.patch
rename to purpur-server/minecraft-patches/unapplied-features/0017-Toggle-for-water-sensitive-mob-damage.patch
diff --git a/purpur-server/minecraft-patches/features/0018-API-for-any-mob-to-burn-daylight.patch b/purpur-server/minecraft-patches/unapplied-features/0018-API-for-any-mob-to-burn-daylight.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0018-API-for-any-mob-to-burn-daylight.patch
rename to purpur-server/minecraft-patches/unapplied-features/0018-API-for-any-mob-to-burn-daylight.patch
diff --git a/purpur-server/minecraft-patches/features/0019-Cows-naturally-aggressive-to-players-chance.patch b/purpur-server/minecraft-patches/unapplied-features/0019-Cows-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0019-Cows-naturally-aggressive-to-players-chance.patch
rename to purpur-server/minecraft-patches/unapplied-features/0019-Cows-naturally-aggressive-to-players-chance.patch
diff --git a/purpur-server/minecraft-patches/features/0020-Mobs-always-drop-experience.patch b/purpur-server/minecraft-patches/unapplied-features/0020-Mobs-always-drop-experience.patch
similarity index 100%
rename from purpur-server/minecraft-patches/features/0020-Mobs-always-drop-experience.patch
rename to purpur-server/minecraft-patches/unapplied-features/0020-Mobs-always-drop-experience.patch