Updated Upstream (Paper & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
06db5d08b0 Updated Upstream (Bukkit/CraftBukkit) (#6589)
810d200bb4 Improve interact distance check (#6591)

Airplane Changes:
8207533bdf Upstream

gradle.properties

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = d060913a61b7fc578455684ceb39b735b0c1d238
+paperCommit = 810d200bb4c6d73687526ce7ec6b739bc1e674cc
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -1671,7 +1671,7 @@ index 505546d32eea4682452dbac02311433157f6a30e..5c7b9ad379f3c272e15648dd16f4df92
  
      public static <V> CompletableFuture<List<V>> sequenceFailFast(List<? extends CompletableFuture<? extends V>> futures) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1d7c26354eee1dff5e66b6234d408ed8f800415c..1415932d2005e25a155e07eb7ecb7246e2ea2439 100644
+index 1d7c26354eee1dff5e66b6234d408ed8f800415c..f6d335b377dbf6f744e5f6ced56cf437e6e6bab3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1679,7 +1679,7 @@ index 1d7c26354eee1dff5e66b6234d408ed8f800415c..1415932d2005e25a155e07eb7ecb7246
      @DontObfuscate
      public String getServerModName() {
 -        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Airplane"; // Airplane - Airplane > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
++        return "Airplane"; // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
@@ -3448,7 +3448,7 @@ index fcb7bd9f3b6b6ada0f2e5692bce32ab76b8798a7..61c2096f2c034dbc3ad33b193b058c7d
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4687827c096ecf8872ab39b00fbf9261ba5c3689..fe1b046f707ee145327475b7f923928f4dfcad05 100644
+index c1fc309411c277f7b7450686543a6a7a7fe2fdb1..28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@@ -3460,7 +3460,7 @@ index 4687827c096ecf8872ab39b00fbf9261ba5c3689..fe1b046f707ee145327475b7f923928f
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1001,6 +1001,11 @@ public final class CraftServer implements Server {
+@@ -997,6 +997,11 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

patches/server/0003-Rebrand.patch

@@ -147,15 +147,15 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e30
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1415932d2005e25a155e07eb7ecb7246e2ea2439..e3d8caadffecde0b46e52ba1ef5175f623e1cd15 100644
+index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..306b4185fcc86189966f1170547ca1d67102ba1b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Airplane"; // Airplane - Airplane > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Airplane"; // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Purpur"; // Purpur - Purpur > // Airplane - Airplane > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
++        return "Purpur"; // Purpur - Purpur > // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
@@ -179,7 +179,7 @@ index 2a569d05edf0f5337afbcd6803c0513d338ca55e..d7b8f37dfdc8967e52136dbcebb85324
              // Spigot end
              DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fe1b046f707ee145327475b7f923928f4dfcad05..c757e4fe3e511f699512dccbcb11137fab82ea5e 100644
+index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..b6805922b1a59e35ad4f3bd3cc5646a2b7c8fa21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper

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

@@ -460,7 +460,7 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c757e4fe3e511f699512dccbcb11137fab82ea5e..535089a8f48d155883a105110f68056c5838ee83 100644
+index b6805922b1a59e35ad4f3bd3cc5646a2b7c8fa21..05974b859ae1b1f56a739648c29693859b036a65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -892,6 +892,7 @@ public final class CraftServer implements Server {
@@ -487,7 +487,7 @@ index c757e4fe3e511f699512dccbcb11137fab82ea5e..535089a8f48d155883a105110f68056c
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2518,6 +2521,18 @@ public final class CraftServer implements Server {
+@@ -2514,6 +2517,18 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  

patches/server/0005-Purpur-client-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 483df59a805d2724551042aa4470bc439fc2e7e9..a471d30e8cc289e750db32a343f7d21a589dd1b8 100644
+index 6d2d2ba4a83d887f4d52188305a4a28c2ee2f014..1ee3a4fb960129ba4dae441ad3a4c0217be29972 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -258,6 +258,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index 483df59a805d2724551042aa4470bc439fc2e7e9..a471d30e8cc289e750db32a343f7d21a
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 559572d3ff37e016ed07d428cf5d73a00ef48d70..2dc4c7695dab7d03316f5473e29baa1db29debf2 100644
+index 86ff3ee13ac571570965966fc5b2392bb928ffb0..7a7ce8f3ad0bbcbf926718bd46e9dccee08a0778 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3104,6 +3104,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3114,6 +3114,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
      private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index 559572d3ff37e016ed07d428cf5d73a00ef48d70..2dc4c7695dab7d03316f5473e29baa1d
  
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
-@@ -3128,6 +3129,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3138,6 +3139,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
@@ -43,10 +43,10 @@ index 559572d3ff37e016ed07d428cf5d73a00ef48d70..2dc4c7695dab7d03316f5473e29baa1d
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8c8698f6e17562651fe790dc19825e428d5d0352..bc88b15dc5c2d2d63edd4bb382affce1d5d7312e 100644
+index 1ccbdd2554073a41ca2f37deca3f1ec3e6a0665f..5055945fdf4c0ec6e5ecaf7f865e2e0738c0e021 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2549,4 +2549,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2550,4 +2550,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0007-Ridables.patch

@@ -22,7 +22,7 @@ index 0cc0242d981586413bcc349df6e6fd3bc09710f1..ae394b3d8b8a157d345e102f5997058d
          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 e3d8caadffecde0b46e52ba1ef5175f623e1cd15..c57e1a4c0740bbd39bf5e815420e2346eabd2e72 100644
+index 306b4185fcc86189966f1170547ca1d67102ba1b..aa1c40af600245e0020b85d292a673683caecba7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1599,6 +1599,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index e3d8caadffecde0b46e52ba1ef5175f623e1cd15..c57e1a4c0740bbd39bf5e815420e2346
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d743d50a9b3ad9502fc11adc6fe43e9a58d7a94b..372eea42755cad6bf957fa94b816db25751d707b 100644
+index 416f579560115caddadf6a400b80a4d1d6ebe04c..93d7860c229f78a214b1e89c7b401eac986ddabb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -200,6 +200,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -73,10 +73,10 @@ index 4d54d474f7d5cc4b3e1530876aa18b916ce4f72c..d2d2e3c58bd3d08f4e7f6257502ce8c2
 +
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2dc4c7695dab7d03316f5473e29baa1db29debf2..eaca5e3c6d26d5fff1eae1cacabfd389b74aec4d 100644
+index 7a7ce8f3ad0bbcbf926718bd46e9dccee08a0778..88227a0882b4a667206891b2a26ad5764fd33590 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2412,6 +2412,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2421,6 +2421,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                          ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
  
@@ -4512,7 +4512,7 @@ index 85a509e4fc0e4b9f182585e17b7deab2fea7e6c0..f1a12b147d55e34d4f8374593640a311
      public void tick() {
          super.tick();
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 008e3b769011df76697ad0abcdde5727cef05f64..0837875231ef96ff58f2fee3e558d7066d613cb8 100644
+index 461173191361fdb0c2c950eacf03ba43693e1908..ae6ccfc11a206e64c0cbced7ca692ba7e50aab03 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -35,7 +35,7 @@ public abstract class Projectile extends Entity {
@@ -5749,7 +5749,7 @@ index 0e1dcfdf846f978340380352e092375ffa089cb0..7c51a6113bbf35f96693daf2988b6d59
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 31bbf018e3b7cafb1e186c7d00b421fb133331a3..18059a30b53f566dd1d2ed3af1460e5672d6e32f 100644
+index 4b06275f2939a351a965f51177a01b3124e2513e..f02e7faff60867a64594638d1806d2f03d31fb1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -541,6 +541,15 @@ public class CraftEventFactory {

patches/server/0013-AFK-API.patch

@@ -68,7 +68,7 @@ index d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825..04d2e4e641c12fb259ee7758db81b354
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eaca5e3c6d26d5fff1eae1cacabfd389b74aec4d..9de4ca41c22fc92762b8c2705cdc8a5ffbe60233 100644
+index 88227a0882b4a667206891b2a26ad5764fd33590..1ba2155e353b390cff90605f3158b8f61d531cb3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -390,6 +390,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -192,7 +192,7 @@ index 7224c56e8a68870364c6538c82c04f371b74aabd..730e8a856b9e9560a62d959cefb6efad
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 70b9e94ec9f094b9db5808247f05d577f76e2401..dca58fcd00d104e70a7e7c57132b9016df393640 100644
+index eaff201b75f74a41e14c43d522d7b87faf9296b3..7f572658706fdc3009490bd54c2393f7685c7de7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -158,8 +158,16 @@ public class PurpurConfig {
@@ -242,7 +242,7 @@ index 20215510857b8e49ea0c93d35eddfbad7cd355b0..996171e7271e62e72c0b2b213c21caf5
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bc88b15dc5c2d2d63edd4bb382affce1d5d7312e..59f7b83332a6eaaeb9b0e24f1329d5b11a8ae053 100644
+index 5055945fdf4c0ec6e5ecaf7f865e2e0738c0e021..ee9752ec75a94be33b9f30fd5e0facc5af30ee65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -424,10 +424,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -262,7 +262,7 @@ index bc88b15dc5c2d2d63edd4bb382affce1d5d7312e..59f7b83332a6eaaeb9b0e24f1329d5b1
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2555,5 +2560,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2556,5 +2561,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }

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

@@ -17,10 +17,10 @@ index 0544ac93513d3a274bfb53bb6120bd598f4d603b..9ce5984fbeba4839290c9d213d441957
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 535089a8f48d155883a105110f68056c5838ee83..0f19709d6fa4a2b14c472dfe54bebe0c617a93c0 100644
+index 05974b859ae1b1f56a739648c29693859b036a65..c4b60be92fec445096e81e9fad106d2a9f635ff2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2687,4 +2687,11 @@ public final class CraftServer implements Server {
+@@ -2683,4 +2683,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end

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

@@ -5,20 +5,20 @@ 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 c57e1a4c0740bbd39bf5e815420e2346eabd2e72..5949641946bec9dd0c6e83ec619b01c796f44f70 100644
+index aa1c40af600245e0020b85d292a673683caecba7..adb69ec9916304204930a5988569c20e8a8868f9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1722,7 +1722,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Purpur"; // Purpur - Purpur > // Airplane - Airplane > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Purpur"; // Purpur - Purpur > // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return net.pl3x.purpur.PurpurConfig.serverModName; // Purpur - Purpur > // Airplane - Airplane > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
++        return net.pl3x.purpur.PurpurConfig.serverModName; // Purpur - Purpur > // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9d65917f455e32085bdaa47715db3f4cb7648eb1..54273ad593c0cd1c04398823f0eb7c268a6685b4 100644
+index 7f572658706fdc3009490bd54c2393f7685c7de7..bc5f937e7480d954680c7b9f1d698aff3e28665d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -170,6 +170,11 @@ public class PurpurConfig {

patches/server/0017-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 5949641946bec9dd0c6e83ec619b01c796f44f70..a7dffb26a96c52ddc185c8ce852d5e1c22ce9e36 100644
+index adb69ec9916304204930a5988569c20e8a8868f9..ce0b5770129d91c7fc1cfa751f9828973444e5fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,7 +25,7 @@ index 5949641946bec9dd0c6e83ec619b01c796f44f70..a7dffb26a96c52ddc185c8ce852d5e1c
                      }
                      // Spigot end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 54273ad593c0cd1c04398823f0eb7c268a6685b4..1eb8fdaf17d9ee47ae6727069a35a0a90cace5bb 100644
+index bc5f937e7480d954680c7b9f1d698aff3e28665d..c0e7027ad804d7b801ef8cb94963c113c95735d1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -188,6 +188,11 @@ public class PurpurConfig {
@@ -41,10 +41,10 @@ index 54273ad593c0cd1c04398823f0eb7c268a6685b4..1eb8fdaf17d9ee47ae6727069a35a0a9
      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 0f19709d6fa4a2b14c472dfe54bebe0c617a93c0..0acb9a7b892d36a99dec82df25229deea1b3c35b 100644
+index c4b60be92fec445096e81e9fad106d2a9f635ff2..09530a0caa8c64f27a6fa28c3919fb326e4a31d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2693,5 +2693,10 @@ public final class CraftServer implements Server {
+@@ -2689,5 +2689,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }

patches/server/0021-Player-invulnerabilities.patch

@@ -82,10 +82,10 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
      public Scoreboard getScoreboard() {
          return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9de4ca41c22fc92762b8c2705cdc8a5ffbe60233..8ea53a2c6f62c6e65257fa7eb094187529e6525b 100644
+index 1ba2155e353b390cff90605f3158b8f61d531cb3..b81e796625ebd7cccc66212bb92b5a3bd2e3813e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1912,12 +1912,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1921,12 +1921,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      @Override
      public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -143,10 +143,10 @@ index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce
  
      public boolean babiesAreRidable = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 59f7b83332a6eaaeb9b0e24f1329d5b11a8ae053..f7649d5e27888724f672de7673865522a30f7225 100644
+index ee9752ec75a94be33b9f30fd5e0facc5af30ee65..04d178af71fcf353b967c891e4a46835cb731599 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2575,5 +2575,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2576,5 +2576,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0024-Alternative-Keepalive-Handling.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8ea53a2c6f62c6e65257fa7eb094187529e6525b..cf10b1025fa3c6da91cfefbf8b31b83ee254f92d 100644
+index b81e796625ebd7cccc66212bb92b5a3bd2e3813e..6b560dce7779092bee5173d271beaaf53f239777 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index 8ea53a2c6f62c6e65257fa7eb094187529e6525b..cf10b1025fa3c6da91cfefbf8b31b83e
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3082,6 +3098,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3092,6 +3108,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -56,7 +56,7 @@ index 8ea53a2c6f62c6e65257fa7eb094187529e6525b..cf10b1025fa3c6da91cfefbf8b31b83e
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1a68b4b5c8ea498ef1fdc507a9a8e8dfaa64b4c1..47c0fde3000fd5c016ffb4c70d9a58086890162b 100644
+index c0e7027ad804d7b801ef8cb94963c113c95735d1..4b6bb477db0af506508e73dd42155429777b49d0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -193,6 +193,11 @@ public class PurpurConfig {

patches/server/0048-Signs-allow-color-codes.patch

@@ -17,10 +17,10 @@ index dafb9dcb3199f217e910a0cd969b863da1df6127..b1e1ea0ec16f3fc9b83b8d000024e731
          this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cf10b1025fa3c6da91cfefbf8b31b83ee254f92d..1efc3021619d4ddc5c1c305ee29730438fdf6858 100644
+index 6b560dce7779092bee5173d271beaaf53f239777..a1ac31899b1b4c5365447a0f90151e3bf3382b7d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3072,11 +3072,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3082,11 +3082,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                      }
                  }
                  // Paper end

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

@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 446e34941997b3c779fadf7322afe11c1da63360..5f1f6c43a155956298ac57acf54773728cb1215b 100644
+index db74d4db83d537beb8a404ac58843b124b1dc496..9592e3c54da1fddd5a9c199c210f9d2780da1f1d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,10 +69,10 @@ index 446e34941997b3c779fadf7322afe11c1da63360..5f1f6c43a155956298ac57acf5477372
                          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 0acb9a7b892d36a99dec82df25229deea1b3c35b..34a2ca46b6a049c744e63e443beddf2d238da2ce 100644
+index 09530a0caa8c64f27a6fa28c3919fb326e4a31d6..3f750733d8e9a28603166d36eeef390b91ec0837 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2475,6 +2475,7 @@ public final class CraftServer implements Server {
+@@ -2471,6 +2471,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch

@@ -46,10 +46,10 @@ index bd5ab259d37f13542c2510530fdf5fc5d6496975..e17c61e3b807dbc1a7bca49523491456
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f7649d5e27888724f672de7673865522a30f7225..c29ada6d77617e366248d5ba786394babbe9c6e3 100644
+index 04d178af71fcf353b967c891e4a46835cb731599..f9d00b4bd00f8e0a7680a99e94d09fe2f311cbac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1569,7 +1569,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1570,7 +1570,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(Player player) {

patches/server/0138-Configurable-default-collar-color.patch

@@ -1,11 +1,32 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Encode42 <me@encode42.dev>
 Date: Thu, 10 Dec 2020 13:43:28 -0500
-Subject: [PATCH] Configurable default wolf collar color
+Subject: [PATCH] Configurable default collar color
 
-This allows for the server to set a default collar color when a wolf is tamed.
+This allows for the server to set a default collar color when a wolf or cat is tamed.
 Resets to RED when the value is invalid.
 
+test
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+index 052d1e51a891ee17bed0043f6f3fd162c15b16b2..cea244bae0449a52b04989d1db1e4fbbd178241c 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
+@@ -366,6 +366,14 @@ public class Cat extends TamableAnimal {
+         return Mth.lerp(tickDelta, this.relaxStateOneAmountO, this.relaxStateOneAmount);
+     }
+ 
++    // Purpur start
++    @Override
++    public void tame(Player player) {
++        setCollarColor(level.purpurConfig.catDefaultCollarColor);
++        super.tame(player);
++    }
++    // Purpur end
++
+     @Override
+     public Cat getBreedOffspring(ServerLevel world, AgeableMob entity) {
+         Cat entitycat = (Cat) EntityType.CAT.create((Level) world);
 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 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a5eac3e7d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -24,10 +45,30 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 08ea2551de99a712ac604716d52fd2992de16a22..7c8ae9626d9d61e561cbe0c54cfe971260dc3a69 100644
+index 08ea2551de99a712ac604716d52fd2992de16a22..48dac9dc0d27e9c90ae10e378c7be0101f5be9b1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1781,6 +1781,7 @@ public class PurpurWorldConfig {
+@@ -607,6 +607,7 @@ public class PurpurWorldConfig {
+ 
+     public boolean catRidable = false;
+     public boolean catRidableInWater = false;
++    public DyeColor catDefaultCollarColor = DyeColor.RED;
+     public double catMaxHealth = 10.0D;
+     public int catSpawnDelay = 1200;
+     public int catSpawnSwampHutScanRange = 16;
+@@ -620,6 +621,11 @@ public class PurpurWorldConfig {
+             set("mobs.cat.attributes.max-health", null);
+             set("mobs.cat.attributes.max_health", oldValue);
+         }
++        try {
++            catDefaultCollarColor = DyeColor.valueOf(getString("mobs.cat.default-collar-color", wolfDefaultCollarColor.name()));
++        } catch (IllegalArgumentException ignore) {
++            catDefaultCollarColor = DyeColor.RED;
++        }
+         catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);
+         catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
+         catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
+@@ -1781,6 +1787,7 @@ public class PurpurWorldConfig {
      public boolean wolfRidable = false;
      public boolean wolfRidableInWater = false;
      public double wolfMaxHealth = 8.0D;
@@ -35,7 +76,7 @@ index 08ea2551de99a712ac604716d52fd2992de16a22..7c8ae9626d9d61e561cbe0c54cfe9712
      public boolean wolfMilkCuresRabies = true;
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
-@@ -1793,6 +1794,11 @@ public class PurpurWorldConfig {
+@@ -1793,6 +1800,11 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

patches/server/0139-Phantom-flames-on-swoop.patch

@@ -17,10 +17,10 @@ index 59033a5c28f672089fe3ad846775753ae90f9ad9..a575649cff83df5c0888ba48610ece08
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7c8ae9626d9d61e561cbe0c54cfe971260dc3a69..10c6c8a053acf761e2645c86823d1e2eb7c13e13 100644
+index 48dac9dc0d27e9c90ae10e378c7be0101f5be9b1..980c9cae159e67374cc613e0b0e07f2c8eff3d45 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1191,6 +1191,7 @@ public class PurpurWorldConfig {
+@@ -1197,6 +1197,7 @@ public class PurpurWorldConfig {
      public float phantomFlameDamage = 1.0F;
      public int phantomFlameFireTime = 8;
      public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index 7c8ae9626d9d61e561cbe0c54cfe971260dc3a69..10c6c8a053acf761e2645c86823d1e2e
      public double phantomMaxHealth = 20.0D;
      public double phantomAttackedByCrystalRadius = 0.0D;
      public float phantomAttackedByCrystalDamage = 1.0F;
-@@ -1217,6 +1218,7 @@ public class PurpurWorldConfig {
+@@ -1223,6 +1224,7 @@ public class PurpurWorldConfig {
          phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
          phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
          phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);

patches/server/0142-Striders-give-saddle-back.patch

@@ -28,10 +28,10 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index dcaca117ed5bf3b9c2459cbe72c7752e96b84850..666dcdc11178ea576c84f50e37da57f3844b7bf4 100644
+index 8db3f93e13bb6b302fe048c06ae5029bfb7b0c40..870c93b7d0d04b9aebde2d95cfa0ae0ed0b4bc11 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1566,6 +1566,7 @@ public class PurpurWorldConfig {
+@@ -1572,6 +1572,7 @@ public class PurpurWorldConfig {
      public boolean striderRidableInWater = false;
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index dcaca117ed5bf3b9c2459cbe72c7752e96b84850..666dcdc11178ea576c84f50e37da57f3
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1576,6 +1577,7 @@ public class PurpurWorldConfig {
+@@ -1582,6 +1583,7 @@ public class PurpurWorldConfig {
          }
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

patches/server/0146-Add-mobGriefing-bypass-to-everything-affected.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7339ec31aba03974991fdb247beefc747fa003a5..10ed6cf0d1543e1fbfb54308aa785cc206abd13d 100644
+index ff37a1dc067da82b9496da4cea2cf267cebe1b0a..ccf420a7447fdc2a466f2e6677eaacdda0e11a36 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity {
@@ -290,7 +290,7 @@ index e69213b43c8aa5a7c04add7a87482d531fbf52d2..f51ea103238b4a50439f5162a248cd9a
              // CraftBukkit start - fire ExplosionPrimeEvent
              ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 0079464e934f495f55a4e7edbe7031ec13e4d8d4..cf01bd0827d6f4012f22eef33782f651493be720 100644
+index d5d6fde1e375e5cdfc7726edd4c9b202c4cb0171..62abfc9ed33312acee299afa447ef4e208bd9cd7 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -320,6 +320,6 @@ public abstract class Projectile extends Entity {
@@ -393,7 +393,7 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
          return true;
          // Purpur end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e51f4d4ec2 100644
+index b6800b176e59bb9d5e108bcc4f3d8e00423c393d..282a98b682558818bc1b694b82592feb3bc5dad7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -381,9 +381,12 @@ public class PurpurWorldConfig {
@@ -458,7 +458,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      public double twistingVinesGrowthModifier = 0.10D;
      public int twistingVinesMaxGrowthAge = 25;
      private void twistingVinesSettings() {
-@@ -712,6 +730,7 @@ public class PurpurWorldConfig {
+@@ -718,6 +736,7 @@ public class PurpurWorldConfig {
      public double creeperMaxHealth = 20.0D;
      public double creeperChargedChance = 0.0D;
      public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -723,6 +742,7 @@ public class PurpurWorldConfig {
+@@ -729,6 +748,7 @@ public class PurpurWorldConfig {
          creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -474,7 +474,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean dolphinRidable = false;
-@@ -810,6 +830,7 @@ public class PurpurWorldConfig {
+@@ -816,6 +836,7 @@ public class PurpurWorldConfig {
      public double enderDragonMaxY = 256D;
      public double enderDragonMaxHealth = 200.0D;
      public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void enderDragonSettings() {
          enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
          enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -825,6 +846,7 @@ public class PurpurWorldConfig {
+@@ -831,6 +852,7 @@ public class PurpurWorldConfig {
          }
          enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
          enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -490,7 +490,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean endermanRidable = false;
-@@ -832,6 +854,7 @@ public class PurpurWorldConfig {
+@@ -838,6 +860,7 @@ public class PurpurWorldConfig {
      public double endermanMaxHealth = 40.0D;
      public boolean endermanAllowGriefing = true;
      public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -843,6 +866,7 @@ public class PurpurWorldConfig {
+@@ -849,6 +872,7 @@ public class PurpurWorldConfig {
          endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
          endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -506,7 +506,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean endermiteRidable = false;
-@@ -862,6 +886,7 @@ public class PurpurWorldConfig {
+@@ -868,6 +892,7 @@ public class PurpurWorldConfig {
      public boolean evokerRidable = false;
      public boolean evokerRidableInWater = false;
      public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void evokerSettings() {
          evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
          evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
-@@ -871,6 +896,7 @@ public class PurpurWorldConfig {
+@@ -877,6 +902,7 @@ public class PurpurWorldConfig {
              set("mobs.evoker.attributes.max_health", oldValue);
          }
          evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean foxRidable = false;
-@@ -878,6 +904,7 @@ public class PurpurWorldConfig {
+@@ -884,6 +910,7 @@ public class PurpurWorldConfig {
      public double foxMaxHealth = 10.0D;
      public boolean foxTypeChangesWithTulips = false;
      public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void foxSettings() {
          foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
          foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -889,6 +916,7 @@ public class PurpurWorldConfig {
+@@ -895,6 +922,7 @@ public class PurpurWorldConfig {
          foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
          foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
          foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -538,7 +538,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean ghastRidable = false;
-@@ -1284,6 +1312,7 @@ public class PurpurWorldConfig {
+@@ -1290,6 +1318,7 @@ public class PurpurWorldConfig {
      public boolean piglinRidable = false;
      public boolean piglinRidableInWater = false;
      public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -1293,6 +1322,7 @@ public class PurpurWorldConfig {
+@@ -1299,6 +1328,7 @@ public class PurpurWorldConfig {
              set("mobs.piglin.attributes.max_health", oldValue);
          }
          piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean piglinBruteRidable = false;
-@@ -1312,6 +1342,7 @@ public class PurpurWorldConfig {
+@@ -1318,6 +1348,7 @@ public class PurpurWorldConfig {
      public boolean pillagerRidable = false;
      public boolean pillagerRidableInWater = false;
      public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void pillagerSettings() {
          pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
          pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
-@@ -1321,6 +1352,7 @@ public class PurpurWorldConfig {
+@@ -1327,6 +1358,7 @@ public class PurpurWorldConfig {
              set("mobs.pillager.attributes.max_health", oldValue);
          }
          pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean polarBearRidable = false;
-@@ -1362,6 +1394,7 @@ public class PurpurWorldConfig {
+@@ -1368,6 +1400,7 @@ public class PurpurWorldConfig {
      public double rabbitNaturalToast = 0.0D;
      public double rabbitNaturalKiller = 0.0D;
      public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void rabbitSettings() {
          rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
          rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -1374,11 +1407,13 @@ public class PurpurWorldConfig {
+@@ -1380,11 +1413,13 @@ public class PurpurWorldConfig {
          rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
          rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
          rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -1388,6 +1423,7 @@ public class PurpurWorldConfig {
+@@ -1394,6 +1429,7 @@ public class PurpurWorldConfig {
              set("mobs.ravager.attributes.max_health", oldValue);
          }
          ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean salmonRidable = false;
-@@ -1406,6 +1442,7 @@ public class PurpurWorldConfig {
+@@ -1412,6 +1448,7 @@ public class PurpurWorldConfig {
      public boolean sheepRidableInWater = false;
      public double sheepMaxHealth = 8.0D;
      public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void sheepSettings() {
          sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
          sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -1416,6 +1453,7 @@ public class PurpurWorldConfig {
+@@ -1422,6 +1459,7 @@ public class PurpurWorldConfig {
          }
          sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
          sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean shulkerRidable = false;
-@@ -1435,6 +1473,7 @@ public class PurpurWorldConfig {
+@@ -1441,6 +1479,7 @@ public class PurpurWorldConfig {
      public boolean silverfishRidable = false;
      public boolean silverfishRidableInWater = false;
      public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void silverfishSettings() {
          silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
          silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
-@@ -1444,6 +1483,7 @@ public class PurpurWorldConfig {
+@@ -1450,6 +1489,7 @@ public class PurpurWorldConfig {
              set("mobs.silverfish.attributes.max_health", oldValue);
          }
          silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean skeletonRidable = false;
-@@ -1511,6 +1551,7 @@ public class PurpurWorldConfig {
+@@ -1517,6 +1557,7 @@ public class PurpurWorldConfig {
      public int snowGolemSnowBallMax = 20;
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1527,6 +1568,7 @@ public class PurpurWorldConfig {
+@@ -1533,6 +1574,7 @@ public class PurpurWorldConfig {
          snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
          snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -648,7 +648,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean squidRidable = false;
-@@ -1686,6 +1728,7 @@ public class PurpurWorldConfig {
+@@ -1692,6 +1734,7 @@ public class PurpurWorldConfig {
      public int villagerLobotomizeCheck = 60;
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1712,6 +1755,7 @@ public class PurpurWorldConfig {
+@@ -1718,6 +1761,7 @@ public class PurpurWorldConfig {
          villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
          villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean vindicatorRidable = false;
-@@ -1768,6 +1812,7 @@ public class PurpurWorldConfig {
+@@ -1774,6 +1818,7 @@ public class PurpurWorldConfig {
      public double witherMaxHealth = 300.0D;
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1784,6 +1829,7 @@ public class PurpurWorldConfig {
+@@ -1790,6 +1835,7 @@ public class PurpurWorldConfig {
          witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
          witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -680,7 +680,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -1849,6 +1895,7 @@ public class PurpurWorldConfig {
+@@ -1855,6 +1901,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
      public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1868,6 +1915,7 @@ public class PurpurWorldConfig {
+@@ -1874,6 +1921,7 @@ public class PurpurWorldConfig {
          } catch (IllegalArgumentException ignore) {
              zombieBreakDoorMinDifficulty = Difficulty.HARD;
          }

patches/server/0148-Add-EntityTeleportHinderedEvent.patch

@@ -78,7 +78,7 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
  
              blockEntity.teleportCooldown = 100;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fd9ba48619b103071f9de669dea7d59bd2db2fee..6b02ac8a7ed8e4787abf017af23936718cee8d9c 100644
+index c9fb98c7aacf0745ee5f008629ebfe2d117f664d..58812794be7c3676fa527cdeb8e48e243e73dffd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -383,6 +383,7 @@ public class PurpurWorldConfig {
@@ -113,10 +113,10 @@ index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a966
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c29ada6d77617e366248d5ba786394babbe9c6e3..02457e346b43f0ac76bb03f482d2a8bc7ef1d3af 100644
+index f9d00b4bd00f8e0a7680a99e94d09fe2f311cbac..86cc5b5ef6bb8bfeaf9ee4436790f8f8e3faf018 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1008,6 +1008,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1009,6 +1009,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle()) {

patches/server/0153-Toggle-for-water-sensitive-mob-damage.patch

@@ -70,7 +70,7 @@ index 66dab9b4e5ae05deeae11c8588a0b855d8847bdc..19753a1855b11f8cdc9fb77e8d9079bb
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb19248ca54af 100644
+index 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a583a901f1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -647,6 +647,7 @@ public class PurpurWorldConfig {
@@ -89,7 +89,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
      }
  
      public boolean catRidable = false;
-@@ -873,6 +875,7 @@ public class PurpurWorldConfig {
+@@ -879,6 +881,7 @@ public class PurpurWorldConfig {
      public boolean endermanAllowGriefing = true;
      public boolean endermanDespawnEvenWithBlock = false;
      public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -885,6 +888,7 @@ public class PurpurWorldConfig {
+@@ -891,6 +894,7 @@ public class PurpurWorldConfig {
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
          endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
          endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -105,7 +105,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
      }
  
      public boolean endermiteRidable = false;
-@@ -1570,6 +1574,7 @@ public class PurpurWorldConfig {
+@@ -1576,6 +1580,7 @@ public class PurpurWorldConfig {
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
      public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1587,6 +1592,7 @@ public class PurpurWorldConfig {
+@@ -1593,6 +1598,7 @@ public class PurpurWorldConfig {
          snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
          snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -121,7 +121,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
      }
  
      public boolean squidRidable = false;
-@@ -1640,6 +1646,7 @@ public class PurpurWorldConfig {
+@@ -1646,6 +1652,7 @@ public class PurpurWorldConfig {
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
      public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1651,6 +1658,7 @@ public class PurpurWorldConfig {
+@@ -1657,6 +1664,7 @@ public class PurpurWorldConfig {
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
          striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);

patches/server/0154-Config-to-always-tame-in-Creative.patch

@@ -20,10 +20,10 @@ index fd0f5c255729b2c05ead5843ab58fe880971b3db..08bdebf99cdedfc6115405e5198346ee
                      return;
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 052d1e51a891ee17bed0043f6f3fd162c15b16b2..0d521af1a44acc0fd62f209b845b6d128e42baf4 100644
+index cea244bae0449a52b04989d1db1e4fbbd178241c..f41bebbb12e457824cdd206a177137c4a64ef9a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -466,7 +466,7 @@ public class Cat extends TamableAnimal {
+@@ -474,7 +474,7 @@ public class Cat extends TamableAnimal {
                  }
              } else if (this.isFood(itemstack)) {
                  this.usePlayerItem(player, hand, itemstack);
@@ -59,7 +59,7 @@ index 518dd0e6b4889c049e438b393baa795a5eac3e7d..21e154c4e7fe261a41c891b481072fbd
                      this.navigation.stop();
                      this.setTarget((LivingEntity) null);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fade989848435cc96baed2400ebbb19248ca54af..8449637ff57ac78c1936313f2dd559b1f61b0c92 100644
+index c0d056ee845f8de9e4832de98dec00a583a901f1..3ca6998628c880b56ee81536f3ba849af92cf579 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -385,6 +385,7 @@ public class PurpurWorldConfig {

patches/server/0157-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch

@@ -29,10 +29,10 @@ index bdcbe92cbe431727f5879a04bf734811ffd03c3d..257a1b91c65d9f66173cfe8a31f598a0
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e80bad1049c51998614e5c9fb917dee8a2a8bb95..8f7fb9cf88562637fc27d00351f5ed34ba10dfa5 100644
+index 7fab4fe1c0ab5b63c4118b834aa78b2c73503698..ae8fe8d635acad84e79498fb5bf6db6469fbb7dd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -882,6 +882,7 @@ public class PurpurWorldConfig {
+@@ -888,6 +888,7 @@ public class PurpurWorldConfig {
      public double enderDragonMaxHealth = 200.0D;
      public boolean enderDragonAlwaysDropsFullExp = false;
      public boolean enderDragonBypassMobGriefing = false;
@@ -40,7 +40,7 @@ index e80bad1049c51998614e5c9fb917dee8a2a8bb95..8f7fb9cf88562637fc27d00351f5ed34
      private void enderDragonSettings() {
          enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
          enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -898,6 +899,7 @@ public class PurpurWorldConfig {
+@@ -904,6 +905,7 @@ public class PurpurWorldConfig {
          enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
          enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
          enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
@@ -48,7 +48,7 @@ index e80bad1049c51998614e5c9fb917dee8a2a8bb95..8f7fb9cf88562637fc27d00351f5ed34
      }
  
      public boolean endermanRidable = false;
-@@ -1870,6 +1872,7 @@ public class PurpurWorldConfig {
+@@ -1876,6 +1878,7 @@ public class PurpurWorldConfig {
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
@@ -56,7 +56,7 @@ index e80bad1049c51998614e5c9fb917dee8a2a8bb95..8f7fb9cf88562637fc27d00351f5ed34
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1887,6 +1890,7 @@ public class PurpurWorldConfig {
+@@ -1893,6 +1896,7 @@ public class PurpurWorldConfig {
          witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);

patches/server/0164-Config-Enderman-aggressiveness-towards-Endermites.patch

@@ -18,10 +18,10 @@ index 5718b5941dc63987bad30efe5377476c60095b99..31384fc12fd8af92c27c709b8c1ea33d
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 846cd0e6509b662fc2ace83939a96a9f17a696ae..efed5943156113db61d5406f6e51e20ec92ec82c 100644
+index 54e276877fe4ba5180fff54485561792301bf8b1..5020c015a27e13ace8e60d169020f276bd70bed3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -930,6 +930,8 @@ public class PurpurWorldConfig {
+@@ -936,6 +936,8 @@ public class PurpurWorldConfig {
      public boolean endermanDespawnEvenWithBlock = false;
      public boolean endermanBypassMobGriefing = false;
      public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 846cd0e6509b662fc2ace83939a96a9f17a696ae..efed5943156113db61d5406f6e51e20e
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -938,11 +940,17 @@ public class PurpurWorldConfig {
+@@ -944,11 +946,17 @@ public class PurpurWorldConfig {
              set("mobs.enderman.attributes.max-health", null);
              set("mobs.enderman.attributes.max_health", oldValue);
          }

patches/server/0165-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch

@@ -20,10 +20,10 @@ index 31384fc12fd8af92c27c709b8c1ea33d1a035eee..3e15f892f210611edf68dc56b912be5b
          } else {
              Vec3 vec3d = player.getViewVector(1.0F).normalize();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index efed5943156113db61d5406f6e51e20ec92ec82c..819addfb7e9580ce7f95f08153c41cfd1350efef 100644
+index 5020c015a27e13ace8e60d169020f276bd70bed3..d1f357dbab66909c046bb316fcb1d29588cd0ea6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -932,6 +932,8 @@ public class PurpurWorldConfig {
+@@ -938,6 +938,8 @@ public class PurpurWorldConfig {
      public boolean endermanTakeDamageFromWater = true;
      public boolean endermanAggroEndermites = true;
      public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index efed5943156113db61d5406f6e51e20ec92ec82c..819addfb7e9580ce7f95f08153c41cfd
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -951,6 +953,8 @@ public class PurpurWorldConfig {
+@@ -957,6 +959,8 @@ public class PurpurWorldConfig {
          endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
          endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
          endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);

patches/server/0167-Config-to-disable-Llama-caravans.patch

@@ -32,10 +32,10 @@ index 93a05b945ac248df0ea7a0b9d7264a9c129c3bcf..8f12851f220bb23102f52f523a4c5d98
          this.caravanHead.caravanTail = this;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6787eebe7aa1c928d8af66ce2ba2b569b4bfa300..2b3400586512cceceb25346e8d0b715cca096733 100644
+index b78ef2c5c78220c6f24cfede49194845447b698c..d4458f280f4095d035d2a34c4bcf76b1e4218124 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1198,6 +1198,7 @@ public class PurpurWorldConfig {
+@@ -1204,6 +1204,7 @@ public class PurpurWorldConfig {
      public double llamaMovementSpeedMin = 0.175D;
      public double llamaMovementSpeedMax = 0.175D;
      public int llamaBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 6787eebe7aa1c928d8af66ce2ba2b569b4bfa300..2b3400586512cceceb25346e8d0b715c
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1215,6 +1216,7 @@ public class PurpurWorldConfig {
+@@ -1221,6 +1222,7 @@ public class PurpurWorldConfig {
          llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
          llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
          llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);

patches/server/0168-Config-to-make-Creepers-explode-on-death.patch

@@ -50,10 +50,10 @@ index 0192c5502037b8f93e6507e7dcb9229201d29d36..ba12eb0b3b4023371938ec4c076cbac3
  
      private void spawnLingeringCloud() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2b3400586512cceceb25346e8d0b715cca096733..71e3d13901a90105caaf19d46a15eff4e2b3396e 100644
+index d4458f280f4095d035d2a34c4bcf76b1e4218124..f9a5a209d0b6bcc98be7051518358373fc8f1c58 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -805,6 +805,7 @@ public class PurpurWorldConfig {
+@@ -811,6 +811,7 @@ public class PurpurWorldConfig {
      public double creeperChargedChance = 0.0D;
      public boolean creeperAllowGriefing = true;
      public boolean creeperBypassMobGriefing = false;
@@ -61,7 +61,7 @@ index 2b3400586512cceceb25346e8d0b715cca096733..71e3d13901a90105caaf19d46a15eff4
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -817,6 +818,7 @@ public class PurpurWorldConfig {
+@@ -823,6 +824,7 @@ public class PurpurWorldConfig {
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
          creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);

patches/server/0169-Configurable-ravager-griefable-blocks-list.patch

@@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 71e3d13901a90105caaf19d46a15eff4e2b3396e..e30ede9fa58b626b04334b7346390498e57fd412 100644
+index f9a5a209d0b6bcc98be7051518358373fc8f1c58..777b669e2fca5d6cad27d2e7ebc92ab9ac98725e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1508,6 +1508,7 @@ public class PurpurWorldConfig {
+@@ -1514,6 +1514,7 @@ public class PurpurWorldConfig {
      public boolean ravagerRidableInWater = false;
      public double ravagerMaxHealth = 100.0D;
      public boolean ravagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 71e3d13901a90105caaf19d46a15eff4e2b3396e..e30ede9fa58b626b04334b7346390498
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -1518,6 +1519,23 @@ public class PurpurWorldConfig {
+@@ -1524,6 +1525,23 @@ public class PurpurWorldConfig {
          }
          ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
          ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);

patches/server/0172-Add-config-for-villager-trading.patch

@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
                      this.openTradingScreen(player, this.getDisplayName(), 1);
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f20157b4bde76c563593e4d65cee63c49584953f..5c8e3b36288a25d8aac9fea545867cf7f9b7e969 100644
+index f38e76e38462d6b2fd819a0bdd16ce7a726bda5a..164f7a9ca75a9ee47ff0997c587c8d426a027f2a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1852,6 +1852,7 @@ public class PurpurWorldConfig {
+@@ -1858,6 +1858,7 @@ public class PurpurWorldConfig {
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
      public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index f20157b4bde76c563593e4d65cee63c49584953f..5c8e3b36288a25d8aac9fea545867cf7
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1879,6 +1880,7 @@ public class PurpurWorldConfig {
+@@ -1885,6 +1886,7 @@ public class PurpurWorldConfig {
          villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
          villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -50,7 +50,7 @@ index f20157b4bde76c563593e4d65cee63c49584953f..5c8e3b36288a25d8aac9fea545867cf7
      }
  
      public boolean vindicatorRidable = false;
-@@ -1902,6 +1904,7 @@ public class PurpurWorldConfig {
+@@ -1908,6 +1910,7 @@ public class PurpurWorldConfig {
      public double wanderingTraderMaxHealth = 20.0D;
      public boolean wanderingTraderFollowEmeraldBlock = false;
      public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index f20157b4bde76c563593e4d65cee63c49584953f..5c8e3b36288a25d8aac9fea545867cf7
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1913,6 +1916,7 @@ public class PurpurWorldConfig {
+@@ -1919,6 +1922,7 @@ public class PurpurWorldConfig {
          wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
          wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
          wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);

patches/server/0183-Piglin-portal-spawn-modifier.patch

@@ -31,10 +31,10 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030
                  pos = pos.below();
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 32ac15c5c067347c5683336831351292ac37293a..fe1ff28cfb414a9631c66d135cc089d8ee79aa41 100644
+index 629ba354d5bce6df7109159c71d86a688946de96..5d3bb20fd3a6a6993d488db7dd1b8b3820ac7489 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1473,6 +1473,7 @@ public class PurpurWorldConfig {
+@@ -1479,6 +1479,7 @@ public class PurpurWorldConfig {
      public boolean piglinRidableInWater = false;
      public double piglinMaxHealth = 16.0D;
      public boolean piglinBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 32ac15c5c067347c5683336831351292ac37293a..fe1ff28cfb414a9631c66d135cc089d8
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -1483,6 +1484,7 @@ public class PurpurWorldConfig {
+@@ -1489,6 +1490,7 @@ public class PurpurWorldConfig {
          }
          piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
          piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);

patches/server/0186-Config-for-wither-explosion-radius.patch

@@ -18,10 +18,10 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 13749cf8c1e1d8b6de21fa2b38d8886e30ab91d6..4cfe4bb07f995ef52bda097e3247719c605e5de5 100644
+index af8eb10a60362e1baff88d6b02a04feab106a7dd..e5ad248b66f68f34996d3dac01e76951578add46 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2009,6 +2009,7 @@ public class PurpurWorldConfig {
+@@ -2015,6 +2015,7 @@ public class PurpurWorldConfig {
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
      public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 13749cf8c1e1d8b6de21fa2b38d8886e30ab91d6..4cfe4bb07f995ef52bda097e3247719c
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2027,6 +2028,7 @@ public class PurpurWorldConfig {
+@@ -2033,6 +2034,7 @@ public class PurpurWorldConfig {
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);

patches/server/0194-Config-for-health-to-impact-Creeper-explosion-radius.patch

@@ -21,10 +21,10 @@ index ba12eb0b3b4023371938ec4c076cbac3166099a8..02ebc4ee80d433f895e643bfbc618aa8
              if (!event.isCancelled()) {
                  this.dead = true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2aab50eb3e27ffd932960605cfb2016deb1eaad6..cc20f2c582c287b411bb1d41d9b232a5382630f6 100644
+index 4b85856a4b16892fdb8574f68eae231ec4509a62..ded9e1e0c302ffe3a9730a8247cc7b5331d90a88 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -901,6 +901,7 @@ public class PurpurWorldConfig {
+@@ -907,6 +907,7 @@ public class PurpurWorldConfig {
      public boolean creeperAllowGriefing = true;
      public boolean creeperBypassMobGriefing = false;
      public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index 2aab50eb3e27ffd932960605cfb2016deb1eaad6..cc20f2c582c287b411bb1d41d9b232a5
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -914,6 +915,7 @@ public class PurpurWorldConfig {
+@@ -920,6 +921,7 @@ public class PurpurWorldConfig {
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
          creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
          creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);

patches/server/0195-Iron-golem-poppy-calms-anger.patch

@@ -17,10 +17,10 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63
          this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
          this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cc20f2c582c287b411bb1d41d9b232a5382630f6..9a8dada4c9b40685bf7d29b3ab9335441ca493f2 100644
+index ded9e1e0c302ffe3a9730a8247cc7b5331d90a88..d2496b6f596173f64380ba3ee371b20680d05cd9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1276,6 +1276,7 @@ public class PurpurWorldConfig {
+@@ -1282,6 +1282,7 @@ public class PurpurWorldConfig {
      public boolean ironGolemRidableInWater = false;
      public boolean ironGolemCanSwim = false;
      public double ironGolemMaxHealth = 100.0D;
@@ -28,7 +28,7 @@ index cc20f2c582c287b411bb1d41d9b232a5382630f6..9a8dada4c9b40685bf7d29b3ab933544
      private void ironGolemSettings() {
          ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
          ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
-@@ -1286,6 +1287,7 @@ public class PurpurWorldConfig {
+@@ -1292,6 +1293,7 @@ public class PurpurWorldConfig {
              set("mobs.iron_golem.attributes.max_health", oldValue);
          }
          ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);

patches/server/0196-Breedable-parrots.patch

@@ -50,10 +50,10 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9a8dada4c9b40685bf7d29b3ab9335441ca493f2..af3aab11f668cc7b0c8749ccb33b5b900066d774 100644
+index d2496b6f596173f64380ba3ee371b20680d05cd9..8dee653f28e3980669dd63846105c6a75299ef14 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1412,6 +1412,7 @@ public class PurpurWorldConfig {
+@@ -1418,6 +1418,7 @@ public class PurpurWorldConfig {
      public boolean parrotRidableInWater = false;
      public double parrotMaxY = 256D;
      public double parrotMaxHealth = 6.0D;
@@ -61,7 +61,7 @@ index 9a8dada4c9b40685bf7d29b3ab9335441ca493f2..af3aab11f668cc7b0c8749ccb33b5b90
      private void parrotSettings() {
          parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
          parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
-@@ -1422,6 +1423,7 @@ public class PurpurWorldConfig {
+@@ -1428,6 +1429,7 @@ public class PurpurWorldConfig {
              set("mobs.parrot.attributes.max_health", oldValue);
          }
          parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);

patches/server/0210-Flying-Fall-Damage-API.patch

@@ -26,10 +26,10 @@ index b7e8ba03bd46b257ec97a494c4e7a20d0286a5dd..b0661f7ad41157c5e25ee2d87f9a0efd
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 02457e346b43f0ac76bb03f482d2a8bc7ef1d3af..f8985617ea339804356784ac69b4361df738300e 100644
+index 86cc5b5ef6bb8bfeaf9ee4436790f8f8e3faf018..6f52f6c3bce625cc6a2031b03f04777400fa5f79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2600,5 +2600,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2601,5 +2601,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

patches/server/0215-Shulker-spawn-from-bullet-options.patch

@@ -61,10 +61,10 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6fc8342df3a9512d9889a8e19495d77975572ad8..98c09438637429a0fd73e0798d85dd337d1256c9 100644
+index 974899aaf10f2af70d845505c79b75d8d089f7f5..b27778ecb6922845cab51359e7a42535d7d9a93f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1730,6 +1730,11 @@ public class PurpurWorldConfig {
+@@ -1736,6 +1736,11 @@ public class PurpurWorldConfig {
      public boolean shulkerRidable = false;
      public boolean shulkerRidableInWater = false;
      public double shulkerMaxHealth = 30.0D;
@@ -76,7 +76,7 @@ index 6fc8342df3a9512d9889a8e19495d77975572ad8..98c09438637429a0fd73e0798d85dd33
      private void shulkerSettings() {
          shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
          shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
-@@ -1739,6 +1744,11 @@ public class PurpurWorldConfig {
+@@ -1745,6 +1750,11 @@ public class PurpurWorldConfig {
              set("mobs.shulker.attributes.max_health", oldValue);
          }
          shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);

patches/server/0217-Option-to-make-drowned-break-doors.patch

@@ -34,10 +34,10 @@ index 8d3ce6c97a8734c0d13844cafca251a3f4dce8a4..a004d59483dc3ffb404ae28daf76c807
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 88cf92082ddd0cf14e740f252680cd1ef585169d..0333761a4f44d5bd65006318aeaa3a872602a6fe 100644
+index acb5e10d22a1f967a7521da88d8cc6bf226716c0..7696176536f3c273b73a10f88fbe32404eae7102 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1029,6 +1029,7 @@ public class PurpurWorldConfig {
+@@ -1035,6 +1035,7 @@ public class PurpurWorldConfig {
      public boolean drownedJockeyOnlyBaby = true;
      public double drownedJockeyChance = 0.05D;
      public boolean drownedJockeyTryExistingChickens = true;
@@ -45,7 +45,7 @@ index 88cf92082ddd0cf14e740f252680cd1ef585169d..0333761a4f44d5bd65006318aeaa3a87
      private void drownedSettings() {
          drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
          drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -1042,6 +1043,7 @@ public class PurpurWorldConfig {
+@@ -1048,6 +1049,7 @@ public class PurpurWorldConfig {
          drownedJockeyOnlyBaby = getBoolean("mobs.drowned.jockey.only-babies", drownedJockeyOnlyBaby);
          drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
          drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);

patches/server/0218-Configurable-hunger-starvation-damage.patch

@@ -18,10 +18,10 @@ index c1130952e3fa22abaa27fcc1c4761c831dc56cc3..1ac08eca469739cb52abd38483c431b6
  
                  this.tickTimer = 0;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0333761a4f44d5bd65006318aeaa3a872602a6fe..26445a451a18560fdb3c742b1b6b9f8b853bcbb9 100644
+index 7696176536f3c273b73a10f88fbe32404eae7102..d967a079bfac80aab32e5984f2163301a4c395dd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2287,4 +2287,9 @@ public class PurpurWorldConfig {
+@@ -2293,4 +2293,9 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
      }

patches/server/0232-Config-to-disable-Enderman-teleport-on-projectile-hi.patch

@@ -18,10 +18,10 @@ index 3e15f892f210611edf68dc56b912be5b4890dbcb..e76164aa8e8750cb188bec250d0cca26
              for (int i = 0; i < 64; ++i) {
                  if (this.teleport()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 132d897f59ab4cc2d7b5f1775f4fbf415ba7f074..ec9a56a4acf191e24c10af815216cdba5afd220c 100644
+index 179559e9e7630861f97c2e14de7a36d962670f2b..4086b6b30b78caa62f370f616213556e04a8e1fc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1271,6 +1271,7 @@ public class PurpurWorldConfig {
+@@ -1277,6 +1277,7 @@ public class PurpurWorldConfig {
      public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
      public boolean endermanIgnorePlayerDragonHead = false;
      public boolean endermanDisableStareAggro = false;
@@ -29,7 +29,7 @@ index 132d897f59ab4cc2d7b5f1775f4fbf415ba7f074..ec9a56a4acf191e24c10af815216cdba
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -1292,6 +1293,7 @@ public class PurpurWorldConfig {
+@@ -1298,6 +1299,7 @@ public class PurpurWorldConfig {
          endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
          endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
          endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);

patches/server/0235-Config-to-prevent-horses-from-standing-with-riders.patch

@@ -20,10 +20,10 @@ index 16b72398645757ca194cb638f46b4528283e2199..03ae6519a523ee73cce664d85074b5f9
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a8a8821a7a79ea5b429ca1b7e8b56a10b8869e02..7f0c784d7d37519336cedcac9353665c9f0d4140 100644
+index bed9d3397aea378274c4d9aa427d07bd8671325c..4c13bc65db928216f73d10f13682f6b4c803f45b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1450,6 +1450,7 @@ public class PurpurWorldConfig {
+@@ -1456,6 +1456,7 @@ public class PurpurWorldConfig {
      public double horseMovementSpeedMin = 0.1125D;
      public double horseMovementSpeedMax = 0.3375D;
      public int horseBreedingTicks = 6000;
@@ -31,7 +31,7 @@ index a8a8821a7a79ea5b429ca1b7e8b56a10b8869e02..7f0c784d7d37519336cedcac9353665c
      private void horseSettings() {
          horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1466,6 +1467,7 @@ public class PurpurWorldConfig {
+@@ -1472,6 +1473,7 @@ public class PurpurWorldConfig {
          horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
          horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
          horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);

patches/server/0238-Customizeable-Zombie-Villager-curing-times.patch

@@ -18,10 +18,10 @@ index 7fda07f5fa756077dab59de95f15b9197e09581a..6a456f52ae529654c15bd3e8ec717b3f
  
                  this.gameEvent(GameEvent.MOB_INTERACT, this.eyeBlockPosition());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2e44ded2182482894f2320588e66b1aaea0a72d2..b741c9b92ec2a473e25513aa29a204ee9d2c52e2 100644
+index 5e09bb523bf1f553ad54e0700aebe76e02c4c11c..3bacc3ed16f882b3ae4ec49756cea2621ff04152 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2438,6 +2438,8 @@ public class PurpurWorldConfig {
+@@ -2444,6 +2444,8 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -30,7 +30,7 @@ index 2e44ded2182482894f2320588e66b1aaea0a72d2..b741c9b92ec2a473e25513aa29a204ee
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2451,6 +2453,8 @@ public class PurpurWorldConfig {
+@@ -2457,6 +2459,8 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);

patches/server/0240-Toggle-for-Wither-s-spawn-sound.patch

@@ -18,10 +18,10 @@ index 48c1ddbd9f20e6ece121b166c08341006fa15105..c01c60485eba8f57ad6ead20bd3f9101
                      // this.world.b(1023, new BlockPosition(this), 0);
                      //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 09c9c3de0db01da1991df16474120170ddaafc73..d0b113400f5144da5c1cf441e3256e4c471c2d55 100644
+index f228e88541a65ad98ce93b1dc89b329cc5284710..ff217a61a2cae2a0141009b2339811f24861ced6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2299,6 +2299,7 @@ public class PurpurWorldConfig {
+@@ -2305,6 +2305,7 @@ public class PurpurWorldConfig {
      public boolean witherBypassMobGriefing = false;
      public boolean witherCanRideVehicles = false;
      public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 09c9c3de0db01da1991df16474120170ddaafc73..d0b113400f5144da5c1cf441e3256e4c
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2318,6 +2319,7 @@ public class PurpurWorldConfig {
+@@ -2324,6 +2325,7 @@ public class PurpurWorldConfig {
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
          witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);

patches/server/0243-Conduit-behavior-configuration.patch

@@ -44,10 +44,10 @@ index fc996199616156d04d6ae06ddc3da8d2c159c771..dd76fe8aa67a9c4142295b72b1c3cb78
              }
              CraftEventFactory.blockDamage = null;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 768de1265faf28ed78fe60b8e6b01ec5d4fbf335..dc4bd32f99ae9a8fbe8482d30221c237b5210653 100644
+index b5507ed93c99248f66933cfa745e4b521dd7a2f1..87e6b7121a5c516cf84ae8b584c1188b80e64cc7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2496,4 +2496,27 @@ public class PurpurWorldConfig {
+@@ -2502,4 +2502,27 @@ public class PurpurWorldConfig {
      private void hungerSettings() {
          hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
      }

patches/server/0244-Cauldron-fill-chances.patch

@@ -18,10 +18,10 @@ index dbae4f3b56d0290c6d28b9beaaa3b459754d43e3..676184c48c3abd8e2fb9a04ae3e165dc
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index dc4bd32f99ae9a8fbe8482d30221c237b5210653..2cbe45967515555ed2ccad80ceb394b904905f5b 100644
+index 87e6b7121a5c516cf84ae8b584c1188b80e64cc7..f803a7b696fffed6c2fe94850ad09a5ad1a5b646 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -2519,4 +2519,11 @@ public class PurpurWorldConfig {
+@@ -2525,4 +2525,11 @@ public class PurpurWorldConfig {
          });
          conduitBlocks = conduitBlockList.toArray(Block[]::new);
      }

patches/server/0246-Add-force-and-prompt-parameters-to-resource-pack-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f8985617ea339804356784ac69b4361df738300e..524f059ec5e064a4f9798c29faa2fff744c81bac 100644
+index 6f52f6c3bce625cc6a2031b03f04777400fa5f79..bf7209db86c948f40c687149d706a09178aeb404 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -25,6 +25,8 @@ import java.util.WeakHashMap;
@@ -17,7 +17,7 @@ index f8985617ea339804356784ac69b4361df738300e..524f059ec5e064a4f9798c29faa2fff7
  import net.minecraft.Util;
  import net.minecraft.advancements.AdvancementProgress;
  import net.minecraft.core.BlockPos;
-@@ -1750,11 +1752,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1751,11 +1753,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url, byte[] hash) {

patches/server/0247-Shulker-change-color-with-dye.patch

@@ -47,10 +47,10 @@ index 03da91ee39851e8d066b8c63dce849e665c59479..fba13f838c7a427cf43ae9958d8815b1
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8da13b954557aca5267dfb123b5e7bac3c7bf786..42769727a2f693c98401629e60314023b5e0c5ca 100644
+index 830bedf9377521cb6baade56b6eb3f72dac22d8b..648663c119c8cf8cd16550af32d190c4b6440659 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1939,6 +1939,7 @@ public class PurpurWorldConfig {
+@@ -1945,6 +1945,7 @@ public class PurpurWorldConfig {
      public double shulkerSpawnFromBulletNearbyRange = 8.0D;
      public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
      public boolean shulkerSpawnFromBulletRandomColor = false;
@@ -58,7 +58,7 @@ index 8da13b954557aca5267dfb123b5e7bac3c7bf786..42769727a2f693c98401629e60314023
      private void shulkerSettings() {
          shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
          shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
-@@ -1953,6 +1954,7 @@ public class PurpurWorldConfig {
+@@ -1959,6 +1960,7 @@ public class PurpurWorldConfig {
          shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
          shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
          shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);

patches/server/0248-Extended-OfflinePlayer-API.patch

@@ -223,10 +223,10 @@ index b20bfe5ab165bf86985e5ff2f93f415d9710e0e4..830d3163990002c7c1ba0a5a63531fa1
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 524f059ec5e064a4f9798c29faa2fff744c81bac..53ec1f1725a8b7bff4d93f4d1d6a7344818799f0 100644
+index bf7209db86c948f40c687149d706a09178aeb404..010c5ea04ae1ff2c21e40857b9f8932fb4a45f62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1925,6 +1925,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1926,6 +1926,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  

patches/server/0249-Added-the-ability-to-add-combustible-items.patch

@@ -51,10 +51,10 @@ index 2c64622577fdb6c2a5746471121403b633bf9042..c61746ca8ef1b4cec064c0022e419bcf
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index badfecb3613cebf66a27610baf494a95a74a0214..bd3b975481ce780199d6ec60bddaaa263714d289 100644
+index 354fdfdb2f71c650e523c883acde12e59d6ba4c5..3c7a337745839858c48aa5bf2f9f39d9d5e201d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1384,6 +1384,19 @@ public final class CraftServer implements Server {
+@@ -1380,6 +1380,19 @@ public final class CraftServer implements Server {
          return true;
      }
  

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Shift right click to use exp for mending
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 693c6cbd90cde4d605931c6d80ae8056e260bf34..645c76e6dd50d915263db576650c7a62a238d5ea 100644
+index a61c0ca02b085d1ab2587d54c9fcdc76a726cc4e..a11a7deefb7fdf7ca9b23f85f5ae5f7c8ca935ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -526,6 +526,7 @@ public class ServerPlayerGameMode {
@@ -36,10 +36,10 @@ index 693c6cbd90cde4d605931c6d80ae8056e260bf34..645c76e6dd50d915263db576650c7a62
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c0ab928ecff6aea1544406576e689979a2e474e9..86ed3f8491ea7ad117ac36be0d4bf304489c79f1 100644
+index 44389f03d02cdd0224fd0b91d6780cca89171df7..e27d5dd0eaf164eb2a33ae0410a0b1c02e4e56ab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1908,6 +1908,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1917,6 +1917,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              boolean cancelled;
              if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
@@ -48,7 +48,7 @@ index c0ab928ecff6aea1544406576e689979a2e474e9..86ed3f8491ea7ad117ac36be0d4bf304
                  cancelled = event.useItemInHand() == Event.Result.DENY;
              } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 52d6819b5840d423510ab889a24016414b7a2cfe..e570a9e407c27b7461e1b45b6b3a8450d2120597 100644
+index 023f02e67026015e683769635d6ca6e7aa46d341..f68121df10d9ec51b4b0defc081cc9ac9dc72cfb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -360,6 +360,7 @@ public class PurpurWorldConfig {

patches/server/0253-Dolphins-naturally-aggressive-to-players-chance.patch

@@ -47,10 +47,10 @@ index 2aead13e8f879b614445715fb1912a20b9abf4b9..a33724bee284c3f05b1807d6564ddf15
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e570a9e407c27b7461e1b45b6b3a8450d2120597..ed03ed6a594c2b06f1f5db7cc0c2b537e7aece76 100644
+index f68121df10d9ec51b4b0defc081cc9ac9dc72cfb..7614fd146a2191595478153a05493ef9bc8eb7eb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1194,6 +1194,7 @@ public class PurpurWorldConfig {
+@@ -1200,6 +1200,7 @@ public class PurpurWorldConfig {
      public float dolphinSpitDamage = 2.0F;
      public double dolphinMaxHealth = 10.0D;
      public boolean dolphinDisableTreasureSearching = false;
@@ -58,7 +58,7 @@ index e570a9e407c27b7461e1b45b6b3a8450d2120597..ed03ed6a594c2b06f1f5db7cc0c2b537
      private void dolphinSettings() {
          dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
          dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
-@@ -1206,6 +1207,7 @@ public class PurpurWorldConfig {
+@@ -1212,6 +1213,7 @@ public class PurpurWorldConfig {
          }
          dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
          dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);

patches/server/0254-Cows-naturally-aggressive-to-players-chance.patch

@@ -58,10 +58,10 @@ index c718697a9511ccf761467644967397b777446db9..66ecd29cc52483e0a79ec6c9c5dbf071
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ed03ed6a594c2b06f1f5db7cc0c2b537e7aece76..467cc1e7166875c929b4d39f7ed3d7c2f12991e6 100644
+index 7614fd146a2191595478153a05493ef9bc8eb7eb..7f1914083d60c7e6eeb12c700004fc3f9846f039 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1151,7 +1151,14 @@ public class PurpurWorldConfig {
+@@ -1157,7 +1157,14 @@ public class PurpurWorldConfig {
      public double cowMaxHealth = 10.0D;
      public int cowFeedMushrooms = 0;
      public int cowBreedingTicks = 6000;
@@ -76,7 +76,7 @@ index ed03ed6a594c2b06f1f5db7cc0c2b537e7aece76..467cc1e7166875c929b4d39f7ed3d7c2
          cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
          cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1162,6 +1169,8 @@ public class PurpurWorldConfig {
+@@ -1168,6 +1175,8 @@ public class PurpurWorldConfig {
          cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
          cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
          cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);

patches/server/0256-horses-tempted-by-gold-config.patch

@@ -17,10 +17,10 @@ index 03ae6519a523ee73cce664d85074b5f9525de6d6..206be7e1fc85fed99118020490d8494d
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 702ed3dd224982989060295f3ca07a6459072c65..508166beeffe38f96e922ac523765a05a223a1e1 100644
+index ecc07192df1b7c3e712d4ca415a13241b23dd94d..e5e44a03efdf4c3c7309b0572af275adf8243731 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1498,6 +1498,7 @@ public class PurpurWorldConfig {
+@@ -1504,6 +1504,7 @@ public class PurpurWorldConfig {
      public double horseMovementSpeedMax = 0.3375D;
      public int horseBreedingTicks = 6000;
      public boolean horseStandWithRider = true;
@@ -28,7 +28,7 @@ index 702ed3dd224982989060295f3ca07a6459072c65..508166beeffe38f96e922ac523765a05
      private void horseSettings() {
          horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1515,6 +1516,7 @@ public class PurpurWorldConfig {
+@@ -1521,6 +1522,7 @@ public class PurpurWorldConfig {
          horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
          horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
          horseStandWithRider = getBoolean("mobs.horse.stand-with-rider", horseStandWithRider);

patches/server/0257-llama-tempted-by-hay-config.patch

@@ -17,10 +17,10 @@ index 8f12851f220bb23102f52f523a4c5d9855a46e95..02035b4d062e4a44b8711d940cc3680c
          this.goalSelector.addGoal(6, new WaterAvoidingRandomStrollGoal(this, 0.7D));
          this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 6.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 508166beeffe38f96e922ac523765a05a223a1e1..66cce23e9c7927d73bc9ecf038ad6c0d1f9d534d 100644
+index e5e44a03efdf4c3c7309b0572af275adf8243731..f2c1e1a97c4fe264df6ab36ffb1ceff77e54a936 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1591,6 +1591,7 @@ public class PurpurWorldConfig {
+@@ -1597,6 +1597,7 @@ public class PurpurWorldConfig {
      public double llamaMovementSpeedMax = 0.175D;
      public int llamaBreedingTicks = 6000;
      public boolean llamaJoinCaravans = true;
@@ -28,7 +28,7 @@ index 508166beeffe38f96e922ac523765a05a223a1e1..66cce23e9c7927d73bc9ecf038ad6c0d
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1609,6 +1610,7 @@ public class PurpurWorldConfig {
+@@ -1615,6 +1616,7 @@ public class PurpurWorldConfig {
          llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
          llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
          llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans);