applied minecraft file patches (only two file patches didn't apply, surprisingly)

purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3636,4 +_,40 @@
+@@ -3637,4 +_,40 @@
          return this.asItemType().getDefaultDataTypes();
      }
      // Paper end - data component API

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch

@@ -1,9 +1,9 @@
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3925,4 +_,123 @@
+@@ -3934,4 +_,123 @@
-      * @param score New death screen score of player
       */
-     void setDeathScreenScore(int score);
+     @ApiStatus.Experimental
+     PlayerGameConnection getConnection();
 +
 +    // Purpur start
 +    /**

purpur-server/build.gradle.kts.patch

@@ -25,7 +25,7 @@
 +    // Purpur end - Rebrand
 +
      spigot {
-         enabled = true
+         enabled = false
          buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d"
 @@ -107,7 +_,21 @@
      }

purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +147,8 @@ public final class ActivationRange {
+@@ -147,6 +_,8 @@
                  continue;
              }
  
@@ -17,7 +9,7 @@ index ae2bb9a73106febfe5f0d090abd4252bbb5fd27e..ca21597263cb430e2a5ae07e8cecfb0d
              final int worldHeight = world.getHeight();
              ActivationRange.maxBB = player.getBoundingBox().inflate(maxRange, worldHeight, maxRange);
              ActivationType.MISC.boundingBox = player.getBoundingBox().inflate(miscActivationRange, worldHeight, miscActivationRange);
-@@ -288,6 +290,7 @@ public final class ActivationRange {
+@@ -288,6 +_,7 @@
       * @return
       */
      public static boolean checkIfActive(final Entity entity) {

purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +30,7 @@ public class CrashReport {
+@@ -30,6 +_,7 @@
      private boolean trackingStackTrace = true;
      private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
      private final SystemReport systemReport = new SystemReport();
@@ -16,7 +8,7 @@ index 3e0e88afcf010d9a3d46e48bca5cbdf98fe97544..394443d00e661715439be1e56dddc129
  
      public CrashReport(String title, Throwable exception) {
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
-@@ -130,7 +131,7 @@ public class CrashReport {
+@@ -130,7 +_,7 @@
      }
  
      public String getFriendlyReport(ReportType type) {
@@ -25,7 +17,7 @@ index 3e0e88afcf010d9a3d46e48bca5cbdf98fe97544..394443d00e661715439be1e56dddc129
      }
  
      @Nullable
-@@ -161,7 +162,7 @@ public class CrashReport {
+@@ -161,7 +_,7 @@
      }
  
      public boolean saveToFile(Path path, ReportType type) {

purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +447,19 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
+@@ -447,6 +_,19 @@
      }
      // CraftBukkit end
  
@@ -28,10 +20,11 @@ index 3acfb2a78845dd8081dc3c01d653034232c76e60..51caf352e77df49fc04bf84f1fab29b6
      public Vec3 getPosition() {
          return this.worldPosition;
      }
-@@ -532,6 +545,30 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
+@@ -531,6 +_,30 @@
+             }
          }
      }
- 
++
 +    // Purpur start - Purpur config files
 +    public void sendSuccess(@Nullable String message) {
 +        sendSuccess(message, false);
@@ -55,7 +48,6 @@ index 3acfb2a78845dd8081dc3c01d653034232c76e60..51caf352e77df49fc04bf84f1fab29b6
 +        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;

purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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..c638d30ba12bde2ae9d55b1c579129d40bcc8b1e 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -252,7 +252,7 @@ public class Commands {
+@@ -252,7 +_,7 @@
              JfrCommand.register(this.dispatcher);
          }
  
@@ -17,7 +9,7 @@ index ec1cced129ef42be65d7b2b622638bfae8bd895e..c638d30ba12bde2ae9d55b1c579129d4
              RaidCommand.register(this.dispatcher, context);
              DebugPathCommand.register(this.dispatcher);
              DebugMobSpawningCommand.register(this.dispatcher);
-@@ -280,6 +280,14 @@ public class Commands {
+@@ -280,6 +_,14 @@
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
@@ -32,7 +24,7 @@ index ec1cced129ef42be65d7b2b622638bfae8bd895e..c638d30ba12bde2ae9d55b1c579129d4
          }
  
          if (selection.includeIntegrated) {
-@@ -504,6 +512,7 @@ public class Commands {
+@@ -504,6 +_,7 @@
      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
@@ -40,7 +32,7 @@ index ec1cced129ef42be65d7b2b622638bfae8bd895e..c638d30ba12bde2ae9d55b1c579129d4
          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 +523,8 @@ public class Commands {
+@@ -514,6 +_,8 @@
              }
          }
          // CraftBukkit end

purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +192,27 @@ public class EntitySelector {
+@@ -192,26 +_,27 @@
          this.checkPermissions(source);
          if (this.playerName != null) {
              ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(this.playerName);
@@ -40,7 +32,7 @@ index 514f8fbdeb776087608665c35de95294aadf5cf0..b305ba9bab617bf4e52d0e6ddf160bac
                              players.add(serverPlayer1);
                              if (players.size() >= resultLimit) {
                                  return players;
-@@ -270,4 +271,10 @@ public class EntitySelector {
+@@ -270,4 +_,10 @@
      public static Component joinNames(List<? extends Entity> names) {
          return ComponentUtils.formatList(names, Entity::getDisplayName);
      }

purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +63,12 @@ public class BlockPos extends Vec3i {
+@@ -63,6 +_,12 @@
      public static final int MAX_HORIZONTAL_COORDINATE = 33554431;
      // Paper end - Optimize Bit Operations by inlining
  

purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +735,22 @@ public interface DispenseItemBehavior {
+@@ -735,5 +_,22 @@
          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));

purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +32,7 @@ public class EquipmentDispenseItemBehavior extends DefaultDispenseItemBehavior {
+@@ -32,7 +_,7 @@
              return false;
          } else {
              LivingEntity livingEntity = entitiesOfClass.getFirst();

purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/gametest/framework/GameTestHelper.java
++++ b/net/minecraft/gametest/framework/GameTestHelper.java
+@@ -292,6 +_,8 @@
+                 return gameType;
+             }
+ 
++            public void setAfk(final boolean afk) {} // Purpur - AFK API
++
+             @Override
+             public boolean isClientAuthoritative() {
+                 return false;

purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +449,7 @@ public class TestCommand {
+@@ -449,7 +_,7 @@
                              )
                      )
              );

purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 34524dc5a503bebcec99ada0d9560d6f4df48cdf..1014ab2aeb5e496124c99c938538e88d75561cd5 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
-@@ -578,11 +578,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -579,11 +_,20 @@
      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

purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +45,7 @@ public class SignedMessageChain {
+@@ -45,7 +_,7 @@
                      SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink;
                      if (signedMessageLink == null) {
                          throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.CHAIN_BROKEN);

purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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..bc3209d3cbe971af74b7856caa6300b59b0bb6bc 100644
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -109,6 +109,12 @@ public class Main {
+@@ -109,6 +_,12 @@
                  JvmProfiler.INSTANCE.start(Environment.SERVER);
              }
  

purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e804c9ae53 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -284,6 +284,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -284,6 +_,7 @@
      public joptsimple.OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
      public static int currentTick; // Paper - improve tick loop
@@ -16,7 +8,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      // Paper - don't store the vanilla dispatcher
-@@ -294,7 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -294,7 +_,7 @@
      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
@@ -25,7 +17,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
      // Spigot end
      public volatile boolean hasFullyShutdown; // Paper - Improved watchdog support
      public volatile boolean abnormalExit; // Paper - Improved watchdog support
-@@ -303,6 +304,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -303,6 +_,8 @@
      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
@@ -34,7 +26,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
  
      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 +999,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -996,6 +_,15 @@
  
          LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -50,7 +42,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
          // CraftBukkit start
          if (this.server != null) {
              this.server.spark.disable(); // Paper - spark
-@@ -1094,6 +1106,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1094,6 +_,8 @@
          this.safeShutdown(waitForServer, false);
      }
      public void safeShutdown(boolean waitForServer, boolean isRestarting) {
@@ -59,7 +51,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper - Debugging
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-@@ -1113,6 +1127,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1113,6 +_,7 @@
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -67,7 +59,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1198,6 +1213,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1198,6 +_,16 @@
              }
              // Paper end - Add onboarding message for initial server start
  
@@ -84,7 +76,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
              while (this.running) {
                  long l;
                  if (!this.isPaused() && this.tickRateManager.isSprinting() && this.tickRateManager.checkShouldSprintThisTick()) {
-@@ -1222,14 +1247,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1222,14 +_,19 @@
                  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);
@@ -107,7 +99,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
                      tickSection = currentTime;
                  }
                  // Paper end - further improve server tick loop
-@@ -1261,6 +1291,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1261,6 +_,12 @@
                      profilerFiller.popPush("nextTickWait");
                      this.mayHaveDelayedTasks = true;
                      this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + l, this.nextTickTimeNanos);
@@ -120,7 +112,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
                      this.startMeasuringTaskExecutionTime();
                      this.waitUntilNextTick();
                      this.finishMeasuringTaskExecutionTime();
-@@ -1689,7 +1725,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1689,7 +_,7 @@
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
@@ -129,7 +121,7 @@ index 52fa5112cd90ba766c94512a02401dd3aee82cc9..ef5c6a760eb6e72beab186a315bd02e8
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-@@ -1854,7 +1890,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1854,7 +_,7 @@
  
      @DontObfuscate
      public String getServerModName() {

purpur-server/minecraft-patches/sources/net/minecraft/server/PlayerAdvancements.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +147,7 @@ public class PlayerAdvancements {
+@@ -147,6 +_,7 @@
              AdvancementHolder advancementHolder = advancementManager.get(path);
              if (advancementHolder == null) {
                  if (!path.getNamespace().equals(ResourceLocation.DEFAULT_NAMESPACE)) return; // CraftBukkit
@@ -16,7 +8,7 @@ index fdeca41d40705f28864ce4443d01cd872c9d51b0..10e5469df1800bcdfb3f8cb4045ee25a
                  LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", path, this.playerSavePath);
              } else {
                  this.startProgress(advancementHolder, progress);
-@@ -194,6 +195,7 @@ public class PlayerAdvancements {
+@@ -194,6 +_,7 @@
                  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)) {

purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +70,7 @@ public class EnchantCommand {
+@@ -70,7 +_,7 @@
  
      private static int enchant(CommandSourceStack source, Collection<? extends Entity> targets, Holder<Enchantment> enchantment, int level) throws CommandSyntaxException {
          Enchantment enchantment1 = enchantment.value();
@@ -17,7 +9,7 @@ index 6f4fcee9fdba2248227708fcced1ce0f40aff6af..13f1dbd0d09428e9e0a42f99d0553283
              throw ERROR_LEVEL_TOO_HIGH.create(level, enchantment1.getMaxLevel());
          } else {
              int i = 0;
-@@ -80,7 +80,7 @@ public class EnchantCommand {
+@@ -80,7 +_,7 @@
                      ItemStack mainHandItem = livingEntity.getMainHandItem();
                      if (!mainHandItem.isEmpty()) {
                          if (enchantment1.canEnchant(mainHandItem)

purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +53,18 @@ public class GameModeCommand {
+@@ -53,6 +_,18 @@
      }
  
      private static int setMode(CommandContext<CommandSourceStack> source, Collection<ServerPlayer> players, GameType gameType) {

purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 ea9db57a1fe2f11739ceb062ea7cce15776f959a..a919d91eeaaeef0f79190cc5e78e4f8b2fb468dd 100644
 --- a/net/minecraft/server/commands/GiveCommand.java
 +++ b/net/minecraft/server/commands/GiveCommand.java
-@@ -69,6 +69,7 @@ public class GiveCommand {
+@@ -69,6 +_,7 @@
                      i1 -= min;
                      ItemStack itemStack1 = item.createItemStack(min, false);
                      boolean flag = serverPlayer.getInventory().add(itemStack1);

purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +105,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -105,6 +_,7 @@
              public void run() {
                  if (!org.bukkit.craftbukkit.Main.useConsole) return; // CraftBukkit
                  // Paper start - Use TerminalConsoleAppender
@@ -16,7 +8,7 @@ index 98927d4a5fba2a0dcdb147ac10b82c3286ccdc6b..670553243d26e2faab8a21f099a846d4
                  new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
                  /*
                  BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
-@@ -183,6 +184,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -183,6 +_,15 @@
          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
@@ -32,7 +24,7 @@ index 98927d4a5fba2a0dcdb147ac10b82c3286ccdc6b..670553243d26e2faab8a21f099a846d4
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
  
          this.setPvpAllowed(properties.pvp);
-@@ -230,6 +240,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -230,6 +_,30 @@
              if (true) throw new IllegalStateException("Failed to bind to port", var10); // Paper - Propagate failed to bind to port error
              return false;
          }
@@ -63,7 +55,7 @@ index 98927d4a5fba2a0dcdb147ac10b82c3286ccdc6b..670553243d26e2faab8a21f099a846d4
  
          // CraftBukkit start
          this.server.loadPlugins();
-@@ -308,6 +342,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -308,6 +_,8 @@
                  LOGGER.info("JMX monitoring enabled");
              }
  

purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +51,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -51,6 +_,7 @@
      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", "");

purpur-server/minecraft-patches/sources/net/minecraft/server/gui/MinecraftServerGui.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +39,11 @@ public class MinecraftServerGui extends JComponent {
+@@ -39,6 +_,11 @@
      private Thread logAppenderThread;
      private final Collection<Runnable> finalizers = Lists.newArrayList();
      final AtomicBoolean isClosing = new AtomicBoolean();
@@ -20,7 +12,7 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
  
      public static MinecraftServerGui showFrameFor(final DedicatedServer server) {
          try {
-@@ -46,7 +51,7 @@ public class MinecraftServerGui extends JComponent {
+@@ -46,7 +_,7 @@
          } catch (Exception var3) {
          }
  
@@ -29,7 +21,7 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
          final MinecraftServerGui minecraftServerGui = new MinecraftServerGui(server);
          jFrame.setDefaultCloseOperation(2);
          jFrame.add(minecraftServerGui);
-@@ -54,7 +59,7 @@ public class MinecraftServerGui extends JComponent {
+@@ -54,7 +_,7 @@
          jFrame.setLocationRelativeTo(null);
          jFrame.setVisible(true);
          // Paper start - Improve ServerGUI
@@ -38,7 +30,7 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
          try {
              jFrame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png"))));
          } catch (java.io.IOException ignore) {
-@@ -64,7 +69,7 @@ public class MinecraftServerGui extends JComponent {
+@@ -64,7 +_,7 @@
              @Override
              public void windowClosing(WindowEvent event) {
                  if (!minecraftServerGui.isClosing.getAndSet(true)) {
@@ -47,7 +39,7 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
                      server.halt(true);
                      minecraftServerGui.runFinalizers();
                  }
-@@ -112,7 +117,7 @@ public class MinecraftServerGui extends JComponent {
+@@ -112,7 +_,7 @@
  
      private JComponent buildChatPanel() {
          JPanel jPanel = new JPanel(new BorderLayout());
@@ -56,7 +48,7 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
          JScrollPane jScrollPane = new JScrollPane(jTextArea, 22, 30);
          jTextArea.setEditable(false);
          jTextArea.setFont(MONOSPACED);
-@@ -121,10 +126,43 @@ public class MinecraftServerGui extends JComponent {
+@@ -121,10 +_,43 @@
              String trimmed = jTextField.getText().trim();
              if (!trimmed.isEmpty()) {
                  this.server.handleConsoleInput(trimmed, this.server.createCommandSourceStack());
@@ -100,7 +92,7 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
          jTextArea.addFocusListener(new FocusAdapter() {
              @Override
              public void focusGained(FocusEvent event) {
-@@ -159,7 +197,7 @@ public class MinecraftServerGui extends JComponent {
+@@ -159,7 +_,7 @@
      }
  
      private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); // CraftBukkit // Paper
@@ -109,7 +101,7 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
          if (!SwingUtilities.isEventDispatchThread()) {
              SwingUtilities.invokeLater(() -> this.print(textArea, scrollPane, line));
          } else {
-@@ -170,10 +208,11 @@ public class MinecraftServerGui extends JComponent {
+@@ -170,16 +_,29 @@
                  flag = verticalScrollBar.getValue() + verticalScrollBar.getSize().getHeight() + MONOSPACED.getSize() * 4 > verticalScrollBar.getMaximum();
              }
  
@@ -123,10 +115,10 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
  
              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
@@ -138,7 +130,6 @@ index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b378862
 +        }
 +    }
 +    // 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";

purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +43,7 @@ public class StatsComponent extends JComponent {
+@@ -43,7 +_,7 @@
          }
          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";

purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +206,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -206,6 +_,8 @@
      private final StructureManager structureManager;
      private final StructureCheck structureCheck;
      private final boolean tickTime;
@@ -17,7 +9,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
      private final RandomSequences randomSequences;
  
      // CraftBukkit start
-@@ -590,7 +592,24 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -590,7 +_,24 @@
          // CraftBukkit end
          this.tickTime = tickTime;
          this.server = server;
@@ -43,7 +35,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
          this.serverLevelData = serverLevelData;
          ChunkGenerator chunkGenerator = levelStem.generator();
          // CraftBukkit start
-@@ -675,6 +694,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -675,6 +_,7 @@
          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
@@ -51,7 +43,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
      }
  
      // Paper start
-@@ -721,7 +741,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -721,7 +_,7 @@
          }
  
          int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
@@ -60,7 +52,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
              // 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 +860,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -840,6 +_,13 @@
              this.serverLevelData.getScheduledEvents().tick(this.server, l);
              Profiler.get().pop();
              if (this.serverLevelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -74,10 +66,11 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
                  this.setDayTime(this.levelData.getDayTime() + 1L);
              }
          }
-@@ -847,7 +874,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -847,7 +_,21 @@
  
      public void setDayTime(long time) {
          this.serverLevelData.setDayTime(time);
+-    }
 +        // Purpur start - Configurable daylight cycle
 +        this.preciseTime = time;
 +        this.forceTime = false;
@@ -91,12 +84,12 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
 +    // 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 +992,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -951,9 +_,17 @@
                      && 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) {
@@ -116,7 +109,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
                          skeletonHorse.setAge(0);
                          skeletonHorse.setPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
                          this.addFreshEntity(skeletonHorse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
-@@ -988,9 +1037,35 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -988,9 +_,35 @@
                  if (blockState.is(Blocks.SNOW)) {
                      int layersValue = blockState.getValue(SnowLayerBlock.LAYERS);
                      if (layersValue < Math.min(_int, 8)) {
@@ -152,7 +145,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
                      }
                  } else {
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), 3, null); // CraftBukkit
-@@ -1011,7 +1086,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1011,7 +_,7 @@
                  pointOfInterestType -> pointOfInterestType.is(PoiTypes.LIGHTNING_ROD),
                  blockPos -> blockPos.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockPos.getX(), blockPos.getZ()) - 1,
                  pos,
@@ -161,7 +154,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
                  PoiManager.Occupancy.ANY
              );
          return optional.map(blockPos -> blockPos.above(1));
-@@ -1060,8 +1135,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1060,8 +_,26 @@
                  int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
                  Component component;
                  if (this.sleepStatus.areEnoughSleeping(_int)) {
@@ -188,7 +181,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
                      component = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(_int));
                  }
  
-@@ -1198,6 +1291,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1198,6 +_,7 @@
      @VisibleForTesting
      public void resetWeatherCycle() {
          // CraftBukkit start
@@ -196,7 +189,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
          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 +1299,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1205,6 +_,7 @@
              this.serverLevelData.setRainTime(0);
          }
          // CraftBukkit end
@@ -204,7 +197,7 @@ index dda8d38ef61672cc714d9e5a475f9b0412ed5ff9..83eff33884bffddfafc85eeb4a290010
          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 +2822,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2727,7 +_,7 @@
              // 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

purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -1,16 +1,8 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf576183331 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -431,6 +431,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -429,6 +_,10 @@
+     public boolean isRealPlayer; // Paper
      public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
-     public @Nullable String clientBrandName = null; // Paper - Brand support
      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
 +    public boolean purpurClient = false; // Purpur - Purpur client support
 +    private boolean tpsBar = false; // Purpur - Implement TPSBar
@@ -19,7 +11,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
  
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -628,6 +632,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -562,6 +_,10 @@
          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);
@@ -30,7 +22,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
      }
  
      @Override
-@@ -645,6 +653,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -579,6 +_,9 @@
          output.storeNullable("raid_omen_position", BlockPos.CODEC, this.raidOmenPosition);
          this.saveEnderPearls(output);
          this.getBukkitEntity().setExtraData(output); // CraftBukkit
@@ -40,7 +32,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
      }
  
      private void saveParentVehicle(ValueOutput output) {
-@@ -1141,6 +1152,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1075,6 +_,7 @@
              // Paper - moved up to sendClientboundPlayerCombatKillPacket()
              sendClientboundPlayerCombatKillPacket(event.getShowDeathMessages(), deathScreenMessage); // Paper - Expand PlayerDeathEvent
              Team team = this.getTeam();
@@ -48,7 +40,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
              if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
                  this.server.getPlayerList().broadcastSystemMessage(deathMessage, false);
              } else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
-@@ -1247,6 +1259,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1181,6 +_,13 @@
          if (this.isInvulnerableTo(level, damageSource)) {
              return false;
          } else {
@@ -62,7 +54,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
              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))
-@@ -1491,6 +1510,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1425,6 +_,7 @@
                  serverLevel.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
                  // CraftBukkit end
@@ -70,7 +62,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
                  this.setServerLevel(level);
                  this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
-@@ -1607,7 +1627,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1541,7 +_,7 @@
                              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)
                          );
@@ -79,7 +71,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
                          return Either.left(Player.BedSleepingProblem.NOT_SAFE);
                      }
                  }
-@@ -1644,7 +1664,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1578,7 +_,19 @@
                      CriteriaTriggers.SLEPT_IN_BED.trigger(this);
                  });
                  if (!this.level().canSleepThroughNights()) {
@@ -100,7 +92,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
                  }
  
                  this.level().updateSleepingPlayerList();
-@@ -1736,6 +1768,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1670,6 +_,7 @@
  
      @Override
      public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) {
@@ -108,7 +100,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
          this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText));
      }
-@@ -2045,6 +2078,26 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1979,6 +_,26 @@
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
  
@@ -135,7 +127,7 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
      @Override
      public void displayClientMessage(Component chatComponent, boolean actionBar) {
          this.sendSystemMessage(chatComponent, actionBar);
-@@ -2263,6 +2316,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -2197,6 +_,20 @@
          );
      }
  
@@ -156,13 +148,14 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
      public void sendSystemMessage(Component mesage) {
          this.sendSystemMessage(mesage, false);
      }
-@@ -2401,8 +2468,68 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -2335,7 +_,67 @@
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
+-    }
 +        this.setAfk(false); // Purpur - AFK API
-     }
++    }
- 
++
 +    // Purpur start - AFK API
 +    private boolean isAfk = false;
 +
@@ -221,11 +214,10 @@ index 728fa1210e0fd837e28c48802045dea2ae59f5d6..f292626a6ab2ae3f71f76aebdd2b4cf5
 +        return !this.isAfk() && super.canBeCollidedWith(entity);
 +    }
 +    // Purpur end - AFK API
-+
+ 
      public ServerStatsCounter getStats() {
          return this.stats;
-     }
+@@ -2963,4 +_,56 @@
-@@ -3029,4 +3156,56 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end

purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 6734756d7a51e635a50a47577f9e6b6f8111db51..c4a4f08272b34f72dea4feaaeb66d153b2aab8c8 100644
 --- a/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -348,6 +348,7 @@ public class ServerPlayerGameMode {
+@@ -348,6 +_,7 @@
                  }
                  return false;
              }
@@ -16,7 +8,7 @@ index 6734756d7a51e635a50a47577f9e6b6f8111db51..c4a4f08272b34f72dea4feaaeb66d153
          }
          // CraftBukkit end
  
-@@ -461,6 +462,7 @@ public class ServerPlayerGameMode {
+@@ -461,6 +_,7 @@
      public InteractionHand interactHand;
      public ItemStack interactItemStack;
      public InteractionResult useItemOn(ServerPlayer player, Level level, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
@@ -24,7 +16,7 @@ index 6734756d7a51e635a50a47577f9e6b6f8111db51..c4a4f08272b34f72dea4feaaeb66d153
          BlockPos blockPos = hitResult.getBlockPos();
          BlockState blockState = level.getBlockState(blockPos);
          boolean cancelledBlock = false;
-@@ -503,7 +505,7 @@ public class ServerPlayerGameMode {
+@@ -503,7 +_,7 @@
              boolean flag = !player.getMainHandItem().isEmpty() || !player.getOffhandItem().isEmpty();
              boolean flag1 = player.isSecondaryUseActive() && flag;
              ItemStack itemStack = stack.copy();
@@ -33,7 +25,7 @@ index 6734756d7a51e635a50a47577f9e6b6f8111db51..c4a4f08272b34f72dea4feaaeb66d153
                  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 +551,18 @@ public class ServerPlayerGameMode {
+@@ -549,4 +_,18 @@
      public void setLevel(ServerLevel serverLevel) {
          this.level = serverLevel;
      }

purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +314,7 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -314,6 +_,7 @@
              return true;
          } else {
              // Paper start - Buffer OOB setBlock calls

purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 43f70a5561d6cc62aaeba6d1e39598ecb382e369..f6a04a4b0a06c2fbb3b6aac4ec3e162f6c39b2a2 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -39,10 +39,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -39,10 +_,11 @@
      public final Connection connection; // Paper
      private final boolean transferred;
      //private long keepAliveTime; // Paper - improve keepalives
@@ -19,20 +11,20 @@ index 43f70a5561d6cc62aaeba6d1e39598ecb382e369..f6a04a4b0a06c2fbb3b6aac4ec3e162f
      private boolean closed = false;
 +    private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Purpur - Alternative Keepalive Handling
      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;
-     // CraftBukkit start
+@@ -53,6 +_,7 @@
-@@ -53,6 +54,7 @@ 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
 +    protected static final net.minecraft.resources.ResourceLocation PURPUR_CLIENT = net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("purpur", "client"); // Purpur - Purpur client support
+     public @Nullable String playerBrand; // Paper
  
-     public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie, net.minecraft.server.level.ServerPlayer player) { // CraftBukkit
+     public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie) {
-         this.server = server;
+@@ -94,6 +_,18 @@
-@@ -123,6 +125,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          // Paper start - improve keepalives
          long now = System.nanoTime();
-         net.minecraft.server.level.ServerPlayer.PendingKeepAlive pending = this.player.pendingKeepAlives.peek();
+         io.papermc.paper.util.KeepAlive.PendingKeepAlive pending = this.keepAlive.pendingKeepAlives.peek();
 +        // Purpur start - Alternative Keepalive Handling
 +        if (org.purpurmc.purpur.PurpurConfig.useAlternateKeepAlive) {
 +            if (this.keepAlivePending && !keepAlives.isEmpty() && keepAlives.contains(packet.getId())) {
@@ -46,22 +38,9 @@ index 43f70a5561d6cc62aaeba6d1e39598ecb382e369..f6a04a4b0a06c2fbb3b6aac4ec3e162f
 +        } else
 +        // Purpur end - Alternative Keepalive Handling
          if (pending != null && pending.challengeId() == packet.getId()) {
-             this.player.pendingKeepAlives.remove(pending);
+             this.keepAlive.pendingKeepAlives.remove(pending);
  
-@@ -199,6 +213,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -179,6 +_,23 @@
-                 return;
-             }
- 
-+            // Purpur start - Purpur client support
-+            if (identifier.equals(PURPUR_CLIENT)) {
-+                this.player.purpurClient = true;
-+            }
-+            // Purpur end - Purpur client support
-+
-             if (identifier.equals(MINECRAFT_BRAND)) {
-                 this.player.clientBrandName = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256);
-             }
-@@ -276,6 +296,23 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          Profiler.get().push("keepAlive");
          long millis = Util.getMillis();
          // Paper start - improve keepalives

purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,15 +1,7 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12b1e10766 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -324,6 +324,20 @@ public class ServerGamePacketListenerImpl
+@@ -326,6 +_,20 @@
-         this.tickEndEvent = new io.papermc.paper.event.packet.ClientTickEndEvent(player.getBukkitEntity()); // Paper - add client tick end event
+         this.playerGameConnection =  new io.papermc.paper.connection.PaperPlayerGameConnection(this); // Paper
      }
  
 +    // Purpur start - AFK API
@@ -29,7 +21,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
      @Override
      public void tick() {
          if (this.ackBlockChangesUpTo > -1) {
-@@ -382,6 +396,12 @@ public class ServerGamePacketListenerImpl
+@@ -384,6 +_,12 @@
          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
@@ -42,7 +34,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
              this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
              this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
          }
-@@ -651,6 +671,8 @@ public class ServerGamePacketListenerImpl
+@@ -653,6 +_,8 @@
                      this.lastYaw = to.getYaw();
                      this.lastPitch = to.getPitch();
  
@@ -51,7 +43,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                      Location oldTo = to.clone();
                      PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
                      this.cserver.getPluginManager().callEvent(event);
-@@ -730,6 +752,7 @@ public class ServerGamePacketListenerImpl
+@@ -732,6 +_,7 @@
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
          if (packet.getId() == this.awaitingTeleport) {
              if (this.awaitingPositionFromClient == null) {
@@ -59,7 +51,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                  this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
                  return;
              }
-@@ -1263,6 +1286,10 @@ public class ServerGamePacketListenerImpl
+@@ -1265,6 +_,10 @@
              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;
@@ -70,7 +62,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
              for (final String page : pageList) {
                  final int byteLength = page.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  byteTotal += byteLength;
-@@ -1287,7 +1314,8 @@ public class ServerGamePacketListenerImpl
+@@ -1289,7 +_,8 @@
              }
  
              if (byteTotal > byteAllowed) {
@@ -80,7 +72,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                  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;
              }
-@@ -1306,31 +1334,45 @@ public class ServerGamePacketListenerImpl
+@@ -1308,31 +_,45 @@
              Optional<String> optional = packet.title();
              optional.ifPresent(list::add);
              list.addAll(packet.pages());
@@ -130,7 +122,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
              itemStack.set(
                  DataComponents.WRITTEN_BOOK_CONTENT,
                  new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getName().getString(), 0, list, true)
-@@ -1344,6 +1386,16 @@ public class ServerGamePacketListenerImpl
+@@ -1346,6 +_,16 @@
          return this.player.isTextFilteringEnabled() ? Filterable.passThrough(filteredText.filteredOrEmpty()) : Filterable.from(filteredText);
      }
  
@@ -147,7 +139,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
      @Override
      public void handleEntityTagQuery(ServerboundEntityTagQueryPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
-@@ -1383,7 +1435,15 @@ public class ServerGamePacketListenerImpl
+@@ -1385,7 +_,15 @@
      @Override
      public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
@@ -164,7 +156,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
              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();
-@@ -1565,7 +1625,7 @@ public class ServerGamePacketListenerImpl
+@@ -1567,7 +_,7 @@
                                          movedWrongly = true;
                                          if (event.getLogWarning())
                                       // Paper end
@@ -173,7 +165,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                                      } // Paper
                                  }
  
-@@ -1630,6 +1690,8 @@ public class ServerGamePacketListenerImpl
+@@ -1632,6 +_,8 @@
                                          this.lastYaw = to.getYaw();
                                          this.lastPitch = to.getPitch();
  
@@ -182,7 +174,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                                          Location oldTo = to.clone();
                                          PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
                                          this.cserver.getPluginManager().callEvent(event);
-@@ -1685,6 +1747,13 @@ public class ServerGamePacketListenerImpl
+@@ -1687,6 +_,13 @@
                                          this.player.tryResetCurrentImpulseContext();
                                      }
  
@@ -196,7 +188,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                                      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();
-@@ -1702,6 +1771,17 @@ public class ServerGamePacketListenerImpl
+@@ -1704,6 +_,17 @@
          }
      }
  
@@ -214,7 +206,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
      private boolean shouldCheckPlayerMovement(boolean isElytraMovement) {
          if (this.isSingleplayerOwner()) {
              return false;
-@@ -2099,6 +2179,7 @@ public class ServerGamePacketListenerImpl
+@@ -2101,6 +_,7 @@
  
                  boolean cancelled;
                  if (hitResult == null || hitResult.getType() != HitResult.Type.BLOCK) {
@@ -222,7 +214,7 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                      org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemInHand, hand);
                      cancelled = event.useItemInHand() == Event.Result.DENY;
                  } else {
-@@ -2750,6 +2831,7 @@ public class ServerGamePacketListenerImpl
+@@ -2748,6 +_,7 @@
  
                  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
@@ -230,3 +222,16 @@ index 625eae18ab13ae27949128f6325b3608a557cf1f..8a04052908fa53028b7d5a4619908d12
                      packet.dispatch(
                          new ServerboundInteractPacket.Handler() {
                              private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit
+@@ -3745,6 +_,12 @@
+                 readChannelIdentifier(data, startIndex, data.length, registerChannel);
+                 return;
+             }
++
++            // Purpur start - Purpur client support
++            if (identifier.equals(PURPUR_CLIENT)) {
++               this.player.purpurClient = true;
++            }
++            // Purpur end - Purpur client support
+ 
+             if (identifier.equals(MINECRAFT_BRAND)) {
+                 this.player.connection.playerBrand = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256);

purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 7950f4f88d8a83ed5610b7af4e134557d32da3f0..637b2eb7104cb0bc7f314ad6eea11a432e899861 100644
 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -306,7 +306,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -273,7 +_,7 @@
                          ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!");
                          ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(string1)); // Spigot
                      } else {

purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +37,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
+@@ -37,6 +_,7 @@
          } else {
              this.hasRequestedStatus = true;
              // this.connection.send(new ClientboundStatusResponsePacket(this.status)); // Paper

purpur-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 b1524279c02cd3be82338a6bd0320cb125a134d5..cc26f97e1e72eb077dc60691dadbcd5a52235c0d 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -401,6 +401,7 @@ public abstract class PlayerList {
+@@ -401,6 +_,7 @@
                  scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
              }
              // Paper end - Configurable player collision
@@ -16,7 +8,7 @@ index b1524279c02cd3be82338a6bd0320cb125a134d5..cc26f97e1e72eb077dc60691dadbcd5a
              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 +509,7 @@ public abstract class PlayerList {
+@@ -508,6 +_,7 @@
      }
      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
@@ -24,16 +16,7 @@ index b1524279c02cd3be82338a6bd0320cb125a134d5..cc26f97e1e72eb077dc60691dadbcd5a
          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
-@@ -666,7 +668,7 @@ public abstract class PlayerList {
+@@ -895,6 +_,20 @@
-             // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)
-             //     ? Component.translatable("multiplayer.disconnect.server_full")
-             //     : null;
--            if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)) {
-+            if (this.players.size() >= this.maxPlayers && !(player.hasPermission("purpur.joinfullserver") || this.canBypassPlayerLimit(gameProfile))) { // Purpur - Allow player join full server by permission
-                 event.disallow(org.bukkit.event.player.PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
-             }
-         }
-@@ -928,6 +930,20 @@ public abstract class PlayerList {
          }
      }
  
@@ -54,7 +37,7 @@ index b1524279c02cd3be82338a6bd0320cb125a134d5..cc26f97e1e72eb077dc60691dadbcd5a
      public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
          for (ServerPlayer serverPlayer : this.players) {
              if (serverPlayer.level().dimension() == dimension) {
-@@ -1012,6 +1028,7 @@ public abstract class PlayerList {
+@@ -979,6 +_,7 @@
              } else {
                  b = (byte)(24 + permLevel);
              }
@@ -62,3 +45,12 @@ index b1524279c02cd3be82338a6bd0320cb125a134d5..cc26f97e1e72eb077dc60691dadbcd5a
  
              player.connection.send(new ClientboundEntityEventPacket(player, b));
          }
+@@ -991,7 +_,7 @@
+ 
+     // Paper start - whitelist verify event / login event
+     public LoginResult canBypassFullServerLogin(final GameProfile profile, final LoginResult currentResult) {
+-        final boolean shouldKick = this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(profile);
++        final boolean shouldKick = this.players.size() >= this.maxPlayers && !(/*player.hasPermission("purpur.joinfullserver") || */this.canBypassPlayerLimit(profile)); // Purpur - Allow player join full server by permission TODO: this hasn't worked for a while, so comment it out until we can reliably check perms of the player joining
+         final io.papermc.paper.event.player.PlayerServerFullCheckEvent fullCheckEvent = new io.papermc.paper.event.player.PlayerServerFullCheckEvent(
+             com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(profile),
+             io.papermc.paper.adventure.PaperAdventure.asAdventure(currentResult.message),

purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +15,7 @@ public class SleepStatus {
+@@ -15,7 +_,7 @@
  
      public boolean areEnoughDeepSleeping(int requiredSleepPercentage, List<ServerPlayer> sleepingPlayers) {
          // CraftBukkit start
@@ -17,7 +9,7 @@ index 2a7ae521654ad5c9f392baa5562e64bb71b13097..3a3e6992563236141db687084aeec968
          boolean anyDeepSleep = sleepingPlayers.stream().anyMatch(Player::isSleepingLongEnough);
          return anyDeepSleep && i >= this.sleepersNeeded(requiredSleepPercentage);
          // CraftBukkit end
-@@ -43,7 +43,7 @@ public class SleepStatus {
+@@ -43,7 +_,7 @@
          for (ServerPlayer serverPlayer : players) {
              if (!serverPlayer.isSpectator()) {
                  this.activePlayers++;

purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 7e1a06b97ab0c744e910df1c82454ce5686c1870..a7cf3d2dbc3bb8db49629ec5ba049e196af836b7 100644
 --- a/net/minecraft/stats/ServerRecipeBook.java
 +++ b/net/minecraft/stats/ServerRecipeBook.java
-@@ -102,6 +102,7 @@ public class ServerRecipeBook extends RecipeBook {
+@@ -102,6 +_,7 @@
      private void loadRecipes(List<ResourceKey<Recipe<?>>> recipes, Consumer<ResourceKey<Recipe<?>>> output, Predicate<ResourceKey<Recipe<?>>> isRecognized) {
          for (ResourceKey<Recipe<?>> resourceKey : recipes) {
              if (!isRecognized.test(resourceKey)) {

purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +87,7 @@ public class StringUtil {
+@@ -87,6 +_,7 @@
  
      // Paper start - Username validation
      public static boolean isReasonablePlayerName(final String name) {

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +15,7 @@ public class CombatRules {
+@@ -15,7 +_,7 @@
  
      public static float getDamageAfterAbsorb(LivingEntity entity, float damage, DamageSource damageSource, float armorValue, float armorToughness) {
          float f = 2.0F + armorToughness / 4.0F;
@@ -17,7 +9,7 @@ index d5524038314591a10c9f08a68e2ac91f6079a897..bf82de45bf98e8605a1fdb69803f75f4
          float f2 = f1 / 25.0F;
          ItemStack weaponItem = damageSource.getWeaponItem();
          float f3;
-@@ -30,7 +30,7 @@ public class CombatRules {
+@@ -30,7 +_,7 @@
      }
  
      public static float getDamageAfterMagicAbsorb(float damage, float enchantModifiers) {

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +64,7 @@ public class CombatTracker {
+@@ -64,7 +_,7 @@
  
      private Component getMessageForAssistedFall(Entity entity, Component entityDisplayName, String hasWeaponTranslationKey, String noWeaponTranslationKey) {
          ItemStack itemStack = entity instanceof LivingEntity livingEntity ? livingEntity.getMainHandItem() : ItemStack.EMPTY;
@@ -17,7 +9,7 @@ index 4cec197634fac341cca1ed108f1ecb0561f72461..aa6213ca382e4901363317df1e30332c
              ? Component.translatable(hasWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName, itemStack.getDisplayName())
              : Component.translatable(noWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName);
      }
-@@ -108,6 +108,15 @@ public class CombatTracker {
+@@ -108,6 +_,15 @@
                  Component component = ComponentUtils.wrapInSquareBrackets(Component.translatable(string + ".link")).withStyle(INTENTIONAL_GAME_DESIGN_STYLE);
                  return Component.translatable(string + ".message", this.mob.getDisplayName(), component);
              } else {

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +30,8 @@ public class DamageSource {
+@@ -30,6 +_,8 @@
      @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
@@ -17,7 +9,7 @@ index bb021fc9de91f8c4f79e6a753d57fa157efbbda7..5fa92eef9c6b88cf96d3fe427e4d4f16
  
      public DamageSource knownCause(final org.bukkit.event.entity.EntityDamageEvent.DamageCause cause) {
          final DamageSource damageSource = this.copy();
-@@ -42,6 +44,30 @@ public class DamageSource {
+@@ -42,6 +_,30 @@
          return this.knownCause;
      }
  
@@ -48,7 +40,7 @@ index bb021fc9de91f8c4f79e6a753d57fa157efbbda7..5fa92eef9c6b88cf96d3fe427e4d4f16
      @Nullable
      public Entity eventEntityDamager() {
          return this.eventEntityDamager;
-@@ -103,6 +129,8 @@ public class DamageSource {
+@@ -103,6 +_,8 @@
          damageSource.eventBlockDamager = this.eventBlockDamager;
          damageSource.fromBlockSnapshot = this.fromBlockSnapshot;
          damageSource.critical = this.critical;
@@ -57,7 +49,7 @@ index bb021fc9de91f8c4f79e6a753d57fa157efbbda7..5fa92eef9c6b88cf96d3fe427e4d4f16
          return damageSource;
      }
      // CraftBukkit end
-@@ -169,12 +197,21 @@ public class DamageSource {
+@@ -169,11 +_,20 @@
          } else {
              Component component = this.causingEntity == null ? this.directEntity.getDisplayName() : this.causingEntity.getDisplayName();
              ItemStack itemStack = this.causingEntity instanceof LivingEntity livingEntity1 ? livingEntity1.getMainHandItem() : ItemStack.EMPTY;
@@ -67,7 +59,7 @@ index bb021fc9de91f8c4f79e6a753d57fa157efbbda7..5fa92eef9c6b88cf96d3fe427e4d4f16
                  : 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());
@@ -76,7 +68,6 @@ index bb021fc9de91f8c4f79e6a753d57fa157efbbda7..5fa92eef9c6b88cf96d3fe427e4d4f16
 +        return io.papermc.paper.adventure.PaperAdventure.asVanilla(component);
 +    }
 +    // Purpur end - Component related conveniences
-+
+ 
      public String getMsgId() {
          return this.type().msgId();
-     }

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +42,8 @@ public class DamageSources {
+@@ -42,6 +_,8 @@
      private final DamageSource stalagmite;
      private final DamageSource outsideBorder;
      private final DamageSource genericKill;
@@ -17,7 +9,7 @@ index cc206ecff2d95f0398ca424c178a336ad80cc396..7afad362801082e5f2e3aceda864ad2a
  
      public DamageSources(RegistryAccess registry) {
          this.damageTypes = registry.lookupOrThrow(Registries.DAMAGE_TYPE);
-@@ -70,6 +72,8 @@ public class DamageSources {
+@@ -70,6 +_,8 @@
          this.stalagmite = this.source(DamageTypes.STALAGMITE);
          this.outsideBorder = this.source(DamageTypes.OUTSIDE_BORDER);
          this.genericKill = this.source(DamageTypes.GENERIC_KILL);
@@ -26,10 +18,11 @@ index cc206ecff2d95f0398ca424c178a336ad80cc396..7afad362801082e5f2e3aceda864ad2a
      }
  
      private DamageSource source(ResourceKey<DamageType> damageTypeKey) {
-@@ -84,6 +88,18 @@ public class DamageSources {
+@@ -83,6 +_,18 @@
+     private DamageSource source(ResourceKey<DamageType> damageTypeKey, @Nullable Entity causingEntity, @Nullable Entity directEntity) {
          return new DamageSource(this.damageTypes.getOrThrow(damageTypeKey), causingEntity, directEntity);
      }
- 
++
 +    // Purpur start - Dont run with scissor
 +    public DamageSource scissors() {
 +        return this.scissors;
@@ -41,7 +34,6 @@ index cc206ecff2d95f0398ca424c178a336ad80cc396..7afad362801082e5f2e3aceda864ad2a
 +        return this.stonecutter;
 +    }
 +    // Purpur end - Stonecutter damage
-+
+ 
      public DamageSource inFire() {
          return this.inFire;
-     }

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +12,7 @@ class HungerMobEffect extends MobEffect {
+@@ -12,7 +_,7 @@
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
          if (entity instanceof Player player) {

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +12,8 @@ public class PoisonMobEffect extends MobEffect {
+@@ -12,8 +_,8 @@
  
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +11,7 @@ class RegenerationMobEffect extends MobEffect {
+@@ -11,7 +_,7 @@
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
          if (entity.getHealth() < entity.getMaxHealth()) {

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +16,8 @@ class SaturationMobEffect extends InstantenousMobEffect {
+@@ -16,7 +_,8 @@
              int oldFoodLevel = player.getFoodData().foodLevel;
              org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, amplifier + 1 + oldFoodLevel);
              if (!event.isCancelled()) {

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +12,7 @@ public class WitherMobEffect extends MobEffect {
+@@ -12,7 +_,7 @@
  
      @Override
      public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa16ca695d5 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -148,6 +148,7 @@ import org.jetbrains.annotations.Contract;
+@@ -148,6 +_,7 @@
  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
@@ -16,7 +8,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
      // 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 +281,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -280,8 +_,9 @@
      public double xOld;
      public double yOld;
      public double zOld;
@@ -27,7 +19,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
      public int tickCount;
      private int remainingFireTicks;
      public boolean wasTouchingWater;
-@@ -315,8 +317,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -315,13 +_,13 @@
      public PortalProcessor portalProcess;
      public int portalCooldown;
      private boolean invulnerable;
@@ -38,7 +30,13 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
      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 +373,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     private long pistonDeltasGameTime;
+-    protected EntityDimensions dimensions;
++    private EntityDimensions dimensions;
+     private float eyeHeight;
+     public boolean isInPowderSnow;
+     public boolean wasInPowderSnow;
+@@ -371,6 +_,7 @@
      public long activatedTick = Integer.MIN_VALUE;
      public boolean isTemporarilyActive;
      public long activatedImmunityTick = Integer.MIN_VALUE;
@@ -46,7 +44,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
  
      public void inactiveTick() {
      }
-@@ -533,10 +536,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -533,10 +_,21 @@
      }
      // Paper end - optimise entity tracker
  
@@ -68,7 +66,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
          this.position = Vec3.ZERO;
          this.blockPosition = BlockPos.ZERO;
          this.chunkPosition = ChunkPos.ZERO;
-@@ -911,6 +925,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -911,6 +_,7 @@
              && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
              && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
              // Paper end - Configurable nether ceiling damage
@@ -76,7 +74,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
              this.onBelowWorld();
          }
      }
-@@ -1889,7 +1904,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1889,7 +_,7 @@
      }
  
      public boolean fireImmune() {
@@ -85,7 +83,16 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
      }
  
      public boolean causeFallDamage(double fallDistance, float damageMultiplier, DamageSource damageSource) {
-@@ -2585,6 +2600,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1964,7 +_,7 @@
+         return this.isInWater() || flag;
+     }
+ 
+-    public void updateInWaterStateAndDoWaterCurrentPushing() {
++    void updateInWaterStateAndDoWaterCurrentPushing() {
+         if (this.getVehicle() instanceof AbstractBoat abstractBoat && !abstractBoat.isUnderWater()) {
+             this.wasTouchingWater = false;
+         } else if (this.updateFluidHeightAndDoFluidPushing(FluidTags.WATER, 0.014)) {
+@@ -2585,6 +_,11 @@
                  output.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -97,7 +104,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
          } catch (Throwable var7) {
              CrashReport crashReport = CrashReport.forThrowable(var7, "Saving entity NBT");
              CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being saved");
-@@ -2705,6 +2725,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2705,6 +_,9 @@
              }
              freezeLocked = input.getBooleanOr("Paper.FreezeLock", false);
              // Paper end
@@ -107,7 +114,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
          } catch (Throwable var7) {
              CrashReport crashReport = CrashReport.forThrowable(var7, "Loading entity NBT");
              CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being loaded");
-@@ -2983,6 +3006,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2983,6 +_,7 @@
              if (this.isAlive() && this instanceof Leashable leashable2) {
                  if (leashable2.getLeashHolder() == player) {
                      if (!this.level().isClientSide()) {
@@ -115,7 +122,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
                          // Paper start - EntityUnleashEvent
                          if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent(
                              leashable2, player, hand, !player.hasInfiniteMaterials(), true
-@@ -3389,15 +3413,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3389,15 +_,18 @@
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
@@ -135,7 +142,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
              }
          }
      }
-@@ -3602,7 +3629,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3602,7 +_,7 @@
      }
  
      public int getMaxAirSupply() {
@@ -144,7 +151,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
      }
  
      public int getAirSupply() {
-@@ -4156,7 +4183,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4156,7 +_,7 @@
      // CraftBukkit end
  
      public boolean canUsePortal(boolean allowPassengers) {
@@ -153,7 +160,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
      }
  
      public boolean canTeleport(Level fromLevel, Level toLevel) {
-@@ -4681,6 +4708,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4681,6 +_,12 @@
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
  
@@ -166,7 +173,7 @@ index c6f1dd8b22156c8e2707c06c0ebe53f22913c31b..1d8ba25d542c49a687414a8b6d1d2fa1
      // Paper start - optimise collisions
      public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
          if (this.touchingUnloadedChunk()) {
-@@ -5107,7 +5140,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5107,7 +_,7 @@
      }
  
      public float maxUpStep() {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +28,8 @@ public final class EntitySelector {
+@@ -28,6 +_,8 @@
          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

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch

@@ -1,14 +1,15 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +1105,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -1089,7 +_,7 @@
+     @Nullable
+     private Component description;
+     private final Optional<ResourceKey<LootTable>> lootTable;
+-    public EntityDimensions dimensions;
++    private final EntityDimensions dimensions;
+     private final float spawnDimensionsScale;
+     private final FeatureFlagSet requiredFeatures;
+ 
+@@ -1105,6 +_,16 @@
          return register(vanillaEntityId(key), builder);
      }
  
@@ -25,7 +26,7 @@ index 96e1f8f40a0af4350155f192ac2126b523c9f0f5..9950fccc0a708e701b81fcabc9e8f370
      public static ResourceLocation getKey(EntityType<?> entityType) {
          return BuiltInRegistries.ENTITY_TYPE.getKey(entityType);
      }
-@@ -1335,6 +1345,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -1335,6 +_,16 @@
          return this.category;
      }
  
@@ -42,7 +43,7 @@ index 96e1f8f40a0af4350155f192ac2126b523c9f0f5..9950fccc0a708e701b81fcabc9e8f370
      public String getDescriptionId() {
          return this.descriptionId;
      }
-@@ -1394,7 +1414,11 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -1394,7 +_,11 @@
                  entity.load(input);
              },
              // Paper end - Don't fire sync event during generation

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 a62edee768c30c99213baa6bd736d67ae52b558c..c8354d46ed909090f7c15f396863bf7d73afcefa 100644
 --- a/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/net/minecraft/world/entity/ExperienceOrb.java
-@@ -358,7 +358,7 @@ public class ExperienceOrb extends Entity {
+@@ -358,7 +_,7 @@
      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
@@ -17,7 +9,7 @@ index a62edee768c30c99213baa6bd736d67ae52b558c..c8354d46ed909090f7c15f396863bf7d
                  entity.take(this, 1);
                  int i = this.repairPlayerItems(serverPlayer, this.getValue());
                  if (i > 0) {
-@@ -374,7 +374,7 @@ public class ExperienceOrb extends Entity {
+@@ -374,7 +_,7 @@
      }
  
      private int repairPlayerItems(ServerPlayer player, int value) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +27,13 @@ public class GlowSquid extends Squid {
+@@ -27,6 +_,13 @@
          super(entityType, level);
      }
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1ba74bfa6a 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -444,6 +444,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -444,6 +_,12 @@
                  if (d < 0.0) {
                      double damagePerBlock = serverLevel1.getWorldBorder().getDamagePerBlock();
                      if (damagePerBlock > 0.0) {
@@ -21,7 +13,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
                          this.hurtServer(serverLevel1, this.damageSources().outOfBorder(), Math.max(1, Mth.floor(-d * damagePerBlock)));
                      }
                  }
-@@ -456,10 +462,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -456,10 +_,10 @@
                      && (!flag || !((Player)this).getAbilities().invulnerable);
                  if (flag1) {
                      this.setAirSupply(this.decreaseAirSupply(this.getAirSupply()));
@@ -34,7 +26,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
                      }
                  } else if (this.getAirSupply() < this.getMaxAirSupply()) {
                      this.setAirSupply(this.increaseAirSupply(this.getAirSupply()));
-@@ -1039,15 +1045,33 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1039,14 +_,32 @@
          if (lookingEntity != null) {
              ItemStack itemBySlot = this.getItemBySlot(EquipmentSlot.HEAD);
              EntityType<?> type = lookingEntity.getType();
@@ -44,13 +36,15 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
 -                || 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;
 +            }
@@ -58,8 +52,8 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
 +                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)) {
@@ -70,11 +64,10 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
 +            }
 +        }
 +        // 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();
@@ -82,7 +75,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
                  EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
                  if (event.isCancelled()) {
                      continue;
-@@ -1417,6 +1442,24 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1417,6 +_,24 @@
                  this.stopSleeping();
              }
  
@@ -107,7 +100,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
              this.noActionTime = 0;
              if (amount < 0.0F) {
                  amount = 0.0F;
-@@ -1678,10 +1721,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1678,10 +_,10 @@
      protected Player resolvePlayerResponsibleForDamage(DamageSource damageSource) {
          Entity entity = damageSource.getEntity();
          if (entity instanceof Player player) {
@@ -120,7 +113,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
              } else {
                  this.lastHurtByPlayer = null;
                  this.lastHurtByPlayerMemoryTime = 0;
-@@ -1732,6 +1775,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1732,6 +_,18 @@
                  }
              }
  
@@ -139,7 +132,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
              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 +1962,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1907,6 +_,7 @@
          boolean flag = this.lastHurtByPlayerMemoryTime > 0;
          this.dropEquipment(level); // CraftBukkit - from below
          if (this.shouldDropLoot() && level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -147,7 +140,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
              this.dropFromLootTable(level, damageSource, flag);
              // Paper start
              final boolean prev = this.clearEquipmentSlots;
-@@ -1915,6 +1971,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1915,6 +_,7 @@
              // Paper end
              this.dropCustomDeathLoot(level, damageSource, flag);
              this.clearEquipmentSlots = prev; // Paper
@@ -155,7 +148,7 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
          }
  
          // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
-@@ -3109,6 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -3109,6 +_,7 @@
              float f = (float)(d * 10.0 - 3.0);
              if (f > 0.0F) {
                  this.playSound(this.getFallDamageSound((int)f), 1.0F, 1.0F);
@@ -163,16 +156,25 @@ index 35d71978a3d360eed97feb66d1048bee337ef2b9..96e47e6145a4cce8c154a05f9b155c1b
                  this.hurt(this.damageSources().flyIntoWall(), f);
              }
          }
-@@ -4508,6 +4566,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -3628,7 +_,7 @@
-             : slot == equippable.slot() && this.canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(this.getType());
+         }
      }
  
+-    public boolean canGlide() {
++    protected boolean canGlide() {
+         if (!this.onGround() && !this.isPassenger() && !this.hasEffect(MobEffects.LEVITATION)) {
+             for (EquipmentSlot equipmentSlot : EquipmentSlot.VALUES) {
+                 if (canGlideUsing(this.getItemBySlot(equipmentSlot), equipmentSlot)) {
+@@ -4507,6 +_,12 @@
+             ? slot == EquipmentSlot.MAINHAND && this.canUseSlot(EquipmentSlot.MAINHAND)
+             : 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)

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 0470c4bbf8be7e48ce8dfa4910c3b9f5ebb23360..9784ae86390748bf72e2cc75d67b99f766335ee8 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -139,6 +139,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -139,6 +_,7 @@
      private BlockPos homePosition = BlockPos.ZERO;
      private int homeRadius = -1;
      public boolean aware = true; // CraftBukkit
@@ -16,7 +8,7 @@ index 0470c4bbf8be7e48ce8dfa4910c3b9f5ebb23360..9784ae86390748bf72e2cc75d67b99f7
  
      protected Mob(EntityType<? extends Mob> entityType, Level level) {
          super(entityType, level);
-@@ -284,6 +285,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -284,6 +_,7 @@
                  target = null;
              }
          }
@@ -24,13 +16,14 @@ index 0470c4bbf8be7e48ce8dfa4910c3b9f5ebb23360..9784ae86390748bf72e2cc75d67b99f7
          this.target = target;
          return true;
          // CraftBukkit end
-@@ -327,8 +329,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -327,7 +_,27 @@
          }
  
          profilerFiller.pop();
+-    }
 +        incrementTicksSinceLastInteraction(); // Purpur - Entity lifespan
-     }
++    }
- 
++
 +    // Purpur start - Entity lifespan
 +    private void incrementTicksSinceLastInteraction() {
 +        ++this.ticksSinceLastInteraction;
@@ -49,11 +42,10 @@ index 0470c4bbf8be7e48ce8dfa4910c3b9f5ebb23360..9784ae86390748bf72e2cc75d67b99f7
 +        }
 +    }
 +    // Purpur end - Entity lifespan
-+
+ 
      @Override
      protected void playHurtSound(DamageSource source) {
-         this.resetAmbientSoundTime();
+@@ -427,6 +_,7 @@
-@@ -427,6 +449,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              output.putBoolean("NoAI", this.isNoAi());
          }
          output.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -61,7 +53,7 @@ index 0470c4bbf8be7e48ce8dfa4910c3b9f5ebb23360..9784ae86390748bf72e2cc75d67b99f7
      }
  
      @Override
-@@ -454,6 +477,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -454,6 +_,7 @@
          this.lootTableSeed = input.getLongOr("DeathLootTableSeed", 0L);
          this.setNoAi(input.getBooleanOr("NoAI", false));
          this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit
@@ -69,7 +61,7 @@ index 0470c4bbf8be7e48ce8dfa4910c3b9f5ebb23360..9784ae86390748bf72e2cc75d67b99f7
      }
  
      @Override
-@@ -1188,7 +1212,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1188,7 +_,7 @@
              );
          }
  
@@ -78,7 +70,7 @@ index 0470c4bbf8be7e48ce8dfa4910c3b9f5ebb23360..9784ae86390748bf72e2cc75d67b99f7
          return spawnGroupData;
      }
  
-@@ -1525,6 +1549,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1525,6 +_,7 @@
              this.playAttackSound();
          }
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
++++ b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java
+@@ -29,6 +_,7 @@
+ 
+     @Override
+     public double sanitizeValue(double value) {
++        if (!org.purpurmc.purpur.PurpurConfig.clampAttributes) return Double.isNaN(value) ? this.minValue : value; // Purpur - Add attribute clamping and armor limit config
+         return Double.isNaN(value) ? this.minValue : Mth.clamp(value, this.minValue, this.maxValue);
+     }
+ }

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 b9174ae7e3a3e2de2d570b95ab5012ac3c3a2eda..67cbf9f5760fae5db6f31e64095cd1b6be6ade8e 100644
 --- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-@@ -86,7 +86,7 @@ public class AcquirePoi {
+@@ -86,7 +_,7 @@
                              };
                              // Paper start - optimise POI access
                              final java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +55,7 @@ public class InteractWithDoor {
+@@ -55,7 +_,7 @@
                              Node nextNode = path.getNextNode();
                              BlockPos blockPos = previousNode.asBlockPos();
                              BlockState blockState = level.getBlockState(blockPos);
@@ -17,7 +9,7 @@ index 296ecffbbce931b42c67ea523373a61cea23acf4..b2eec24be3635f2c19da9b147211fe6c
                                  DoorBlock doorBlock = (DoorBlock)blockState.getBlock();
                                  if (!doorBlock.isOpen(blockState)) {
                                      // CraftBukkit start - entities opening doors
-@@ -72,7 +72,7 @@ public class InteractWithDoor {
+@@ -72,7 +_,7 @@
  
                              BlockPos blockPos1 = nextNode.asBlockPos();
                              BlockState blockState1 = level.getBlockState(blockPos1);
@@ -26,7 +18,7 @@ index 296ecffbbce931b42c67ea523373a61cea23acf4..b2eec24be3635f2c19da9b147211fe6c
                                  DoorBlock doorBlock1 = (DoorBlock)blockState1.getBlock();
                                  if (!doorBlock1.isOpen(blockState1)) {
                                      // CraftBukkit start - entities opening doors
-@@ -118,7 +118,7 @@ public class InteractWithDoor {
+@@ -118,7 +_,7 @@
                      iterator.remove();
                  } else {
                      BlockState blockState = level.getBlockState(blockPos);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +46,7 @@ public class ShowTradesToPlayer extends Behavior<Villager> {
+@@ -46,6 +_,7 @@
  
      @Override
      public boolean canStillUse(ServerLevel level, Villager entity, long gameTime) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
+@@ -22,6 +_,7 @@
  
      @Override
      public boolean canUse() {
@@ -16,7 +8,7 @@ index 6eaf0bd944349cd0c6084462ac385fa2caafe933..be59d0c27a83b329ec3f97c029cfb9c1
          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 +72,7 @@ public class LlamaFollowCaravanGoal extends Goal {
+@@ -71,6 +_,7 @@
  
      @Override
      public boolean canContinueToUse() {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +116,9 @@ public class RangedBowAttackGoal<T extends Monster & RangedAttackMob> extends Go
+@@ -116,9 +_,9 @@
                  }
  
                  this.mob.lookAt(target, 30.0F, 30.0F);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +58,7 @@ public class RunAroundLikeCrazyGoal extends Goal {
+@@ -58,7 +_,7 @@
              if (firstPassenger instanceof Player player) {
                  int temper = this.horse.getTemper();
                  int maxTemper = this.horse.getMaxTemper();

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +55,14 @@ public class SwellGoal extends Goal {
+@@ -55,6 +_,14 @@
              this.creeper.setSwellDir(-1);
          } else {
              this.creeper.setSwellDir(1);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +56,7 @@ public class NearestBedSensor extends Sensor<Mob> {
+@@ -56,7 +_,7 @@
              // 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.

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +64,10 @@ public class TargetingConditions {
+@@ -64,6 +_,10 @@
              return false;
          } else if (this.selector != null && !this.selector.test(target, level)) {
              return false;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +233,7 @@ public class Bat extends AmbientCreature {
+@@ -233,7 +_,7 @@
          } else {
              int maxLocalRawBrightness = level.getMaxLocalRawBrightness(pos);
              int i = 4;
@@ -17,7 +9,7 @@ index 912b099a51269f92f250c7d6094ad41817749f93..c1c9d056f5c78d26c777728c09b2481f
                  i = 7;
              } else if (randomSource.nextBoolean()) {
                  return false;
-@@ -245,6 +245,11 @@ public class Bat extends AmbientCreature {
+@@ -245,6 +_,11 @@
          }
      }
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +39,7 @@ public abstract class AbstractCow extends Animal {
+@@ -39,7 +_,7 @@
          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));
@@ -17,7 +9,7 @@ index dd8ea03ba823996a5c97562e357650ab34d0e32e..4e81bc7215c845b316bcd46ce29f49af
          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 +95,10 @@ public abstract class AbstractCow extends Animal {
+@@ -95,6 +_,10 @@
              ItemStack itemStack = ItemUtils.createFilledResult(itemInHand, player, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit
              player.setItemInHand(hand, itemStack);
              return InteractionResult.SUCCESS;
@@ -28,7 +20,7 @@ index dd8ea03ba823996a5c97562e357650ab34d0e32e..4e81bc7215c845b316bcd46ce29f49af
          } else {
              return super.mobInteract(player, hand);
          }
-@@ -104,4 +108,67 @@ public abstract class AbstractCow extends Animal {
+@@ -104,4 +_,67 @@
      public EntityDimensions getDefaultDimensions(Pose pose) {
          return this.isBaby() ? BABY_DIMENSIONS : super.getDefaultDimensions(pose);
      }

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +143,7 @@ public abstract class Animal extends AgeableMob {
+@@ -143,7 +_,7 @@
          ItemStack itemInHand = player.getItemInHand(hand);
          if (this.isFood(itemInHand)) {
              int age = this.getAge();
@@ -17,7 +9,7 @@ index cdf44c2586db396f1afdcbae4174b8b4fb00f48e..235f6514328338d28c2bf967bcd06f14
                  final ItemStack breedCopy = itemInHand.copy(); // Paper - Fix EntityBreedEvent copying
                  this.usePlayerItem(player, hand, itemInHand);
                  this.setInLove(serverPlayer, breedCopy); // Paper - Fix EntityBreedEvent copying
-@@ -235,10 +235,20 @@ public abstract class Animal extends AgeableMob {
+@@ -235,10 +_,20 @@
      public void spawnChildFromBreeding(ServerLevel level, Animal mate) {
          AgeableMob breedOffspring = this.getBreedOffspring(level, mate);
          if (breedOffspring != null) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 d40954f03c865bfbc5beb308bbcf7b7c9ac48eb9..5588eb85a101f118fcaeb0a085f4d3b69498c72d 100644
 --- a/net/minecraft/world/entity/animal/Bee.java
 +++ b/net/minecraft/world/entity/animal/Bee.java
-@@ -168,7 +168,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -168,7 +_,7 @@
          // Paper end - Fix MC-167279
          this.lookControl = new Bee.BeeLookControl(this);
          this.setPathfindingMalus(PathType.DANGER_FIRE, -1.0F);
@@ -17,7 +9,7 @@ index d40954f03c865bfbc5beb308bbcf7b7c9ac48eb9..5588eb85a101f118fcaeb0a085f4d3b6
          this.setPathfindingMalus(PathType.WATER_BORDER, 16.0F);
          this.setPathfindingMalus(PathType.COCOA, -1.0F);
          this.setPathfindingMalus(PathType.FENCE, -1.0F);
-@@ -366,7 +366,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -366,7 +_,7 @@
      }
  
      public static boolean isNightOrRaining(Level level) {
@@ -26,7 +18,7 @@ index d40954f03c865bfbc5beb308bbcf7b7c9ac48eb9..5588eb85a101f118fcaeb0a085f4d3b6
      }
  
      public void setStayOutOfHiveCountdown(int stayOutOfHiveCountdown) {
-@@ -389,7 +389,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -389,7 +_,7 @@
      @Override
      protected void customServerAiStep(ServerLevel level) {
          boolean hasStung = this.hasStung();
@@ -35,7 +27,7 @@ index d40954f03c865bfbc5beb308bbcf7b7c9ac48eb9..5588eb85a101f118fcaeb0a085f4d3b6
              this.underWaterTicks++;
          } else {
              this.underWaterTicks = 0;
-@@ -399,6 +399,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -399,6 +_,7 @@
              this.hurtServer(level, this.damageSources().drown(), 1.0F);
          }
  
@@ -43,7 +35,7 @@ index d40954f03c865bfbc5beb308bbcf7b7c9ac48eb9..5588eb85a101f118fcaeb0a085f4d3b6
          if (hasStung) {
              this.timeSinceSting++;
              if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) {
-@@ -1133,6 +1134,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1133,6 +_,7 @@
                      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);
@@ -51,7 +43,7 @@ index d40954f03c865bfbc5beb308bbcf7b7c9ac48eb9..5588eb85a101f118fcaeb0a085f4d3b6
                      return true;
                  } else {
                      Bee.this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(Bee.this.random, 20, 60);
-@@ -1179,6 +1181,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1179,6 +_,7 @@
              this.pollinating = false;
              Bee.this.navigation.stop();
              Bee.this.remainingCooldownBeforeLocatingNewFlower = 200;
@@ -59,7 +51,7 @@ index d40954f03c865bfbc5beb308bbcf7b7c9ac48eb9..5588eb85a101f118fcaeb0a085f4d3b6
          }
  
          @Override
-@@ -1225,6 +1228,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1225,6 +_,7 @@
                                  this.setWantedPos();
                              }
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +354,14 @@ public class Cat extends TamableAnimal {
+@@ -354,6 +_,14 @@
          return this.isTame() && otherAnimal instanceof Cat cat && cat.isTame() && super.canMate(otherAnimal);
      }
  
@@ -23,7 +15,7 @@ index 7d20de1741e5e9219dea84fe5692f31c05fa82a2..5b9d8c85f91396287b0deb4deac30e2c
      @Nullable
      @Override
      public SpawnGroupData finalizeSpawn(
-@@ -452,7 +460,7 @@ public class Cat extends TamableAnimal {
+@@ -452,7 +_,7 @@
      }
  
      private void tryToTame(Player player) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +74,7 @@ public class Dolphin extends AgeableWaterCreature {
+@@ -74,6 +_,7 @@
      private static final boolean DEFAULT_GOT_FISH = false;
      @Nullable
      public BlockPos treasurePos;
@@ -16,7 +8,7 @@ index 4bb273b11dbfbc6557c6771f79aa63f5f69d03cf..f4a6f17bb158146e7287ab46930cd57c
  
      public Dolphin(EntityType<? extends Dolphin> entityType, Level level) {
          super(entityType, level);
-@@ -90,6 +91,7 @@ public class Dolphin extends AgeableWaterCreature {
+@@ -90,6 +_,7 @@
          this.setAirSupply(this.getMaxAirSupply());
          this.setXRot(0.0F);
          SpawnGroupData spawnGroupData1 = Objects.requireNonNullElseGet(spawnGroupData, () -> new AgeableMob.AgeableMobGroupData(0.1F));
@@ -24,7 +16,7 @@ index 4bb273b11dbfbc6557c6771f79aa63f5f69d03cf..f4a6f17bb158146e7287ab46930cd57c
          return super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData1);
      }
  
-@@ -156,17 +158,19 @@ public class Dolphin extends AgeableWaterCreature {
+@@ -156,17 +_,19 @@
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new BreathAirGoal(this));
          this.goalSelector.addGoal(0, new TryFindWaterGoal(this));
@@ -45,7 +37,7 @@ index 4bb273b11dbfbc6557c6771f79aa63f5f69d03cf..f4a6f17bb158146e7287ab46930cd57c
      }
  
      public static AttributeSupplier.Builder createAttributes() {
-@@ -399,6 +403,7 @@ public class Dolphin extends AgeableWaterCreature {
+@@ -399,6 +_,7 @@
  
          @Override
          public boolean canUse() {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +346,11 @@ public class Fox extends Animal {
+@@ -346,6 +_,11 @@
      }
  
      private void setTargetGoals() {
@@ -20,7 +12,7 @@ index 517c546cfc8eca2191df57289e6a22ac64fc867c..354c7a41407fc6518965d09bfe308967
          if (this.getVariant() == Fox.Variant.RED) {
              this.targetSelector.addGoal(4, this.landTargetGoal);
              this.targetSelector.addGoal(4, this.turtleEggTargetGoal);
-@@ -373,6 +378,7 @@ public class Fox extends Animal {
+@@ -373,6 +_,7 @@
  
      public void setVariant(Fox.Variant variant) {
          this.entityData.set(DATA_TYPE_ID, variant.getId());
@@ -28,10 +20,11 @@ index 517c546cfc8eca2191df57289e6a22ac64fc867c..354c7a41407fc6518965d09bfe308967
      }
  
      @Nullable
-@@ -703,6 +709,29 @@ public class Fox extends Animal {
+@@ -702,6 +_,29 @@
+         return slot == EquipmentSlot.MAINHAND;
      }
      // Paper end
- 
++
 +    // Purpur start - Tulips change fox type
 +    @Override
 +    public net.minecraft.world.InteractionResult mobInteract(Player player, net.minecraft.world.InteractionHand hand) {
@@ -54,7 +47,6 @@ index 517c546cfc8eca2191df57289e6a22ac64fc867c..354c7a41407fc6518965d09bfe308967
 +        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) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +58,26 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -58,13 +_,26 @@
      private int remainingPersistentAngerTime;
      @Nullable
      private UUID persistentAngerTarget;
@@ -35,7 +27,7 @@ index db309a1261778cc65da9b4bf5a962a372b83bba6..25e0438e1a98dc5f6aaabba8af2295ce
          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 +155,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -142,6 +_,7 @@
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.putBoolean("PlayerCreated", this.isPlayerCreated());
@@ -43,7 +35,7 @@ index db309a1261778cc65da9b4bf5a962a372b83bba6..25e0438e1a98dc5f6aaabba8af2295ce
          this.addPersistentAngerSaveData(output);
      }
  
-@@ -149,6 +163,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -149,6 +_,7 @@
      protected void readAdditionalSaveData(ValueInput input) {
          super.readAdditionalSaveData(input);
          this.setPlayerCreated(input.getBooleanOr("PlayerCreated", false));
@@ -51,7 +43,7 @@ index db309a1261778cc65da9b4bf5a962a372b83bba6..25e0438e1a98dc5f6aaabba8af2295ce
          this.readPersistentAngerSaveData(this.level(), input);
      }
  
-@@ -268,6 +283,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -268,6 +_,7 @@
                  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);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +199,13 @@ public class MushroomCow extends AbstractCow implements Shearable {
+@@ -199,6 +_,13 @@
          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);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +234,7 @@ public class Ocelot extends Animal {
+@@ -234,7 +_,7 @@
      public boolean checkSpawnObstruction(LevelReader level) {
          if (level.isUnobstructed(this) && !level.containsAnyLiquid(this.getBoundingBox())) {
              BlockPos blockPos = this.blockPosition();

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +159,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
+@@ -159,6 +_,7 @@
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new TamableAnimal.TamableAnimalPanicGoal(1.25));
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -16,7 +8,7 @@ index 22d1e36dadd6a8cbf615335074426aaab6ea7d01..50d836960e6b2d7dae760ac648b5999d
          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 +265,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
+@@ -264,7 +_,7 @@
              }
  
              if (!this.level().isClientSide) {
@@ -25,7 +17,7 @@ index 22d1e36dadd6a8cbf615335074426aaab6ea7d01..50d836960e6b2d7dae760ac648b5999d
                      this.tame(player);
                      this.level().broadcastEntityEvent(this, (byte)7);
                  } else {
-@@ -272,6 +273,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
+@@ -272,6 +_,7 @@
                  }
              }
  
@@ -33,7 +25,7 @@ index 22d1e36dadd6a8cbf615335074426aaab6ea7d01..50d836960e6b2d7dae760ac648b5999d
              return InteractionResult.SUCCESS;
          } else if (!itemInHand.is(ItemTags.PARROT_POISONOUS_FOOD)) {
              if (!this.isFlying() && this.isTame() && this.isOwnedBy(player)) {
-@@ -296,7 +298,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
+@@ -296,7 +_,7 @@
  
      @Override
      public boolean isFood(ItemStack stack) {
@@ -42,7 +34,7 @@ index 22d1e36dadd6a8cbf615335074426aaab6ea7d01..50d836960e6b2d7dae760ac648b5999d
      }
  
      public static boolean checkParrotSpawnRules(
-@@ -311,13 +313,13 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
+@@ -311,13 +_,13 @@
  
      @Override
      public boolean canMate(Animal otherAnimal) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +142,19 @@ public class Pig extends Animal implements ItemSteerable {
+@@ -142,6 +_,19 @@
      @Override
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          boolean isFood = this.isFood(player.getItemInHand(hand));

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +65,29 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -65,6 +_,29 @@
          super(entityType, level);
      }
  
@@ -38,7 +30,7 @@ index d727e8e93e466b9bb91cbb43b9c1bbbccc56d486..0cbe162c952fe3cba5c33284d766aea5
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel level, AgeableMob otherParent) {
-@@ -73,7 +96,7 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -73,7 +_,7 @@
  
      @Override
      public boolean isFood(ItemStack stack) {
@@ -47,7 +39,7 @@ index d727e8e93e466b9bb91cbb43b9c1bbbccc56d486..0cbe162c952fe3cba5c33284d766aea5
      }
  
      @Override
-@@ -82,6 +105,12 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -82,6 +_,12 @@
          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));

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +404,23 @@ public class Rabbit extends Animal {
+@@ -404,10 +_,23 @@
          }
  
          this.setVariant(randomRabbitVariant);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +46,27 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -46,15 +_,27 @@
      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;
@@ -38,7 +30,7 @@ index 1b3a020e35fb2f9a28be718415c51fde5b52d399..1a7c14f9307629386af0a62b3e195457
          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 +86,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -74,12 +_,14 @@
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.putBoolean("Pumpkin", this.hasPumpkin());
@@ -53,7 +45,7 @@ index 1b3a020e35fb2f9a28be718415c51fde5b52d399..1a7c14f9307629386af0a62b3e195457
      }
  
      @Override
-@@ -153,6 +167,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -153,6 +_,14 @@
              }
  
              return InteractionResult.SUCCESS;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +46,29 @@ public class Squid extends AgeableWaterCreature {
+@@ -46,10 +_,29 @@
  
      public Squid(EntityType<? extends Squid> entityType, Level level) {
          super(entityType, level);
@@ -39,7 +31,7 @@ index 58e1bc90cbc32669fa6c66d214119f0c459ff38c..2e51e64991d326fc055520b6fefc76e8
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
-@@ -127,6 +146,7 @@ public class Squid extends AgeableWaterCreature {
+@@ -127,6 +_,7 @@
          }
  
          if (this.isInWater()) {
@@ -47,7 +39,7 @@ index 58e1bc90cbc32669fa6c66d214119f0c459ff38c..2e51e64991d326fc055520b6fefc76e8
              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 +328,7 @@ public class Squid extends AgeableWaterCreature {
+@@ -308,7 +_,7 @@
              int noActionTime = this.squid.getNoActionTime();
              if (noActionTime > 100) {
                  this.squid.movementVector = Vec3.ZERO;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +76,7 @@ public abstract class WaterAnimal extends PathfinderMob {
+@@ -76,8 +_,7 @@
          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

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +396,7 @@ public class Goat extends Animal {
+@@ -396,6 +_,7 @@
  
      // Paper start - Goat ram API
      public void ram(net.minecraft.world.entity.LivingEntity entity) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +78,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
+@@ -78,6 +_,7 @@
      private Llama caravanHead;
      @Nullable
      public Llama caravanTail; // Paper
@@ -16,7 +8,7 @@ index 1e2b629641e5fa1040307461dbbf03ad2d75ba00..5e3382351b1b5728750534f64babc85c
  
      public Llama(EntityType<? extends Llama> entityType, Level level) {
          super(entityType, level);
-@@ -112,6 +113,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
+@@ -112,6 +_,7 @@
          super.addAdditionalSaveData(output);
          output.store("Variant", Llama.Variant.LEGACY_CODEC, this.getVariant());
          output.putInt("Strength", this.getStrength());
@@ -24,7 +16,7 @@ index 1e2b629641e5fa1040307461dbbf03ad2d75ba00..5e3382351b1b5728750534f64babc85c
      }
  
      @Override
-@@ -119,6 +121,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
+@@ -119,6 +_,7 @@
          this.setStrength(input.getIntOr("Strength", 0));
          super.readAdditionalSaveData(input);
          this.setVariant(input.read("Variant", Llama.Variant.LEGACY_CODEC).orElse(Llama.Variant.DEFAULT));
@@ -32,7 +24,7 @@ index 1e2b629641e5fa1040307461dbbf03ad2d75ba00..5e3382351b1b5728750534f64babc85c
      }
  
      @Override
-@@ -400,6 +403,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
+@@ -400,6 +_,7 @@
  
      public void leaveCaravan() {
          if (this.caravanHead != null) {
@@ -40,7 +32,7 @@ index 1e2b629641e5fa1040307461dbbf03ad2d75ba00..5e3382351b1b5728750534f64babc85c
              this.caravanHead.caravanTail = null;
          }
  
-@@ -407,6 +411,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
+@@ -407,6 +_,7 @@
      }
  
      public void joinCaravan(Llama caravanHead) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +99,37 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -99,6 +_,37 @@
          EntityType<?> type = entity.getType();
          return type == EntityType.SHEEP || type == EntityType.RABBIT || type == EntityType.FOX;
      };
@@ -46,7 +38,7 @@ index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fb
      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 +152,47 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -121,12 +_,47 @@
          this.setPathfindingMalus(PathType.DANGER_POWDER_SNOW, -1.0F);
      }
  
@@ -94,7 +86,7 @@ index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fb
          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 +205,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -139,7 +_,7 @@
          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));
@@ -103,7 +95,7 @@ index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fb
          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 +296,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -230,6 +_,7 @@
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.store("CollarColor", DyeColor.LEGACY_ID_CODEC, this.getCollarColor());
@@ -111,7 +103,7 @@ index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fb
          VariantUtils.writeVariant(output, this.getVariant());
          this.addPersistentAngerSaveData(output);
          this.getSoundVariant()
-@@ -244,6 +311,10 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -244,6 +_,10 @@
          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));
@@ -122,7 +114,7 @@ index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fb
          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 +339,10 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -268,6 +_,10 @@
          }
  
          this.setSoundVariant(WolfSoundVariants.pickRandomSoundVariant(this.registryAccess(), level.getRandom()));
@@ -133,7 +125,7 @@ index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fb
          return super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData);
      }
  
-@@ -318,6 +393,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -318,6 +_,11 @@
      public void tick() {
          super.tick();
          if (this.isAlive()) {
@@ -145,7 +137,7 @@ index dca01e7e6af74bc6e26d4968ccdf0c34f8707b94..6fc2d5d558832dd55479deb9ad5984fb
              this.interestedAngleO = this.interestedAngle;
              if (this.isInterested()) {
                  this.interestedAngle = this.interestedAngle + (1.0F - this.interestedAngle) * 0.4F;
-@@ -519,13 +599,27 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -519,13 +_,27 @@
              itemInHand.consume(1, player);
              this.tryToTame(player);
              return InteractionResult.SUCCESS_SERVER;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +39,24 @@ public class EndCrystal extends Entity {
+@@ -39,6 +_,24 @@
          this.setPos(x, y, z);
      }
  
@@ -33,7 +25,7 @@ index a0e0fad40838fa7d835f31e5ce4ae3ab40e0bfa4..5bff703ae4f95091620dec5347246d7c
      @Override
      protected Entity.MovementEmission getMovementEmission() {
          return Entity.MovementEmission.NONE;
-@@ -75,6 +93,8 @@ public class EndCrystal extends Entity {
+@@ -75,6 +_,8 @@
              }
          }
          // Paper end - Fix invulnerable end crystals
@@ -42,7 +34,7 @@ index a0e0fad40838fa7d835f31e5ce4ae3ab40e0bfa4..5bff703ae4f95091620dec5347246d7c
      }
  
      @Override
-@@ -115,15 +135,17 @@ public class EndCrystal extends Entity {
+@@ -115,15 +_,17 @@
                  }
                  // CraftBukkit end
                  if (!damageSource.is(DamageTypeTags.IS_EXPLOSION)) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +961,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -961,6 +_,7 @@
  
      @Override
      protected boolean canRide(Entity entity) {
@@ -16,7 +8,7 @@ index 84d215a498d9bf6f1232bf4af5a4a98d3ba9b131..3389c79e18601d582f95fe3765c291d4
          return false;
      }
  
-@@ -996,7 +997,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -996,7 +_,7 @@
          boolean flag = level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
          int i = 500;
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..c4a2fb6f08e5d6d69571f448c6ac9defaac3fcd3 100644
 --- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -79,6 +79,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -79,6 +_,7 @@
      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);
@@ -16,7 +8,7 @@ index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..c4a2fb6f08e5d6d69571f448c6ac9def
  
      public WitherBoss(EntityType<? extends WitherBoss> entityType, Level level) {
          super(entityType, level);
-@@ -87,6 +88,17 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -87,6 +_,17 @@
          this.xpReward = 50;
      }
  
@@ -34,7 +26,7 @@ index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..c4a2fb6f08e5d6d69571f448c6ac9def
      @Override
      protected PathNavigation createNavigation(Level level) {
          FlyingPathNavigation flyingPathNavigation = new FlyingPathNavigation(this, level);
-@@ -119,6 +131,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -119,6 +_,7 @@
      protected void addAdditionalSaveData(ValueOutput output) {
          super.addAdditionalSaveData(output);
          output.putInt("Invul", this.getInvulnerableTicks());
@@ -42,7 +34,7 @@ index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..c4a2fb6f08e5d6d69571f448c6ac9def
      }
  
      @Override
-@@ -128,6 +141,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -128,6 +_,7 @@
          if (this.hasCustomName()) {
              this.bossEvent.setName(this.getDisplayName());
          }
@@ -50,7 +42,7 @@ index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..c4a2fb6f08e5d6d69571f448c6ac9def
      }
  
      @Override
-@@ -271,7 +285,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -271,7 +_,7 @@
                      level.explode(this, this.getX(), this.getEyeY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB);
                  }
                  // CraftBukkit end
@@ -59,7 +51,7 @@ index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..c4a2fb6f08e5d6d69571f448c6ac9def
                      // CraftBukkit start - Use relative location for far away sounds
                      // level.globalLevelEvent(1023, this.blockPosition(), 0);
                      int viewDistance = level.getCraftServer().getViewDistance() * 16;
-@@ -378,8 +392,10 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -378,8 +_,10 @@
                  }
              }
  
@@ -72,7 +64,7 @@ index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..c4a2fb6f08e5d6d69571f448c6ac9def
              }
  
              this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
-@@ -576,6 +592,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -576,6 +_,7 @@
  
      @Override
      protected boolean canRide(Entity entity) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +91,13 @@ public class ArmorStand extends LivingEntity {
+@@ -91,10 +_,13 @@
      public boolean canTickSetByAPI = false;
      private boolean noTickEquipmentDirty = false;
      // Paper end - Allow ArmorStands not to tick
@@ -22,7 +14,7 @@ index 46369e554be8c72e6fc2e6d58374dbfc77d94879..e2ffc9b4a95a7684a28b47ad93644c95
      }
  
      public ArmorStand(Level level, double x, double y, double z) {
-@@ -521,6 +524,7 @@ public class ArmorStand extends LivingEntity {
+@@ -521,6 +_,7 @@
      // Paper start - Allow ArmorStands not to tick
      @Override
      public void tick() {
@@ -30,7 +22,7 @@ index 46369e554be8c72e6fc2e6d58374dbfc77d94879..e2ffc9b4a95a7684a28b47ad93644c95
          if (!this.canTick) {
              if (this.noTickEquipmentDirty) {
                  this.noTickEquipmentDirty = false;
-@@ -811,4 +815,18 @@ public class ArmorStand extends LivingEntity {
+@@ -811,4 +_,18 @@
          }
      }
      // Paper end

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +56,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -56,6 +_,12 @@
      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
@@ -21,7 +13,7 @@ index 51804b611f469f2ab53e455e8c633b867b00cc88..d650d4f34fde0682ab76360408f7ff6a
  
      public ItemEntity(EntityType<? extends ItemEntity> entityType, Level level) {
          super(entityType, level);
-@@ -342,7 +348,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -342,7 +_,16 @@
  
      @Override
      public final boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
@@ -39,7 +31,7 @@ index 51804b611f469f2ab53e455e8c633b867b00cc88..d650d4f34fde0682ab76360408f7ff6a
              return false;
          } else if (!level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && damageSource.getEntity() instanceof Mob) {
              return false;
-@@ -521,6 +536,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -521,6 +_,12 @@
      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

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +238,32 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -238,4 +_,32 @@
          return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
      }
      // Paper end - Option to prevent TNT from moving in water

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +158,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -158,10 +_,7 @@
          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()) {
@@ -20,7 +12,7 @@ index 894a3d988d0530d42d3a282b61cdb445a0f820ad..4e14f1a9ee22d08065a3e971c2aecc93
                  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 +206,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -209,7 +_,7 @@
          double squareRoot = Math.sqrt(d * d + d2 * d2);
          if (this.level() instanceof ServerLevel serverLevel) {
              Projectile.Delayed<AbstractArrow> delayedEntity = Projectile.spawnProjectileUsingShootDelayed( // Paper - delayed

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +55,7 @@ public class Creeper extends Monster {
+@@ -55,6 +_,7 @@
      public int explosionRadius = 3;
      private int droppedSkulls;
      public @Nullable Entity entityIgniter; // CraftBukkit
@@ -16,7 +8,7 @@ index eabc778ba06c14f3020391b9850ae1a283ecf106..d82fe9db4d074a0484d8c5e2998ff9fa
  
      public Creeper(EntityType<? extends Creeper> entityType, Level level) {
          super(entityType, level);
-@@ -158,6 +159,27 @@ public class Creeper extends Monster {
+@@ -158,6 +_,27 @@
          return false; // CraftBukkit
      }
  
@@ -44,7 +36,7 @@ index eabc778ba06c14f3020391b9850ae1a283ecf106..d82fe9db4d074a0484d8c5e2998ff9fa
      @Override
      public SoundEvent getHurtSound(DamageSource damageSource) {
          return SoundEvents.CREEPER_HURT;
-@@ -240,14 +262,16 @@ public class Creeper extends Monster {
+@@ -240,14 +_,16 @@
      }
  
      public void explodeCreeper() {
@@ -63,7 +55,7 @@ index eabc778ba06c14f3020391b9850ae1a283ecf106..d82fe9db4d074a0484d8c5e2998ff9fa
              this.spawnLingeringCloud();
              this.triggerOnDeathMobEffects(serverLevel, Entity.RemovalReason.KILLED);
              this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
-@@ -258,6 +282,7 @@ public class Creeper extends Monster {
+@@ -258,6 +_,7 @@
              }
              // CraftBukkit end
          }

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +83,23 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -83,10 +_,23 @@
          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()));

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +101,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -101,7 +_,7 @@
          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));
@@ -17,7 +9,7 @@ index 4edd94ac765d2ab107612504b67e6e07da609313..ddb916856cff7179eca474738dfbba91
          this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false));
      }
  
-@@ -216,7 +216,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -216,7 +_,7 @@
  
      boolean isBeingStaredBy(Player player) {
          // Paper start - EndermanAttackPlayerEvent
@@ -26,7 +18,7 @@ index 4edd94ac765d2ab107612504b67e6e07da609313..ddb916856cff7179eca474738dfbba91
          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 +372,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -372,6 +_,7 @@
      public boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
          if (this.isInvulnerableTo(level, damageSource)) {
              return false;
@@ -34,7 +26,7 @@ index 4edd94ac765d2ab107612504b67e6e07da609313..ddb916856cff7179eca474738dfbba91
          } else {
              AbstractThrownPotion abstractThrownPotion1 = damageSource.getDirectEntity() instanceof AbstractThrownPotion abstractThrownPotion
                  ? abstractThrownPotion
-@@ -388,6 +389,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -388,6 +_,7 @@
              } else {
                  boolean flag = abstractThrownPotion1 != null && this.hurtWithCleanWater(level, damageSource, abstractThrownPotion1, amount);
  
@@ -42,7 +34,7 @@ index 4edd94ac765d2ab107612504b67e6e07da609313..ddb916856cff7179eca474738dfbba91
                  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 +433,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -431,7 +_,7 @@
  
      @Override
      public boolean requiresCustomPersistence() {
@@ -51,7 +43,7 @@ index 4edd94ac765d2ab107612504b67e6e07da609313..ddb916856cff7179eca474738dfbba91
      }
  
      static class EndermanFreezeWhenLookedAt extends Goal {
-@@ -475,6 +477,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -475,6 +_,7 @@
  
          @Override
          public boolean canUse() {
@@ -59,7 +51,7 @@ index 4edd94ac765d2ab107612504b67e6e07da609313..ddb916856cff7179eca474738dfbba91
              return this.enderman.getCarriedBlock() != null
                  && getServerLevel(this.enderman).getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)
                  && this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0;
-@@ -624,6 +627,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -624,6 +_,7 @@
  
          @Override
          public boolean canUse() {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +30,23 @@ public class Endermite extends Monster {
+@@ -30,12 +_,23 @@
      private static final int MAX_LIFE = 2400;
      private static final int DEFAULT_LIFE = 0;
      public int life = 0;
@@ -32,7 +24,7 @@ index f448aac89c6125246c730a71e7ee21c8168d7003..50eefb77a6c346b2643324f526c5c01d
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-@@ -81,12 +92,14 @@ public class Endermite extends Monster {
+@@ -81,12 +_,14 @@
      protected void readAdditionalSaveData(ValueInput input) {
          super.readAdditionalSaveData(input);
          this.life = input.getIntOr("Lifetime", 0);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +88,14 @@ public abstract class Monster extends PathfinderMob implements Enemy {
+@@ -88,6 +_,14 @@
      }
  
      public static boolean isDarkEnoughToSpawn(ServerLevelAccessor level, BlockPos pos, RandomSource random) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 ffcfdbc80df2a9e6c546348b86e7615e6109eb49..2abb55d84507fd29817760cb0068dd083f7f1c37 100644
 --- a/net/minecraft/world/entity/monster/Phantom.java
 +++ b/net/minecraft/world/entity/monster/Phantom.java
-@@ -174,7 +174,11 @@ public class Phantom extends Mob implements Enemy {
+@@ -174,7 +_,11 @@
          ServerLevelAccessor level, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData spawnGroupData
      ) {
          this.anchorPoint = this.blockPosition().above(5);

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +74,7 @@ public class Ravager extends Raider {
+@@ -74,6 +_,7 @@
      protected void registerGoals() {
          super.registerGoals();
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -16,7 +8,7 @@ index 9d84bf2cffee25404eebbefdc9cc3f37ebc386b0..2b9a72b8742bf13c69df5ce0c905d47a
          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 +155,7 @@ public class Ravager extends Raider {
+@@ -154,7 +_,7 @@
                  )) {
                      BlockState blockState = serverLevel.getBlockState(blockPos);
                      Block block = blockState.getBlock();

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch

@@ -1,14 +1,15 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +94,21 @@ public class Shulker extends AbstractGolem implements Enemy {
+@@ -80,7 +_,7 @@
+         Vec3i unitVec3i = Direction.SOUTH.getUnitVec3i();
+         return new Vector3f(unitVec3i.getX(), unitVec3i.getY(), unitVec3i.getZ());
+     });
+-    public static final float MAX_SCALE = 3.0F;
++    private static final float MAX_SCALE = 3.0F;
+     private float currentPeekAmountO;
+     private float currentPeekAmount;
+     @Nullable
+@@ -94,6 +_,21 @@
          this.lookControl = new Shulker.ShulkerLookControl(this);
      }
  
@@ -30,7 +31,7 @@ index f667fc5ff1ea4149cb25608e0d12f9f73f86095e..ff16e0dd78687f4c9a0bce5ede4eda30
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F, 0.02F, true));
-@@ -461,11 +476,21 @@ public class Shulker extends AbstractGolem implements Enemy {
+@@ -461,11 +_,21 @@
      private void hitByShulkerBullet() {
          Vec3 vec3 = this.position();
          AABB boundingBox = this.getBoundingBox();
@@ -56,7 +57,7 @@ index f667fc5ff1ea4149cb25608e0d12f9f73f86095e..ff16e0dd78687f4c9a0bce5ede4eda30
                  if (shulker != null) {
                      shulker.setVariant(this.getVariant());
                      shulker.snapTo(vec3);
-@@ -573,7 +598,7 @@ public class Shulker extends AbstractGolem implements Enemy {
+@@ -573,7 +_,7 @@
      }
  
      public Optional<DyeColor> getVariant() {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Skeleton.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +140,64 @@ public class Skeleton extends AbstractSkeleton {
+@@ -140,4 +_,64 @@
              this.spawnAtLocation(level, Items.SKELETON_SKULL);
          }
      }

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch

@@ -1,14 +1,6 @@
-From fdaa40d397c78dc3305420f9e42eead78bea1982 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 +392,19 @@ public class Strider extends Animal implements ItemSteerable {
+@@ -392,6 +_,19 @@
      @Override
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          boolean isFood = this.isFood(player.getItemInHand(hand));