Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
55e2de5c6 Improve per player mob spawning (#3971)
42433c262 Updated Upstream (Bukkit/CraftBukkit) (#3980)
e5ede546a Fix IDE Debug JVM Flag for 1.16 (#3983)
2712c6888 [Auto] Updated Upstream (Bukkit/CraftBukkit)
0901ffd04 Use title packet for actionbar methods (#3959)
2e11235d1 Expand MaterialTags (#3964)
cc25ae47c Amend last commit to fix decompile error forgot to commit
f503db37c Fix AdvancementDataPlayer leak due from quitting early in login
282763b88 Fix SPIGOT-5885 Unable to disable advancements
9b93d122e Fix SPIGOT-5824 Bukkit world-container is not used
bede4d304 Load config files early on

Tuinity Changes:
b0673b3 Merge dev/optimise-notify into ver/1.16
d3dc35c Name craft scheduler threads according to the plugin using them

patches/server/0002-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/pom.xml b/pom.xml
-index 6fd5968178..5b540e606e 100644
+index 6fd596817..5b540e606 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,11 @@
@@ -86,7 +86,7 @@ index 6fd5968178..5b540e606e 100644
                  </configuration>
                  <executions>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 74ed02fa92..c1280478ee 100644
+index 74ed02fa9..c1280478e 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -99,10 +99,10 @@ index 74ed02fa92..c1280478ee 100644
                  .completer(new ConsoleCommandCompleter(this.server))
          );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eb71fa6e39..e23e47ee77 100644
+index 0200f21cb..56020d44b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1505,7 +1505,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -113,7 +113,7 @@ index eb71fa6e39..e23e47ee77 100644
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 new file mode 100644
-index 0000000000..d8b408f061
+index 000000000..d8b408f06
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 @@ -0,0 +1,115 @@
@@ -233,7 +233,7 @@ index 0000000000..d8b408f061
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ba42171096..6aa60eb602 100644
+index d434bd93b..7079c79f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
@@ -246,7 +246,7 @@ index ba42171096..6aa60eb602 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index f1e60981ab..1fe87d7637 100644
+index f1e60981a..1fe87d763 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -323,7 +323,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -259,7 +259,7 @@ index f1e60981ab..1fe87d7637 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 001b1e5197..13b9843932 100644
+index 001b1e519..13b984393 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {

patches/server/0003-Purpur-config-files.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 8a19c96499..de75e33a68 100644
+index 8a19c9649..de75e33a6 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -581,7 +581,7 @@ public class Metrics {
@@ -29,7 +29,7 @@ index 8a19c96499..de75e33a68 100644
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 578f7809cb..21dc3b9a63 100644
+index 578f7809c..21dc3b9a6 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -168,6 +168,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -49,7 +49,7 @@ index 578f7809cb..21dc3b9a63 100644
          // Paper end
          com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4a956f3681..ad58307f1d 100644
+index 4a956f368..ad58307f1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -70,7 +70,7 @@ index 4a956f3681..ad58307f1d 100644
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000..1d00832bff
+index 000000000..1d00832bf
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,130 @@
@@ -206,7 +206,7 @@ index 0000000000..1d00832bff
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000..361f7857e4
+index 000000000..361f7857e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -0,0 +1,59 @@
@@ -271,7 +271,7 @@ index 0000000000..361f7857e4
 +}
 diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 new file mode 100644
-index 0000000000..4904be939c
+index 000000000..4904be939
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 @@ -0,0 +1,65 @@
@@ -341,7 +341,7 @@ index 0000000000..4904be939c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6aa60eb602..e6bac82668 100644
+index 7079c79f7..6e15c2690 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -849,6 +849,7 @@ public final class CraftServer implements Server {
@@ -368,7 +368,7 @@ index 6aa60eb602..e6bac82668 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2244,6 +2247,18 @@ public final class CraftServer implements Server {
+@@ -2251,6 +2254,18 @@ public final class CraftServer implements Server {
          }
          // Tuinity end - add config to timings report
  
@@ -388,7 +388,7 @@ index 6aa60eb602..e6bac82668 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b4e65963ef..3261d22558 100644
+index 2cebdb36f..27fae70a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,14 @@ public class Main {

patches/server/0009-AFK-API.patch

@@ -37,7 +37,7 @@ index 2cada09ce..a69a69859 100644
          super(EntityTypes.PLAYER, world);
          this.bS = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0f9550fb8..a23f23702 100644
+index 4550e3449..a00993e32 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -161,7 +161,7 @@ index a52dd0c02..9b4795f3b 100644
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 37f55c66b..aa6855c35 100644
+index 5af6140a7..1e61b179f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,7 +205,7 @@ index 37f55c66b..aa6855c35 100644
                                      if (from.getX() != Double.MAX_VALUE) {
                                          Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a7a63bb06..82b276ae8 100644
+index 8388629f5..a1870fbd6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -862,7 +862,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -217,7 +217,7 @@ index a7a63bb06..82b276ae8 100644
          })) {
              // CraftBukkit start
              long l = this.worldData.getDayTime() + 24000L;
-@@ -1181,7 +1181,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1193,7 +1193,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
              while (iterator.hasNext()) {
                  EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
@@ -275,10 +275,10 @@ index 361f7857e..2578a4677 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b832ece49..c278ad57d 100644
+index 72cd52fd7..41184219e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2149,4 +2149,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2155,4 +2155,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end

patches/server/0010-Bring-back-server-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index 6786fd0947..8a9be3fdbf 100644
+index 6786fd094..8a9be3fdb 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -17,10 +17,10 @@ index 6786fd0947..8a9be3fdbf 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e6bac82668..2eef042256 100644
+index 6e15c2690..57a34fb96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2396,4 +2396,11 @@ public final class CraftServer implements Server {
+@@ -2403,4 +2403,11 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end

patches/server/0011-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 e23e47ee77..ba0260fa54 100644
+index 56020d44b..47b453899 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1505,7 +1505,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -18,7 +18,7 @@ index e23e47ee77..ba0260fa54 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d699a91685..27cbfdfba8 100644
+index d699a9168..27cbfdfba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -139,6 +139,11 @@ public class PurpurConfig {

patches/server/0012-LivingEntity-safeFallDistance.patch

@@ -30,7 +30,7 @@ index 364697e01..ee7a2fedd 100644
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 70c2be22b..ceeb0c4c1 100644
+index 8a773d7de..c27b60b18 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {
@@ -52,7 +52,7 @@ index 70c2be22b..ceeb0c4c1 100644
  
              if (!iblockdata.isAir()) {
                  double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-@@ -1681,7 +1682,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1678,7 +1679,7 @@ public abstract class EntityLiving extends Entity {
          MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
          float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
  

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 ba0260fa54..8ed47fe054 100644
+index 47b453899..3e9cbafc8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -25,7 +25,7 @@ index ba0260fa54..8ed47fe054 100644
                      }
                      // Tuinity - replace logic
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 27cbfdfba8..6ff5e07834 100644
+index 27cbfdfba..6ff5e0783 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -149,6 +149,11 @@ public class PurpurConfig {
@@ -41,10 +41,10 @@ index 27cbfdfba8..6ff5e07834 100644
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2eef042256..3079f9a161 100644
+index 57a34fb96..233f4fb8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2402,5 +2402,10 @@ public final class CraftServer implements Server {
+@@ -2409,5 +2409,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }

patches/server/0023-EntityMoveEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ceeb0c4c1..a5262b88e 100644
+index c27b60b18..af1fea428 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2790,6 +2790,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2787,6 +2787,20 @@ public abstract class EntityLiving extends Entity {
  
          this.collideNearby();
          this.world.getMethodProfiler().exit();

patches/server/0025-Player-invulnerabilities.patch

@@ -79,7 +79,7 @@ index 1e61b179f..dd55667d2 100644
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5ee90e2e5..42e7511e0 100644
+index 9382e8f79..7309d8be2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -890,6 +890,8 @@ public abstract class PlayerList {
@@ -108,10 +108,10 @@ index 2578a4677..c441fcea9 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c278ad57d..1487a30d1 100644
+index 41184219e..627c5bd04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2165,5 +2165,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2171,5 +2171,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetIdleTimer();
      }

patches/server/0035-Giants-AI-settings.patch

@@ -146,10 +146,10 @@ index 605bbf017..93714e5d9 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5f551f571..762217c7e 100644
+index af1fea428..337e58148 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2150,7 +2150,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2147,7 +2147,7 @@ public abstract class EntityLiving extends Entity {
          this.enderTeleportTo(vec3d.x, vec3d.y, vec3d.z);
      }
  

patches/server/0037-Zombie-horse-naturally-spawn.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 82b276ae8..137078daf 100644
+index a1870fbd6..596ef231c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1058,12 +1058,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1070,12 +1070,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {

patches/server/0047-Cat-spawning-options.patch

@@ -99,10 +99,10 @@ index 5bd3bcc2b..5f2bb140a 100644
          return this.E;
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 137078daf..b112fa052 100644
+index 596ef231c..edd76575a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -2357,6 +2357,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -2500,6 +2500,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          }
      }
  

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

@@ -5,20 +5,20 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 581b50a0f..87d72bbbe 100644
+index 419108acb..08ca21201 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1484,8 +1484,10 @@ public abstract class EntityLiving extends Entity {
+@@ -1483,8 +1483,10 @@ public abstract class EntityLiving extends Entity {
+ 
          this.dropInventory(); // CraftBukkit - from below
-         org.bukkit.event.entity.EntityDeathEvent deathEvent; // Paper
          if (this.cV() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
 +            if (!(damagesource == DamageSource.CRAMMING && world.purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
              this.a(damagesource, flag);
              this.dropDeathLoot(damagesource, i, flag);
 +            } // Purpur
-             // CraftBukkit start - Call death event
-             deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
-         } else {
+         }
+         // CraftBukkit start - Call death event
+         org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 index 276131adc..143908b2d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java

patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] End gateway should check if entity can use portal
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index ce239d2b2..d00ca8a53 100644
+index 89537dec8..ea3930d89 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -122,6 +122,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -14,5 +14,5 @@ index ce239d2b2..d00ca8a53 100644
          if (this.world instanceof WorldServer && !this.f()) {
 +            if (!entity.canPortal()) return; // Purpur
              this.c = 100;
-             if (this.exitPortal == null && this.world.getDimensionKey() == World.THE_END) {
+             if (this.exitPortal == null && this.world.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit - work in alternate worlds
                  this.a((WorldServer) this.world);

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

@@ -18,10 +18,10 @@ index 884f4a0ab..f55b30255 100644
  
      public void c(Vec3D vec3d) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 87d72bbbe..7aadccfc5 100644
+index 08ca21201..cb8aaceb1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2468,7 +2468,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2465,7 +2465,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  

patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch

@@ -74,10 +74,10 @@ index ee7a2fedd..c9ab80ccd 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 7aadccfc5..7a4b5670d 100644
+index cb8aaceb1..e360844cc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2854,7 +2854,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2851,7 +2851,7 @@ public abstract class EntityLiving extends Entity {
          // Paper - end don't run getEntities if we're not going to use its result
          // Tuinity start - reduce memory allocation from collideNearby
          List<Entity> list = com.tuinity.tuinity.util.CachedLists.getTempGetEntitiesList();
@@ -86,7 +86,7 @@ index 7aadccfc5..7a4b5670d 100644
          try {
          // Tuinity end - reduce memory allocation from collideNearby
  
-@@ -2998,8 +2998,8 @@ public abstract class EntityLiving extends Entity {
+@@ -2995,8 +2995,8 @@ public abstract class EntityLiving extends Entity {
      }
  
      @Override
@@ -126,7 +126,7 @@ index 2172fcefb..7afdb3060 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4f8042a48..9ae4c63ad 100644
+index f483076e1..ef6ac7929 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1805,8 +1805,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5acd2a97c..6c0854623 100644
+index ee6bf0692..85b4cc4fc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -165,7 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -47,10 +47,10 @@ index 5acd2a97c..6c0854623 100644
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3079f9a16..1f2ed2b53 100644
+index 233f4fb8c..b42ebf0e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2194,6 +2194,7 @@ public final class CraftServer implements Server {
+@@ -2201,6 +2201,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 7a4b5670d..cb9fdfd11 100644
+index e360844cc..4a8dd3010 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2825,7 +2825,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2822,7 +2822,16 @@ public abstract class EntityLiving extends Entity {
              if (itemstack.getItem() == Items.ELYTRA && ItemElytra.d(itemstack)) {
                  flag = true;
                  if (!this.world.isClientSide && (this.bl + 1) % 20 == 0) {

patches/server/0097-Add-phantom-spawning-options.patch

@@ -221,10 +221,10 @@ index bf4fa1710..ac1ea2f0c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index c5845013a..bc63beb3c 100644
+index b255ccb45..b0012bd40 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
-@@ -385,6 +385,7 @@ public final class SpawnerCreature {
+@@ -388,6 +388,7 @@ public final class SpawnerCreature {
          return new BlockPosition(i, l, j);
      }
  

patches/server/0103-ALlow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ALlow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bf94d3146..06814b92a 100644
+index c518d4346..194256e51 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -940,12 +940,13 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0103-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 10 Jul 2020 12:38:12 -0500
-Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
-
-
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 2f29d7040..719c9db3c 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -86,6 +86,15 @@ public class Main {
-                 return;
-             }
- 
-+            // Purpur start - fix SPIGOT-5885
-+            try {
-+                org.bukkit.configuration.file.YamlConfiguration config = new org.bukkit.configuration.file.YamlConfiguration();
-+                config.load((File) optionset.valueOf("spigot-settings"));
-+                org.spigotmc.SpigotConfig.disabledAdvancements = config.getStringList("advancements.disabled");
-+            } catch (Exception ignore) {
-+            }
-+            // Purpur end - fix SPIGOT-5885
-+
-             File file = (File) optionset.valueOf("universe"); // CraftBukkit
-             YggdrasilAuthenticationService yggdrasilauthenticationservice = new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString()); // Paper
-             MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();

patches/server/0104-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 10 Jul 2020 13:12:33 -0500
-Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
-
-
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 719c9db3c..5071fd1cd 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -95,7 +95,20 @@ public class Main {
-             }
-             // Purpur end - fix SPIGOT-5885
- 
--            File file = (File) optionset.valueOf("universe"); // CraftBukkit
-+            // Purpur start - fix SPIGOT-5824
-+            File file;
-+            if (optionset.has("universe")) {
-+                file = (File) optionset.valueOf("universe"); // CraftBukkit
-+            } else {
-+                try {
-+                    org.bukkit.configuration.file.YamlConfiguration config = new org.bukkit.configuration.file.YamlConfiguration();
-+                    config.load((File) optionset.valueOf("bukkit-settings"));
-+                    file = new File(config.getString("settings.world-container", "."));
-+                } catch (Exception ignore) {
-+                    file = new File(".");
-+                }
-+            }
-+            // Purpur end - fix SPIGOT-5824
-             YggdrasilAuthenticationService yggdrasilauthenticationservice = new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString()); // Paper
-             MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
-             GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();

patches/server/0105-Ridables.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
-index ac6f9d9e52..d874b177b4 100644
+index ac6f9d9e5..d874b177b 100644
 --- a/src/main/java/net/minecraft/server/ControllerMove.java
 +++ b/src/main/java/net/minecraft/server/ControllerMove.java
 @@ -6,9 +6,9 @@ public class ControllerMove {
@@ -22,7 +22,7 @@ index ac6f9d9e52..d874b177b4 100644
  
      public ControllerMove(EntityInsentient entityinsentient) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2d49816311..d14e4b1eef 100644
+index 2d4981631..d14e4b1ee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -147,7 +147,7 @@ index 2d49816311..d14e4b1eef 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index 20497c3962..cef2787eb8 100644
+index 20497c396..cef2787eb 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -41,6 +41,25 @@ public class EntityCat extends EntityTameableAnimal {
@@ -227,7 +227,7 @@ index 20497c3962..cef2787eb8 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
-index 346b77083c..eca1cbd7f7 100644
+index 346b77083..eca1cbd7f 100644
 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java
 +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java
 @@ -8,6 +8,18 @@ public class EntityCaveSpider extends EntitySpider {
@@ -250,7 +250,7 @@ index 346b77083c..eca1cbd7f7 100644
          return EntitySpider.eL().a(GenericAttributes.MAX_HEALTH, 12.0D);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index 137eada653..e772d90aec 100644
+index 137eada65..e772d90ae 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -18,6 +18,16 @@ public class EntityChicken extends EntityAnimal {
@@ -287,7 +287,7 @@ index 137eada653..e772d90aec 100644
          } else {
              this.goalSelector.a(1, new PathfinderGoalPanic(this, 1.4D));
 diff --git a/src/main/java/net/minecraft/server/EntityComplexPart.java b/src/main/java/net/minecraft/server/EntityComplexPart.java
-index 920f4c7671..7fec83387a 100644
+index 920f4c767..7fec83387 100644
 --- a/src/main/java/net/minecraft/server/EntityComplexPart.java
 +++ b/src/main/java/net/minecraft/server/EntityComplexPart.java
 @@ -47,4 +47,11 @@ public class EntityComplexPart extends Entity {
@@ -303,7 +303,7 @@ index 920f4c7671..7fec83387a 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index d6baddb9d3..69537c6278 100644
+index d6baddb9d..69537c627 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -11,9 +11,22 @@ public class EntityCow extends EntityAnimal {
@@ -387,7 +387,7 @@ index d6baddb9d3..69537c6278 100644
          this.world.addEntity(mooshroom);
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 2d5aab9e24..c387b3f56a 100644
+index 2d5aab9e2..c387b3f56 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -18,12 +18,27 @@ public class EntityCreeper extends EntityMonster {
@@ -505,7 +505,7 @@ index 2d5aab9e24..c387b3f56a 100644
          }
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 6fc8d1213a..7879b70c5c 100644
+index 6fc8d1213..7879b70c5 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -20,6 +20,16 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -561,7 +561,7 @@ index 6fc8d1213a..7879b70c5c 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 245fc38def..a1c6679f0d 100644
+index 245fc38de..a1c6679f0 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -30,9 +30,22 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -629,7 +629,7 @@ index 245fc38def..a1c6679f0d 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index a85489d56b..24d68bbb55 100644
+index a85489d56..24d68bbb5 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -12,14 +12,28 @@ public class EntityEndermite extends EntityMonster {
@@ -663,7 +663,7 @@ index a85489d56b..24d68bbb55 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index c37c2930e7..843e392395 100644
+index c37c2930e..843e39239 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -12,10 +12,23 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -723,7 +723,7 @@ index c37c2930e7..843e392395 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index db1ede61c5..d1803eca27 100644
+index db1ede61c..d1803eca2 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -75,7 +75,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -736,7 +736,7 @@ index db1ede61c5..d1803eca27 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 90b01adbec..26de8c3ad6 100644
+index 90b01adbe..26de8c3ad 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -55,6 +55,39 @@ public class EntityFox extends EntityAnimal {
@@ -860,7 +860,7 @@ index 90b01adbec..26de8c3ad6 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index 143041003d..d7c5a3153e 100644
+index 143041003..d7c5a3153 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -11,16 +11,28 @@ public class EntityGiantZombie extends EntityMonster {
@@ -893,7 +893,7 @@ index 143041003d..d7c5a3153e 100644
                  this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
                  this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillager.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java
-index be8b07a7d7..4f98c1d2ab 100644
+index be8b07a7d..4f98c1d2a 100644
 --- a/src/main/java/net/minecraft/server/EntityHoglin.java
 +++ b/src/main/java/net/minecraft/server/EntityHoglin.java
 @@ -21,6 +21,18 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin {
@@ -924,7 +924,7 @@ index be8b07a7d7..4f98c1d2ab 100644
          this.world.getMethodProfiler().exit();
          HoglinAI.a(this);
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index adf414b479..a6c2119be9 100644
+index adf414b47..a6c2119be 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -12,6 +12,13 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -942,7 +942,7 @@ index adf414b479..a6c2119be9 100644
      protected void eL() {
          this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue((double) this.fq());
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index c9ab80ccd1..2fa4628557 100644
+index c9ab80ccd..2fa462855 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -39,12 +39,27 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -982,7 +982,7 @@ index c9ab80ccd1..2fa4628557 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index d349e8a34b..01672ed635 100644
+index d349e8a34..01672ed63 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 @@ -8,6 +8,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -1000,7 +1000,7 @@ index d349e8a34b..01672ed635 100644
      protected SoundEffect getSoundAmbient() {
          super.getSoundAmbient();
 diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java
-index 5105418c42..4d45976d7c 100644
+index 5105418c4..4d45976d7 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java
 @@ -8,6 +8,13 @@ public class EntityHorseMule extends EntityHorseChestedAbstract {
@@ -1018,7 +1018,7 @@ index 5105418c42..4d45976d7c 100644
      protected SoundEffect getSoundAmbient() {
          super.getSoundAmbient();
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 43e605f682..ca8f73c752 100644
+index 43e605f68..ca8f73c75 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -12,6 +12,18 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -1059,7 +1059,7 @@ index 43e605f682..ca8f73c752 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index 0cbdccf4c5..19a21ff98d 100644
+index 0cbdccf4c..19a21ff98 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
 @@ -8,6 +8,18 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -1089,7 +1089,7 @@ index 0cbdccf4c5..19a21ff98d 100644
 +    protected void eW() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 0e23aa91d5..892ba2e59a 100644
+index 0e23aa91d..892ba2e59 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -20,6 +20,16 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -1126,7 +1126,7 @@ index 0e23aa91d5..892ba2e59a 100644
          this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index d447eb7960..d789cf12b3 100644
+index d447eb796..d789cf12b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -67,8 +67,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1216,7 +1216,7 @@ index d447eb7960..d789cf12b3 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index ab0731c2a0..2da50ef495 100644
+index ab0731c2a..2da50ef49 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -22,9 +22,22 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable {
@@ -1267,7 +1267,7 @@ index ab0731c2a0..2da50ef495 100644
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index cb9fdfd114..22b13896d0 100644
+index 4a8dd3010..ab64c0491 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -458,7 +458,7 @@ public abstract class EntityLiving extends Entity {
@@ -1279,7 +1279,7 @@ index cb9fdfd114..22b13896d0 100644
      }
  
      protected void cT() {
-@@ -2156,7 +2156,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2153,7 +2153,7 @@ public abstract class EntityLiving extends Entity {
          return 0.42F * this.getBlockJumpFactor();
      }
  
@@ -1289,7 +1289,7 @@ index cb9fdfd114..22b13896d0 100644
  
          if (this.hasEffect(MobEffects.JUMP)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index cf31920850..15efaffe24 100644
+index cf3192085..15efaffe2 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -18,7 +18,46 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -1365,7 +1365,7 @@ index cf31920850..15efaffe24 100644
  
          return i == -1 ? null : EnumColor.fromColorIndex(i);
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
-index 11008c4323..de8ce2fd39 100644
+index 11008c432..de8ce2fd3 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
 @@ -11,6 +11,23 @@ public class EntityLlamaTrader extends EntityLlama {
@@ -1393,7 +1393,7 @@ index 11008c4323..de8ce2fd39 100644
      protected EntityLlama fA() {
          return (EntityLlama) EntityTypes.TRADER_LLAMA.a(this.world);
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index ecbdc65ec5..a36e7d182f 100644
+index ecbdc65ec..a36e7d182 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -20,6 +20,18 @@ public class EntityMushroomCow extends EntityCow implements IShearable {
@@ -1434,7 +1434,7 @@ index ecbdc65ec5..a36e7d182f 100644
  
                  Pair<MobEffectList, Integer> pair = (Pair) optional.get();
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 9c1f019f91..366acbfd91 100644
+index 9c1f019f9..366acbfd9 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -16,6 +16,18 @@ public class EntityOcelot extends EntityAnimal {
@@ -1472,7 +1472,7 @@ index 9c1f019f91..366acbfd91 100644
          this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bv));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index 42df0d74ee..a0d00288fc 100644
+index 42df0d74e..a0d00288f 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -46,6 +46,27 @@ public class EntityPanda extends EntityAnimal {
@@ -1608,7 +1608,7 @@ index 42df0d74ee..a0d00288fc 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index cf2df391a9..9bd4cdf138 100644
+index cf2df391a..9bd4cdf13 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -19,9 +19,22 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
@@ -1635,7 +1635,7 @@ index cf2df391a9..9bd4cdf138 100644
          this.goalSelector.a(3, new PathfinderGoalBreed(this, 1.0D));
          this.goalSelector.a(4, new PathfinderGoalTempt(this, 1.2D, RecipeItemStack.a(Items.CARROT_ON_A_STICK), false));
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index fdd13b2ba6..7f378df36a 100644
+index fdd13b2ba..7f378df36 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -22,6 +22,16 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable {
@@ -1656,7 +1656,7 @@ index fdd13b2ba6..7f378df36a 100644
      public boolean jockeyOnlyBaby() {
          return world.purpurConfig.zombifiedPiglinJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/server/EntityPiglin.java b/src/main/java/net/minecraft/server/EntityPiglin.java
-index 63fa1581eb..4809a8dced 100644
+index 63fa1581e..4809a8dce 100644
 --- a/src/main/java/net/minecraft/server/EntityPiglin.java
 +++ b/src/main/java/net/minecraft/server/EntityPiglin.java
 @@ -31,6 +31,18 @@ public class EntityPiglin extends EntityMonster implements ICrossbow {
@@ -1687,7 +1687,7 @@ index 63fa1581eb..4809a8dced 100644
          this.world.getMethodProfiler().exit();
          PiglinAI.b(this);
 diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
-index f73c30ae49..537f094654 100644
+index f73c30ae4..537f09465 100644
 --- a/src/main/java/net/minecraft/server/EntityPillager.java
 +++ b/src/main/java/net/minecraft/server/EntityPillager.java
 @@ -13,15 +13,29 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow {
@@ -1721,7 +1721,7 @@ index f73c30ae49..537f094654 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index c26fd0e186..395b398263 100644
+index c26fd0e18..395b39826 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -16,12 +16,34 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
@@ -1796,7 +1796,7 @@ index c26fd0e186..395b398263 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 42145a89c4..572ddd6638 100644
+index 42145a89c..572ddd663 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -60,7 +60,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -1809,7 +1809,7 @@ index 42145a89c4..572ddd6638 100644
          double d0 = this.moveController.c();
  
 diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
-index 9734845c16..1e1615d9ff 100644
+index 9734845c1..1e1615d9f 100644
 --- a/src/main/java/net/minecraft/server/EntityRavager.java
 +++ b/src/main/java/net/minecraft/server/EntityRavager.java
 @@ -20,14 +20,28 @@ public class EntityRavager extends EntityRaider {
@@ -1842,7 +1842,7 @@ index 9734845c16..1e1615d9ff 100644
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index a5532e49e7..e785087d7b 100644
+index a5532e49e..e785087d7 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -56,10 +56,23 @@ public class EntitySheep extends EntityAnimal implements IShearable {
@@ -1870,7 +1870,7 @@ index a5532e49e7..e785087d7b 100644
          this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
          this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false));
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index afc4cf4960..0456236b43 100644
+index afc4cf496..0456236b4 100644
 --- a/src/main/java/net/minecraft/server/EntityShulker.java
 +++ b/src/main/java/net/minecraft/server/EntityShulker.java
 @@ -29,12 +29,26 @@ public class EntityShulker extends EntityGolem implements IMonster {
@@ -1910,7 +1910,7 @@ index afc4cf4960..0456236b43 100644
          @Override
          public boolean a() {
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 29c0a9c36a..730b2eb330 100644
+index 29c0a9c36..730b2eb33 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -11,13 +11,27 @@ public class EntitySilverfish extends EntityMonster {
@@ -1950,7 +1950,7 @@ index 29c0a9c36a..730b2eb330 100644
  
          public void g() {
 diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
-index 104f594cde..9f665cf728 100644
+index 104f594cd..9f665cf72 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
 @@ -6,6 +6,18 @@ public class EntitySkeleton extends EntitySkeletonAbstract {
@@ -1973,7 +1973,7 @@ index 104f594cde..9f665cf728 100644
      protected SoundEffect getSoundAmbient() {
          return SoundEffects.ENTITY_SKELETON_AMBIENT;
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index 84f83d48a8..e2aa9e96ca 100644
+index 84f83d48a..e2aa9e96c 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -1992,7 +1992,7 @@ index 84f83d48a8..e2aa9e96ca 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
-index 6cfc0ece39..c0ca1c76c7 100644
+index 6cfc0ece3..c0ca1c76c 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
 @@ -8,6 +8,18 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract {
@@ -2015,7 +2015,7 @@ index 6cfc0ece39..c0ca1c76c7 100644
          return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
      }
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index f415775ead..a8e76d49e7 100644
+index f415775ea..a8e76d49e 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -9,6 +9,18 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -2038,7 +2038,7 @@ index f415775ead..a8e76d49e7 100644
      protected void initPathfinder() {
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityPiglin.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index a4642cc739..ecf2059b00 100644
+index a4642cc73..ecf2059b0 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -324,7 +324,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -2051,7 +2051,7 @@ index a4642cc739..ecf2059b00 100644
  
          this.setMot(vec3d.x, (double) this.dI(), vec3d.z);
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index dfe615814d..a9c44967b2 100644
+index dfe615814..a9c44967b 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -13,13 +13,27 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -2110,7 +2110,7 @@ index dfe615814d..a9c44967b2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index f6a6772002..be1189d57c 100644
+index f6a677200..be1189d57 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -11,14 +11,28 @@ public class EntitySpider extends EntityMonster {
@@ -2143,7 +2143,7 @@ index f6a6772002..be1189d57c 100644
          this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class));
          this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class));
 diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java
-index c123e9fe97..4cb4f60fd4 100644
+index c123e9fe9..4cb4f60fd 100644
 --- a/src/main/java/net/minecraft/server/EntityStrider.java
 +++ b/src/main/java/net/minecraft/server/EntityStrider.java
 @@ -28,6 +28,18 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab
@@ -2183,7 +2183,7 @@ index c123e9fe97..4cb4f60fd4 100644
                  if (flag && !this.isSilent()) {
                      this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_STRIDER_EAT, this.getSoundCategory(), 1.0F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
 diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
-index 9b0d937f06..0b0cca4e35 100644
+index 9b0d937f0..0b0cca4e3 100644
 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 @@ -130,6 +130,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -2195,7 +2195,7 @@ index 9b0d937f06..0b0cca4e35 100644
          return entityliving == this.getOwner();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 86de40d15b..903940feb6 100644
+index 86de40d15..903940feb 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -75,8 +75,19 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -2219,7 +2219,7 @@ index 86de40d15b..903940feb6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 9985afb124..2f59c1c91a 100644
+index 9985afb12..2f59c1c91 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -23,6 +23,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -2248,7 +2248,7 @@ index 9985afb124..2f59c1c91a 100644
      public boolean a(EntityHuman entityhuman) {
          return world.purpurConfig.villagerTraderCanBeLeashed && !this.isLeashed();
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 58315906b6..958f86481a 100644
+index 58315906b..958f86481 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -17,14 +17,28 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -2281,7 +2281,7 @@ index 58315906b6..958f86481a 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index e8d8935b8e..0f6ec6bc60 100644
+index e8d8935b8..0f6ec6bc6 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -24,6 +24,18 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -2317,7 +2317,7 @@ index e8d8935b8e..0f6ec6bc60 100644
          this.targetSelector.a(2, this.by);
          this.targetSelector.a(3, this.bz);
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 5b519fa394..927d308254 100644
+index 5b519fa39..927d30825 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -33,9 +33,27 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
@@ -2357,7 +2357,7 @@ index 5b519fa394..927d308254 100644
          this.targetSelector.a(2, new PathfinderGoalOwnerHurtTarget(this));
          this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityZoglin.java b/src/main/java/net/minecraft/server/EntityZoglin.java
-index 28adbbebd1..c0b5476ff7 100644
+index 28adbbebd..c0b5476ff 100644
 --- a/src/main/java/net/minecraft/server/EntityZoglin.java
 +++ b/src/main/java/net/minecraft/server/EntityZoglin.java
 @@ -21,6 +21,18 @@ public class EntityZoglin extends EntityMonster implements IMonster, IOglin {
@@ -2422,7 +2422,7 @@ index 28adbbebd1..c0b5476ff7 100644
          this.eM();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 9f117b20e2..5189795ce6 100644
+index 9f117b20e..5189795ce 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -46,6 +46,16 @@ public class EntityZombie extends EntityMonster {
@@ -2455,7 +2455,7 @@ index 9f117b20e2..5189795ce6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 2daff85620..1130a7712d 100644
+index 2daff8562..1130a7712 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -9,6 +9,16 @@ public class EntityZombieHusk extends EntityZombie {
@@ -2476,7 +2476,7 @@ index 2daff85620..1130a7712d 100644
      public boolean jockeyOnlyBaby() {
          return world.purpurConfig.huskJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index cd796f5b86..cd12e5c74d 100644
+index cd796f5b8..cd12e5c74 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -28,6 +28,16 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -2497,7 +2497,7 @@ index cd796f5b86..cd12e5c74d 100644
      public boolean jockeyOnlyBaby() {
          return world.purpurConfig.zombieVillagerJockeyOnlyBaby;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9d5246de95..2abbc6b177 100644
+index 9d5246de9..2abbc6b17 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,11 +133,13 @@ public class PurpurConfig {
@@ -2515,7 +2515,7 @@ index 9d5246de95..2abbc6b177 100644
  
      public static String serverModName = "Purpur";
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4e8a6992ab..87b8630315 100644
+index 4e8a6992a..87b863031 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -271,36 +271,68 @@ public class PurpurWorldConfig {
@@ -2964,7 +2964,7 @@ index 4e8a6992ab..87b8630315 100644
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 new file mode 100644
-index 0000000000..828e1b8730
+index 000000000..828e1b873
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
 @@ -0,0 +1,75 @@
@@ -3045,7 +3045,7 @@ index 0000000000..828e1b8730
 +}
 diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 new file mode 100644
-index 0000000000..6086f63119
+index 000000000..6086f6311
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
 @@ -0,0 +1,86 @@
@@ -3137,7 +3137,7 @@ index 0000000000..6086f63119
 +}
 diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 new file mode 100644
-index 0000000000..68acd09a6e
+index 000000000..68acd09a6
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 @@ -0,0 +1,21 @@
@@ -3164,7 +3164,7 @@ index 0000000000..68acd09a6e
 +}
 diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java
 new file mode 100644
-index 0000000000..c0ead608ed
+index 000000000..c0ead608e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java
 @@ -0,0 +1,18 @@
@@ -3187,7 +3187,7 @@ index 0000000000..c0ead608ed
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6f18a78980..8c300692fa 100644
+index 6f18a7898..8c300692f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1127,4 +1127,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0106-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 22b13896d..3a2a45a65 100644
+index ab64c0491..061906a56 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -277,6 +277,7 @@ public abstract class EntityLiving extends Entity {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3a2a45a65..3bd38d99f 100644
+index 061906a56..3b5548f59 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1318,6 +1318,18 @@ public abstract class EntityLiving extends Entity {