Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3c8a7fe Re-add missing chunk event calls (#11104)
PaperMC/Paper@a8db527 Even more cleanup of mcutil patch
PaperMC/Paper@d08e8d1 Add total time to done message (#11109)

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = dd11ef84410f92af07f46adce198ef5078cb54b8
+paperCommit = d08e8d1afabcce6a40bab5863f2c297cd7ba8cfa
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0001-Rebrand.patch

@@ -241,10 +241,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63ee
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668 100644
+index 2f4d6b56301195f8d39ed50dffe842464065bfe1..30ddb35140ae4a6faba98c191bb8eadbafc35377 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -503,7 +503,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -492,7 +492,7 @@ public class CraftScheduler implements BukkitScheduler {
                  this.parsePending();
              } else {
                  // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
@@ -254,10 +254,10 @@ index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc1
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3137391cadef7c67019561e65fedd0664e689eae..eb5ca67ebfd008a0fcc3ab3fc2452a27d7b0a9f8 100644
+index 28b3ad04e1f4b38ce21084864a59a2cd81b3992c..217f7383f6facb67b10e7725be0f8505e5e21a44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -498,7 +498,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -481,7 +481,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

patches/server/0004-MC-Utils.patch

@@ -0,0 +1,164 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 9 Jun 2020 03:17:25 -0400
+Subject: [PATCH] MC Utils
+
+
+diff --git a/src/main/java/org/purpurmc/purpur/util/MinecraftInternalPlugin.java b/src/main/java/org/purpurmc/purpur/util/MinecraftInternalPlugin.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..129acb8ad139decc6b1c023cb10bc32dc91d64d1
+--- /dev/null
++++ b/src/main/java/org/purpurmc/purpur/util/MinecraftInternalPlugin.java
+@@ -0,0 +1,152 @@
++package org.purpurmc.purpur.util;
++
++import org.bukkit.Server;
++import org.bukkit.command.Command;
++import org.bukkit.command.CommandSender;
++import org.bukkit.configuration.file.FileConfiguration;
++import org.bukkit.generator.BiomeProvider;
++import org.bukkit.generator.ChunkGenerator;
++import org.bukkit.plugin.PluginBase;
++import org.bukkit.plugin.PluginDescriptionFile;
++import org.bukkit.plugin.PluginLoader;
++import org.bukkit.plugin.PluginLogger;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++import java.io.File;
++import java.io.InputStream;
++import java.util.List;
++
++public class MinecraftInternalPlugin extends PluginBase {
++    private boolean enabled = true;
++
++    private final String pluginName;
++    private PluginDescriptionFile pdf;
++
++    public MinecraftInternalPlugin() {
++        this.pluginName = "Minecraft";
++        pdf = new PluginDescriptionFile(pluginName, "1.0", "nms");
++    }
++
++    public void setEnabled(boolean enabled) {
++        this.enabled = enabled;
++    }
++
++    @Override
++    public File getDataFolder() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public PluginDescriptionFile getDescription() {
++        return pdf;
++    }
++    // Paper start
++    @Override
++    public io.papermc.paper.plugin.configuration.PluginMeta getPluginMeta() {
++        return pdf;
++    }
++    // Paper end
++
++    @Override
++    public FileConfiguration getConfig() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public InputStream getResource(String filename) {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public void saveConfig() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public void saveDefaultConfig() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public void saveResource(String resourcePath, boolean replace) {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public void reloadConfig() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public PluginLogger getLogger() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public PluginLoader getPluginLoader() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public Server getServer() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public boolean isEnabled() {
++        return enabled;
++    }
++
++    @Override
++    public void onDisable() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public void onLoad() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public void onEnable() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public boolean isNaggable() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public void setNaggable(boolean canNag) {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public @Nullable BiomeProvider getDefaultBiomeProvider(@NotNull String worldName, @Nullable String id) {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    @Override
++    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    // Paper start - lifecycle events
++    @Override
++    public @NotNull io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager<org.bukkit.plugin.Plugin> getLifecycleManager() {
++        throw new UnsupportedOperationException("Not supported.");
++    }
++    // Paper end - lifecycle events
++}

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

@@ -36,7 +36,7 @@ index ce09c4900aee5a75c0d13a7bffd97a0711ead774..37adf5d3c6248547d830248714f32dbe
      public void displayClientMessage(Component message, boolean overlay) {
          this.sendSystemMessage(message, overlay);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dfcaff15a145bf29e8a538d853bb04aec8c36179..939ddeb450e1f4a79fa3da69bcad44859fa826ee 100644
+index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..063ac25725543988332bdaf0c600e1f6c429943e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1017,6 +1017,20 @@ public abstract class PlayerList {

patches/server/0007-Ridables.patch

@@ -22,10 +22,10 @@ index 2767d6f97e8b314d23a8e62f22dfd396f5660d31..a64e5997b94cc8173f0512d1e282355f
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 86f890280bfabac3b14b771ae67d28653ab2e3e8..7d552a3239a62428293a7c00124899f2b25b0b16 100644
+index 57e84cf2219d28c37e4c042371afddf585334954..b39afb48ff53ce70f94316cce3e1ad82327c6eb1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1779,6 +1779,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1780,6 +1780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
              worldserver.updateLagCompensationTick(); // Paper - lag compensation
@@ -259,7 +259,7 @@ index fe435d4a387bb28be6831cec0c8bb0a7c8b603a4..a387268659a17a4508359f2a69d50593
          // Paper end - Add EntityMoveEvent
          if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..091d2b1646068657120ee4244d79cbf7867a9cf7 100644
+index bd7c6ce15698aed70376c109ba36f52d6794a2f8..99b227dc5940ddc16d41b2e37c4683268b9e4112 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -160,8 +160,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -273,7 +273,7 @@ index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..091d2b1646068657120ee4244d79cbf7
          this.jumpControl = new JumpControl(this);
          this.bodyRotationControl = this.createBodyControl();
          this.navigation = this.createNavigation(world);
-@@ -1506,7 +1506,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1504,7 +1504,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
  
      protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -282,7 +282,7 @@ index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..091d2b1646068657120ee4244d79cbf7
      }
  
      public boolean isWithinRestriction() {
-@@ -1804,4 +1804,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1802,4 +1802,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
  
          return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
      }

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 939ddeb450e1f4a79fa3da69bcad44859fa826ee..2738c73a5e0747fea711900a20d83b6c9fcfb90d 100644
+index 063ac25725543988332bdaf0c600e1f6c429943e..d52c598573d9ac470a39b5a6c47a2a6be3741a76 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1142,6 +1142,27 @@ public abstract class PlayerList {

patches/server/0013-Configurable-server-mod-name.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7d552a3239a62428293a7c00124899f2b25b0b16..bb573e6aac01410c3e5972705aa260329ebe6ed5 100644
+index b39afb48ff53ce70f94316cce3e1ad82327c6eb1..1f5ecd8f8486463733b0fb8289e3d9254858c873 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1937,7 +1937,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1938,7 +1938,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {

patches/server/0014-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bb573e6aac01410c3e5972705aa260329ebe6ed5..3435ae0e03ebd041de2483b03e931fbfa60c2cb7 100644
+index 1f5ecd8f8486463733b0fb8289e3d9254858c873..e58209eb38031b4df3894798f902101640100542 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -319,6 +319,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index bb573e6aac01410c3e5972705aa260329ebe6ed5..3435ae0e03ebd041de2483b03e931fbf
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -1280,6 +1281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1281,6 +1282,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.recentTps[0] = tps1.getAverage();
                      this.recentTps[1] = tps5.getAverage();
                      this.recentTps[2] = tps15.getAverage();

patches/server/0019-Silk-touch-spawners.patch

@@ -100,7 +100,7 @@ index 4f190a40b8474aa06a92c8afcc06d0044120ff7b..66c17bdfecdfbcfb2d853e561432dd51
              int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 05b8c7da71454399a9e7d0732885326ddb6c9a15..29a167bf006f420162773ff3b3affe7691b9ba93 100644
+index 42bff6f2d864a31dcb1c0087a4e0c9027ece001e..65c41d9c757819f3da4c0549f4e5fe002992b4d4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -109,6 +109,38 @@ public class PurpurWorldConfig {

patches/server/0020-Add-turtle-egg-block-options.patch

@@ -36,7 +36,7 @@ index a6f408e56fa6c9de82fd93555fe21e1b11ce1022..c7377d04ceac3ea624117439783a443c
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 29a167bf006f420162773ff3b3affe7691b9ba93..cc1f5ca8b68ef4a0ad84be49aa2859a20db9cda0 100644
+index 65c41d9c757819f3da4c0549f4e5fe002992b4d4..cdef3af8a48d640a8180b5a5658b0ef46087095f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -141,6 +141,15 @@ public class PurpurWorldConfig {

patches/server/0022-Disable-outdated-build-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6f8fa47897bcbde6db6c3297f6d929dd038e45ee..d7df5bd6c7342e6b21d53c1b3ae9e9f3b52fc43c 100644
+index 98dd06878b76b0c1d70242afd49738b253cd0e80..577b2f19e625ca71b13477eb96e42e04954fa449 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -273,7 +273,7 @@ public class Main {

patches/server/0025-Charged-creeper-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Charged creeper naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 2e14fb23e36a335bbff0b54cf63c5c096869ad25..83748963485a92dd771eca976a12476f71b968c2 100644
+index e702ba0adfe6b6ace68a9f94f6110fe0d4d0258b..84263f85412039811d9e56a292464158675b5418 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -258,6 +258,14 @@ public class Creeper extends Monster implements PowerableMob {

patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index 385457c7151f7e636e1ea2e38ef983f4f532b9b5..1a44694f4792b57a39f55065a3fbc9d06be15f55 100644
+index 532f09089b8d6798999cf3f83e852df7479e450e..43c63d203859eaa0999937e2f9254c22510139aa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 @@ -154,6 +154,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene

patches/server/0031-Add-option-to-set-armorstand-step-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fcd12b28408343dcacab8e2d93656dc384935c1b..36eb44b8f9a3b708d44bccdaaa98db04b4655f1a 100644
+index 10c06b32deb91dc4a65b501e57b395742ecda75b..654b454a79f564a1bbf03e3cf8c3c1fcc5ebe489 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -344,6 +344,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch

@@ -18,7 +18,7 @@ index d59e33e7326489c6d55d316d0130f22235f4c63c..da85fabd75e9bd5ebece7127ef5b512d
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3f413660380bc31ce6b47798720433929ddcf32c..8db29e6a4abe42ccea3294aaad5258a88518a69b 100644
+index 89cfedcbb45cd9a3ff9e795828bbc5ae8efa7d6d..c5b3a04d81834d6bdf7c4acd06ce4929d7a25769 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -146,6 +146,11 @@ public class PurpurWorldConfig {

patches/server/0039-Minecart-settings-and-WASD-controls.patch

@@ -136,7 +136,7 @@ index d524fcc191cb95d6ec7f12ae7fceeb8077bb08fc..4b8cebb321eddc852b4ec7def7f51d78
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 0f289d8f9bda2fb2ca2cd2dfd667a975529b3e4c..7595e6d3e26c3ec08d77292d1fb273d4c0758964 100644
+index ded6d148110fe3fbb6272ce44582a28472dd49a6..61918a4a1ea8e1a0f5965bbf2c9fdb2d7b7863e8 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -93,7 +93,7 @@ public abstract class BlockBehaviour implements FeatureElement {

patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0bb6630133c454bccfe9b4ba8297fb8a1669fc28..54c6666abb8c674f354161489faf06147f4672c6 100644
+index 13f8289aa23fd4554235e22e4be924abe7517e27..67d34911412aad13bfaede82b9bc9ca21a97087a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1868,7 +1868,8 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch

@@ -19,7 +19,7 @@ index 43c9dea6b0db7f8d6070dedcb472883ab46d9eaf..15a1f9ffbf640bffadca97e28f72b6a5
  
          if (user instanceof Player entityhuman) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8e31ffae5263a2394f9ae04d8ae7f168274da6ff..a85591019e39b4c179b7abe9b3bda864bdbe54bc 100644
+index 830ba18f1695bbf4099a9579166e29618206ba83..3273ac8bb8f836ea9d2d5d304985ca8152eb2d4a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,8 +97,10 @@ public class PurpurWorldConfig {

patches/server/0043-Add-permission-for-F3-N-debug.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2738c73a5e0747fea711900a20d83b6c9fcfb90d..d79b644bbbe27e159cce554b22ee03d9a004b2df 100644
+index d52c598573d9ac470a39b5a6c47a2a6be3741a76..105688ba795676a0612969f89668c9c8bda48f54 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1134,6 +1134,7 @@ public abstract class PlayerList {

patches/server/0044-Configurable-TPS-Catchup.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4f861e07fc15f43ddfb8d48499be8ec8f09c5480..f0c88f64d4cd387fd32cce3fde5cff6a6bdae29f 100644
+index e58209eb38031b4df3894798f902101640100542..d6e66773cf0c88edc14d0670852c6270214e0794 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1312,6 +1312,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1313,6 +1313,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.profiler.popPush("nextTickWait");
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);

patches/server/0046-Add-enderman-and-creeper-griefing-controls.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 83748963485a92dd771eca976a12476f71b968c2..d498b12998f04cf1a4332a358b374d48f8b3b7eb 100644
+index 84263f85412039811d9e56a292464158675b5418..576d8288a9a5e39479623cac6cbf0f2cc81096db 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -362,7 +362,7 @@ public class Creeper extends Monster implements PowerableMob {

patches/server/0048-Allow-leashing-villagers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 36eb44b8f9a3b708d44bccdaaa98db04b4655f1a..d1ffc0f9f50db584d945630930a90599908e1bbd 100644
+index 654b454a79f564a1bbf03e3cf8c3c1fcc5ebe489..a9e441c7a6aadb7bb9891dba41b257b70b071ceb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2922,6 +2922,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0049-Implement-infinite-liquids.patch

@@ -67,7 +67,7 @@ index 109f71401c65f476ccf6813137386fc9fef10254..9dcdb2f4001115db0c26fdbf86531dbe
      @Override
      protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d94587de6b67046fc2d38044e96b0599906427c3..812ba116157875735fc95bf8d59e3ad7959cb567 100644
+index 4bce5d936876bf17d81d008e73877c6d5637fb87..d02eca903ad0e24ab4a8839d958738af865b8bc8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -222,6 +222,11 @@ public class PurpurWorldConfig {

patches/server/0050-Make-lava-flow-speed-configurable.patch

@@ -18,7 +18,7 @@ index 4c230136d832d50ae16ffa037b0b30ff1101b50a..2d492d849ff73a738dfbcb16507feb89
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 812ba116157875735fc95bf8d59e3ad7959cb567..b8bc547996c02cbd767515543ed11ce90680e300 100644
+index d02eca903ad0e24ab4a8839d958738af865b8bc8..cde1b1277d83ac2478f872dccdc2f7f87196cc94 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -223,8 +223,12 @@ public class PurpurWorldConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d1ffc0f9f50db584d945630930a90599908e1bbd..e1849508e9010b5bcc90cdb9afa74277cb815335 100644
+index a9e441c7a6aadb7bb9891dba41b257b70b071ceb..6410eb03fa1a3fbdc8da5dde92d7bd956004a3ff 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -933,7 +933,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e1849508e9010b5bcc90cdb9afa74277cb815335..817514ca87027e83aa19010acbb877ab36f295ee 100644
+index 6410eb03fa1a3fbdc8da5dde92d7bd956004a3ff..88fd465aa3e448e36fe519f8f882d2d3225d679f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -551,6 +551,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0055-Add-option-for-boats-to-eject-players-on-land.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for boats to eject players on land
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 907f751c859855484151fb5d607acee2f2a35076..4e1b2d65182f7d562a8470449b9f7c2ef6ab6445 100644
+index f1955afc8e367f80ead85bd5ad3b8d66c255565a..7f7abef3c5b7ad124c5c1dda02173bc5f70c9506 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 @@ -543,6 +543,7 @@ public class Boat extends VehicleEntity implements Leashable, VariantHolder<Boat
@@ -17,7 +17,7 @@ index 907f751c859855484151fb5d607acee2f2a35076..4e1b2d65182f7d562a8470449b9f7c2e
              } else {
                  return Boat.Status.IN_AIR;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d5872f83a4345023c75af3cded5c54e0aa0bc550..c75378dd279b3282d30c2f06b7b35910d58048f9 100644
+index 68ab094b44d693612dd0858d5a2caa2aae63c75a..02199708b950fda677ae2db0b6ec508b674432a4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -96,12 +96,14 @@ public class PurpurWorldConfig {

patches/server/0056-Mending-mends-most-damages-equipment-first.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Mending mends most damages equipment first
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 15844971ce2cca8c679ad3aaa2dfe160e6d0b564..9743e3ed1bbccc44c39df864e980e64fc5e32e1d 100644
+index a58ff67052fb5f33782f8b5c83465ec03ef1d073..caaeeb63b8bf0d3709fc38266a7e8c48211f5c0b 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -347,7 +347,7 @@ public class ExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 15844971ce2cca8c679ad3aaa2dfe160e6d0b564..9743e3ed1bbccc44c39df864e980e64f
          if (optional.isPresent()) {
              ItemStack itemstack = ((EnchantedItemInUse) optional.get()).itemStack();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 312b57b4ef340935f4335989ce1d6a4b8b61532c..00665c3e81264b440cd27431f7632f3bc2b1ceef 100644
+index 2c312c0b741fb96a008881e9e01fa660a1fb63ab..50d82217aade8bb6db557df9655e5746608af3ef 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -643,6 +643,26 @@ public final class ItemStack implements DataComponentHolder {
@@ -110,7 +110,7 @@ index 9635c076703beee96af9f5d0bdee4cf97ccd98ad..1abf54eeaad1b062f1465ee1a847bbfc
 +    // Purpur end - Add option to mend the most damaged equipment first
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c75378dd279b3282d30c2f06b7b35910d58048f9..230aede0b10e0999a6043e2bd0e2fe381a232f9d 100644
+index 02199708b950fda677ae2db0b6ec508b674432a4..c3f652ff39d9736e1ff2faac1ce8999d99d38524 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -96,6 +96,7 @@ public class PurpurWorldConfig {

patches/server/0057-Add-5-second-tps-average-in-tps.patch

@@ -18,7 +18,7 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..308f67d0616e2d6bb135258f1fda53cc
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f4abe11b78a9d0ff22e96f2c2da1e642e4a6205..d22f6854a9142b682be3b5bb3ff58228f6457664 100644
+index d6e66773cf0c88edc14d0670852c6270214e0794..a08be48afd408b0976e8813071e0e28433512657 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -314,7 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -38,7 +38,7 @@ index 8f4abe11b78a9d0ff22e96f2c2da1e642e4a6205..d22f6854a9142b682be3b5bb3ff58228
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1273,14 +1274,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1274,14 +1275,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
                      final long diff = currentTime - tickSection;
                      final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);

patches/server/0058-Implement-elytra-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e34fa184655fd42f76ca08a7c289c7cbcfa81122..4639b3b47bd29b59ef02364e1773dba5b27cd1ca 100644
+index c1fa2cbf7eb052fc6c3299ead1c5fe12e03a2071..dc1bb55a84e1f1277c76dbdd30001080f6a0013e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3613,7 +3613,16 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0059-Item-entity-immunities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 1d849ce4e2c85f149af25318b8ffb6dcef6c6788..b38207981751d96a7e769f7afb352a4540b18440 100644
+index 8ea2f24695f5dad55e21f238b69442513e7a90c6..3d4926e1d882bc41157f8402ae63cd96c4dc9c31 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -77,7 +77,7 @@ public class ServerEntity {
@@ -117,7 +117,7 @@ index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..01e4395f1669d21c30465aa1366bd2f1
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 79dd69c0e17c07e92b1bf8caf7e8d25ba351cb09..dd08eb9b8a74e6f9c0aa69d909f946c8185d272f 100644
+index 238cec1e37fcc9ca676a680ee616b43f1312dbd0..b2bc8d014b9cfd7af72b0a04077f93741338083a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -124,6 +124,49 @@ public class PurpurWorldConfig {

patches/server/0060-Add-ping-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add ping command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 4b8dbdc43e85c08846a4e2ae50e59a6ca59758f3..20619fca432af199f3d3ed8c3d0f2bf88a6577ad 100644
+index 7e291ffff86bdcdb8a0a15c211c3f84d6ae18e38..12effcb8e1b89595884798efba71849e4530b6b3 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -250,6 +250,7 @@ public class Commands {

patches/server/0061-Add-demo-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 20619fca432af199f3d3ed8c3d0f2bf88a6577ad..4c090b70f30ef9eaa79b7de7f19a1d58b4d75cb5 100644
+index 12effcb8e1b89595884798efba71849e4530b6b3..200661f1295ac7ce2104b10bfea367a769e82f96 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -250,6 +250,7 @@ public class Commands {

patches/server/0062-Add-credits-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add credits command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 4c090b70f30ef9eaa79b7de7f19a1d58b4d75cb5..911a12e8af22b5f7a645384fee37c9ad435a9be1 100644
+index 200661f1295ac7ce2104b10bfea367a769e82f96..38a345901a743f5ddac18ba876d5245c5c11f111 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -250,6 +250,7 @@ public class Commands {

patches/server/0066-Implement-bed-explosion-options.patch

@@ -27,7 +27,7 @@ index 85d598c3354ee62f0fd1b26e485e0084967c0380..b59dd6b512021c335f3c21999958e2ea
              }
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 85d435c633eaefe2c6af337c7f12e57ff2eede2f..f1b1145495d7093cfab0355d5fc2600707c0a2d8 100644
+index 1369a14df3736cce6b6806fba7de7ffdefac1ab2..799e599f79b2ed4852a4adbec47fde9c7b67e569 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -283,6 +283,27 @@ public class PurpurWorldConfig {

patches/server/0067-Implement-respawn-anchor-explosion-options.patch

@@ -18,7 +18,7 @@ index 94d067e9eeee73183de25165d8c97043fe256103..00b6941951e1af9993f8f6da5425d31b
  
      public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f1b1145495d7093cfab0355d5fc2600707c0a2d8..e0f1f5d59fd3cd9ebf23365db56cfb43f1d5f427 100644
+index 799e599f79b2ed4852a4adbec47fde9c7b67e569..e1c2080ffd8be35c224e0e41a69b6a98c4b932dc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -323,6 +323,27 @@ public class PurpurWorldConfig {

patches/server/0068-Add-allow-water-in-end-world-option.patch

@@ -27,7 +27,7 @@ index 321188173918d0d60858a258400dfd682ccdb21c..af47074f3a61a8518697d7851e43d543
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 88cc7146c44746f93edc8e17151521806e2d6482..d931bde93f29b01e3743833a2520685e5e88dba9 100644
+index 04953d12a6aab561b9510adad145918aee7768c1..a922bb0c65e4cee8cb693eb6e48ecaa26bdf7e71 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -2026,4 +2026,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

patches/server/0070-Entity-lifespan.patch

@@ -17,7 +17,7 @@ index 68c4e3d9a3f928a52357e25820ac73adbfb3332c..ce1901c683c44893780342f7a3914613
                      private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                          ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702b35fa075 100644
+index 99b227dc5940ddc16d41b2e37c4683268b9e4112..1a8b081aae4bbe538eb3230d415583f318ade86f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -146,6 +146,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -28,7 +28,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702
      public boolean aware = true; // CraftBukkit
  
      protected Mob(EntityType<? extends Mob> type, Level world) {
-@@ -333,6 +334,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -331,6 +332,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
                  entityliving = null;
              }
          }
@@ -36,7 +36,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702
          this.target = entityliving;
          return true;
          // CraftBukkit end
-@@ -375,8 +377,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -373,8 +375,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          }
  
          this.level().getProfiler().pop();
@@ -65,7 +65,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702
      @Override
      protected void playHurtSound(DamageSource damageSource) {
          this.resetAmbientSoundTime();
-@@ -551,6 +573,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -549,6 +571,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          }
  
          nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -73,7 +73,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702
      }
  
      @Override
-@@ -628,6 +651,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -626,6 +649,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              this.aware = nbt.getBoolean("Bukkit.Aware");
          }
          // CraftBukkit end
@@ -85,7 +85,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702
      }
  
      @Override
-@@ -1745,6 +1773,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1743,6 +1771,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              this.playAttackSound();
          }
  
@@ -94,7 +94,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e0f1f5d59fd3cd9ebf23365db56cfb43f1d5f427..fd3a0e995deb66afeb2675460e12012b4b5649a6 100644
+index e1c2080ffd8be35c224e0e41a69b6a98c4b932dc..65b5ddde3496d1b04bedd410675a548f662aa073 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -124,6 +124,11 @@ public class PurpurWorldConfig {

patches/server/0075-Redstone-deactivates-spawners.patch

@@ -17,7 +17,7 @@ index f57e1b78204dff661ad5d3ee93a88a00330af2dc..967af8771ff8564c715d89f4b4b69b16
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a1e0ffd2ed576b9f988d64467a210cb869b5bdc7..5053c57bfc39bcc5b383795fe6e85dc9e5d1e421 100644
+index 4172de8958c5216eeca7535de3be97515d32337e..41e07eec0ba1cc2e31b967fdc616e59f7cd76b28 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -351,6 +351,11 @@ public class PurpurWorldConfig {

patches/server/0076-Totems-work-in-inventory.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 24d738cf82dc57819064319ad3a9d892167665cc..25915e9e24fc370dac496b7eae6d2f5ac2a0c4c6 100644
+index 1bb7f2aed9b23d5738140d236c140f9c508bc748..609260d43c42d9978f5e849b4dd7191fd21a6c32 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1667,6 +1667,18 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0078-Dispensers-place-anvils-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 7bf250bba4179a506c0a39b7866a9389552d2905..6548e595ab5c06044be438bc7eac181f413c261a 100644
+index 60d3319016beb4f60cbc26dde165f64cf7577602..bd07743817f2510c179614a6215434e7b333824a 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -1015,5 +1015,22 @@ public interface DispenseItemBehavior {
@@ -32,7 +32,7 @@ index 7bf250bba4179a506c0a39b7866a9389552d2905..6548e595ab5c06044be438bc7eac181f
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a283b0afaccaebb27216c241abff97fcf8998ded..00d34e58bcc03d6d342261a637bc5ef23a4be769 100644
+index cf75f01c719ad6d3bfef73314c31c51c200fc4aa..b11f86ad33df553b598e859e110ab6d6abf1f744 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -314,8 +314,10 @@ public class PurpurWorldConfig {

patches/server/0079-Allow-anvil-colors.patch

@@ -64,7 +64,7 @@ index 99bfa7cdc58c690d6f0c742dafedd40cace3223f..2d300905c05c7c23a4da30b3651b3313
                  }
              } else if (itemstack.has(DataComponents.CUSTOM_NAME)) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 00d34e58bcc03d6d342261a637bc5ef23a4be769..bf02442138f8b7773d52ece4369cb888b4d8f073 100644
+index b11f86ad33df553b598e859e110ab6d6abf1f744..91536c5280330a9a2beccf1bee59ad071736b57e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -292,6 +292,13 @@ public class PurpurWorldConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 817514ca87027e83aa19010acbb877ab36f295ee..38e3c3051b971f7f0350012bb6d46d2e9bc06da2 100644
+index 88fd465aa3e448e36fe519f8f882d2d3225d679f..ffb83e96b070179467ddedbe7d24752752fffbeb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4483,6 +4483,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0086-Raid-cooldown-setting.patch

@@ -49,7 +49,7 @@ index 8c60f71270d909c10e6617eb64b8fdb42deb73e9..eedce2a3d67d875d5174ee125e267948
                      if (!raid.isStarted() && !this.raidMap.containsKey(raid.getId())) {
                          this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e2ff691f4d237af59710151754601eed24f49598..7ba5886008c55d651aa11c379e1b77e1fc34125c 100644
+index e43e5facf44978994c8a515a20906dc8fbf8b9b8..092b8854470cb034205f2cf708186d559be5d609 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -109,6 +109,7 @@ public class PurpurWorldConfig {

patches/server/0087-Despawn-rate-config-options-per-projectile-type.patch

@@ -7,7 +7,7 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim
 The config remains for migration purposes.
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7ba5886008c55d651aa11c379e1b77e1fc34125c..bec89f977d8c40973b4aa1313c4f7f6b5880ac9f 100644
+index 092b8854470cb034205f2cf708186d559be5d609..6cda920dca61ce781ecfb4b49da31e7c297d3b39 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -315,6 +315,40 @@ public class PurpurWorldConfig {

patches/server/0092-Configurable-daylight-cycle.patch

@@ -18,10 +18,10 @@ index 76ef195a5074006b009acd9cc1744667c6aecbb9..659577549e132754281df76a7a1bfd88
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d22f6854a9142b682be3b5bb3ff58228f6457664..5b92d2b80bbbff7b1a2c8ba2c59c16ca8396de73 100644
+index a08be48afd408b0976e8813071e0e28433512657..729450af7818fd084d6d224b58f2a3834922245b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1771,7 +1771,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1772,7 +1772,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {

patches/server/0093-Furnace-uses-lava-from-underneath.patch

@@ -39,7 +39,7 @@ index 730aca233f6e7564d4cb85b5b628d23c4f01d2f4..699bdc1f01a95ecdfe899493c8d81ec3
  
      private static boolean canBurn(RegistryAccess registryManager, @Nullable RecipeHolder<?> recipe, NonNullList<ItemStack> slots, int count) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8c644fb65c9ca56a5c9a24945f4d43b117cd02f2..b97edda4c703889a90b6a58ecd3d3034854f76ec 100644
+index fde8c013bb398f924d8c6a7fbfabf276f0a96936..95e79149153de9328c40934a064d2a5a2d25e2d4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -401,6 +401,17 @@ public class PurpurWorldConfig {

patches/server/0094-Arrows-should-not-reset-despawn-counter.patch

@@ -20,7 +20,7 @@ index ddf47dab1ab92c45e3eea09239d418a9798ed59e..8d8944a0455b3401d84cab636d61447e
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b97edda4c703889a90b6a58ecd3d3034854f76ec..40a67af5af896e4427f5092998cd07b4b36e6159 100644
+index 95e79149153de9328c40934a064d2a5a2d25e2d4..1bfbc2cba2b81d2e2aef50c32dc1eb590afc5f1e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -102,6 +102,11 @@ public class PurpurWorldConfig {

patches/server/0095-Ability-to-re-add-farmland-mechanics-from-Alpha.patch

@@ -24,7 +24,7 @@ index da85fabd75e9bd5ebece7127ef5b512df16fe3ac..dc356bd0931af9bdab9ec71e3de66e88
                  return;
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 40a67af5af896e4427f5092998cd07b4b36e6159..56ebfaf5e523fe0ef70c2950f2efac12829e0cf2 100644
+index 1bfbc2cba2b81d2e2aef50c32dc1eb590afc5f1e..3a3f096f5edb65d854f81d96100bdf133647916c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -402,8 +402,10 @@ public class PurpurWorldConfig {

patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch

@@ -42,7 +42,7 @@ index 1808e1b01afa3041a54c9c9a7586d4d61960527a..5b523f3fa323378a8f96f58a9e252d2e
              EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience);
              if (entityBreedEvent.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d931bde93f29b01e3743833a2520685e5e88dba9..32cc7311559b2613269e347c73a1e000ff40f686 100644
+index a922bb0c65e4cee8cb693eb6e48ecaa26bdf7e71..10df967d7694c5806453bb4abbb14deab16e116d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -182,6 +182,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

patches/server/0097-Make-entity-breeding-times-configurable.patch

@@ -284,7 +284,7 @@ index 41d47141bfd77b17cbf163bffdfeb002135035ca..8f02a1b39db0581efb8ccd2c889f048b
          this.entityData.set(Turtle.HOME_POS, pos);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 133aa48278ca51c74b5eb8900202e7076119e445..0e862d4f044683ec46c32929310641af5c1cc2d0 100644
+index 2985a7bcd4153798c347efa086120ed841770774..0647cee2d6a7c847ab923f819a092c9004eabc6c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -155,6 +155,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol

patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 9e6e29b9eddc94b50a32713e8ba1a53deebf02f6..a37054d39ee142e5f3ca3c5e1e3a15c150a3ba32 100644
+index 8d360dc542099af90f0c11839c12910859f0402b..4d6df7ec1bffbd30d4aac906f393ead0dfd8f69d 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -620,6 +620,7 @@ public class ArmorStand extends LivingEntity {
@@ -56,7 +56,7 @@ index e86fdf5d6853b7bddfe19d6e5d41d3dec0c25f23..f45567aa7695da68f92809a6c208eb51
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 4e1b2d65182f7d562a8470449b9f7c2ef6ab6445..c45bb20e5355b0e0f87447572b6f60e8e2ee47be 100644
+index 7f7abef3c5b7ad124c5c1dda02173bc5f70c9506..5f3d58099d83fef4a9230e680b5e199d00eb7c7b 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 @@ -1017,7 +1017,13 @@ public class Boat extends VehicleEntity implements Leashable, VariantHolder<Boat
@@ -126,7 +126,7 @@ index d8a63ac5444eff8e3decb2f4addc2decb8a5d648..41cc9229108aa8e4f5655dfe590ff414
  
              if (((HangingEntity) object).survives()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 90d8b66b86c36df1e92c5ab0312d791cc2887847..074d872372961e823f94c63756c33136cd7e8bbe 100644
+index 62164c41e09912834bd8bf25cb7a829966d9059a..2db5c567e696441448eb977e3e260da57e19e8d0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -98,8 +98,10 @@ public class PurpurWorldConfig {

patches/server/0099-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch

@@ -17,7 +17,7 @@ index 774c982f28b4f127fc3f036c19dfb47fb9ae3264..d49b60e7e643498b49c03593dc0da2f8
                  // Paper end - Add PlayerNameEntityEvent
                      mob.setPersistenceRequired();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 074d872372961e823f94c63756c33136cd7e8bbe..581bdd3640ed0f149fa192380eec119154d4797e 100644
+index 2db5c567e696441448eb977e3e260da57e19e8d0..75de05805f08748c17c95f9a62a3f8351f62f783 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -99,9 +99,11 @@ public class PurpurWorldConfig {

patches/server/0101-Add-configurable-snowball-damage.patch

@@ -18,7 +18,7 @@ index 2b4d206c0d31ba38d7b2af654bd420e85145d441..f59a2903bfb8ae591a638ea5bb387caa
          entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c48ff1b139ef8009f6be30d8926cb4d4fa0145bc..5e1b946b4e5b2fda7175fc265d91361c11bbb8b3 100644
+index df43ccdf64377f0e66058d0c55068c9c237330c4..e33857a15ffc56b32f4849f9d8f9af6368a62e10 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -374,6 +374,11 @@ public class PurpurWorldConfig {