Component related conveniences

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

@@ -99,48 +99,6 @@ index 0ed5e15d3175ee5d145730ff8f506ffb959e5e6c..6e67ea018cd6f362bba104f542c52438
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.getClass(); // load mappings for stacktrace deobf
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ca7718053a6a2eb715ea3671bd4bc15304ede420..bf31ae9f1ea08d67e7e828cff07b30a315828b2f 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3565,6 +3565,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-         return SlotAccess.NULL;
-     }
- 
-+    // Purpur Start
-+    public void sendMessage(@Nullable String message) {
-+        sendMessage(message, Util.NIL_UUID);
-+    }
-+
-+    public void sendMessage(@Nullable String message, UUID sender) {
-+        if (message == null) {
-+            return;
-+        }
-+        sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), sender);
-+    }
-+
-+    public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
-+        sendMessage(message, Util.NIL_UUID);
-+    }
-+
-+    public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
-+        if (message == null) {
-+            return;
-+        }
-+        sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), sender);
-+    }
-+
-+    public void sendMessage(@Nullable Component message) {
-+        if (message == null) {
-+            return;
-+        }
-+        sendMessage(message, Util.NIL_UUID);
-+    }
-+    // Purpur end
-+
-     @Override
-     public void sendMessage(Component message, UUID sender) {}
- 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
 index 862553e98a7237d39a26036c615b9cbd001bd3bf..d11b463548b847382a22fdf50496b186caa0c526 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
@@ -508,7 +466,7 @@ index 818dde63df240c7e72526ef0aef87c9f8739f78a..6329a85dbed1de21dd7dcde8b62d51f0
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 332c33c95cc450d76f512e58dd6d4b61ea2de431..01ff1a9757732872693b16cdb1bf386e0a6c1e73 100644
+index c59deadcfbfd5afbf951a167979a4eceb0c63579..a335d1689ebf01e0e96a45c640188dc024610e2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -154,6 +154,14 @@ public class Main {

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

@@ -0,0 +1,112 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Tue, 29 Jun 2021 21:37:40 -0500
+Subject: [PATCH] Component related conveniences
+
+
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..5a344f68176bc9dcc31a1d75ada2afa5f1f3b8ce 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -1389,6 +1389,62 @@ public abstract class PlayerList {
+     }
+     // CraftBukkit end
+ 
++    // Purpur start
++    public void sendMessage(@Nullable String message) {
++        sendMessage(message, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable String message, ChatType type) {
++        sendMessage(message, type, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable String message, UUID sender) {
++        sendMessage(message, ChatType.SYSTEM, sender);
++    }
++
++    public void sendMessage(@Nullable String message, ChatType type, UUID sender) {
++        if (message != null) {
++            sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), type, sender);
++        }
++    }
++
++    public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
++        sendMessage(message, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable net.kyori.adventure.text.Component message, ChatType type) {
++        sendMessage(message, type, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
++        sendMessage(message, ChatType.SYSTEM, sender);
++    }
++
++    public void sendMessage(@Nullable net.kyori.adventure.text.Component message, ChatType type, UUID sender) {
++        if (message != null) {
++            sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type, sender);
++        }
++    }
++
++    public void sendMessage(@Nullable Component message) {
++        sendMessage(message, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable Component message, ChatType type) {
++        sendMessage(message, type, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable Component message, UUID sender) {
++        sendMessage(message, ChatType.SYSTEM, sender);
++    }
++
++    public void sendMessage(@Nullable Component message, ChatType type, UUID sender) {
++        if (message != null) {
++            broadcastMessage(message, type, sender);
++        }
++    }
++    // Purpur end
++
+     public void broadcastMessage(Component message, ChatType type, UUID sender) {
+         this.server.sendMessage(message, sender);
+         Iterator iterator = this.players.iterator();
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index ca7718053a6a2eb715ea3671bd4bc15304ede420..19d716a7350c6ed5b912064aa1e63a1fbbe4183f 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3565,6 +3565,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+         return SlotAccess.NULL;
+     }
+ 
++    // Purpur Start
++    public void sendMessage(@Nullable String message) {
++        sendMessage(message, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable String message, UUID sender) {
++        if (message != null) {
++            sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), sender);
++        }
++    }
++
++    public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
++        sendMessage(message, Util.NIL_UUID);
++    }
++
++    public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
++        if (message != null) {
++            sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), sender);
++        }
++    }
++
++    public void sendMessage(@Nullable Component message) {
++        if (message != null) {
++            sendMessage(message, Util.NIL_UUID);
++        }
++    }
++    // Purpur end
++
+     @Override
+     public void sendMessage(Component message, UUID sender) {}
+ 

patches/server/0005-Ridables.patch

@@ -86,7 +86,7 @@ index 9dc5c82ea1d497174d288000f9f1ccaabbcb4a18..86159b0fcf33b70310f060962ab37cd6
                          if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bf31ae9f1ea08d67e7e828cff07b30a315828b2f..f98f9e295a8e76a95e2afd24b1469a354fe614c5 100644
+index 19d716a7350c6ed5b912064aa1e63a1fbbe4183f..37db4d89996cde1bdcdc513757be75612d444f97 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -135,7 +135,7 @@ index bf31ae9f1ea08d67e7e828cff07b30a315828b2f..f98f9e295a8e76a95e2afd24b1469a35
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4211,4 +4225,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4208,4 +4222,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -4526,7 +4526,7 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b
  
      Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 32f44983aaec838960e6435580ee261cfa266b53..feceb11ae27bf32db5bb3ea8f02ebaa26dc9466b 100644
+index 5bc7d1d72847fc200a5bcd19f083e45805546aeb..46e792b67e15e31848a43d7fa2640ebb55cbe2b9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -127,4 +127,9 @@ public class PurpurConfig {

patches/server/0006-Configurable-entity-base-attributes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f98f9e295a8e76a95e2afd24b1469a354fe614c5..c5a3f54a590d164ec0f7794f6745ea86753a30d3 100644
+index 37db4d89996cde1bdcdc513757be75612d444f97..f3c5d5906a8ce64c93f4fb1f63474800a24ef012 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;

patches/server/0007-Timings-stuff.patch

@@ -55,7 +55,7 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..33263af33b4355e5079fadfcfae77d03
              String hostName = "BrokenHost";
              try {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index feceb11ae27bf32db5bb3ea8f02ebaa26dc9466b..7c898f58e954692481753238a307ad8e107411c1 100644
+index 46e792b67e15e31848a43d7fa2640ebb55cbe2b9..056f2a94912a549f63744e2afa7d34735a962120 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -132,4 +132,10 @@ public class PurpurConfig {

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

@@ -142,7 +142,7 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7c898f58e954692481753238a307ad8e107411c1..6388f8ebd0b2aede894da39cdab2c2965e0f231f 100644
+index 056f2a94912a549f63744e2afa7d34735a962120..be910f7950edcbfcd5c6192ff294166c470149e9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -138,4 +138,23 @@ public class PurpurConfig {

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

@@ -18,7 +18,7 @@ index 06177ec182d79cd101da9cd43a841656d27d6d8b..0e0f7d48337f261481731917aabf45d8
  
      public SystemReport fillSystemReport(SystemReport systemreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b2b3d591d86f51e5cb118e2334f840c627b5e677..df4f0573be672f15fedf896200206344995c333a 100644
+index 64a9288888cd5c008d48d919eb2927670eb35696..bd8885362ddcad76d055612309257e310ba06718 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,6 +141,11 @@ public class PurpurConfig {

patches/server/0019-Player-invulnerabilities.patch

@@ -77,7 +77,7 @@ index af0c7bbce7641f5aa659abb440a6cd6f57019ede..71030d9e156ce28f1ef9e3ed6845f022
          this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..5967cb5b357bd64b2ed7b48a27ad0bea56ed0349 100644
+index 5a344f68176bc9dcc31a1d75ada2afa5f1f3b8ce..62ba8ce35dc5827607c99163c6005ea0c4b7ee16 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -991,6 +991,8 @@ public abstract class PlayerList {

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

@@ -56,7 +56,7 @@ index 71030d9e156ce28f1ef9e3ed6845f022a62dfdaf..db8a8e81054e91161d43515fb19ab010
          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 77b3f9165e74c4437ca863cc9c6cbe5771faee9e..45522d00049ee72ed3cb243c74061a08a7fecae0 100644
+index 615aa4230ae9eaa2f744dd039390637aaae01a91..21e6157f85bb8b793a3e8d5e15e2045a1a6a057a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -157,6 +157,11 @@ public class PurpurConfig {

patches/server/0026-Logger-settings-suppressing-pointless-logs.patch

@@ -17,7 +17,7 @@ index 7d6dc0a8ee35274052b122bbc446bc54750de0a6..c46df052a5a39d92688f51377ee1f7b5
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 45522d00049ee72ed3cb243c74061a08a7fecae0..d92d0052c7dc0bf63d24c442a08167de31107b23 100644
+index 21e6157f85bb8b793a3e8d5e15e2045a1a6a057a..8bfecd58ad2f1e6657414c9620fcd85c7f012ae4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -180,4 +180,11 @@ public class PurpurConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 01ff1a9757732872693b16cdb1bf386e0a6c1e73..2ac68e87ae16622bf1828b3a1c71b6a13c52bea4 100644
+index a335d1689ebf01e0e96a45c640188dc024610e2c..01ca38ee35f2c1e5031ea4b8aca09a2a59c4a475 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -276,7 +276,7 @@ public class Main {

patches/server/0033-Dont-send-useless-entity-packets.patch

@@ -40,7 +40,7 @@ index a00627e0fa38632449042f59c053b4dac13e58bf..8218a074cdbe9df514f4de5aefd3c266
          this.entity.stopSeenByPlayer(player);
          player.connection.send(new ClientboundRemoveEntityPacket(this.entity.getId()));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d92d0052c7dc0bf63d24c442a08167de31107b23..bb134c5f14b0d52e1e4ffeee20c2cc9293126d22 100644
+index 8bfecd58ad2f1e6657414c9620fcd85c7f012ae4..09f1d0355f0dabbf742cdef544ae630666b455fb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -181,6 +181,11 @@ public class PurpurConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c5a3f54a590d164ec0f7794f6745ea86753a30d3..aa1d31016c89e9988976ca28ce025f675cdc4c77 100644
+index f3c5d5906a8ce64c93f4fb1f63474800a24ef012..d5df366dcbbd92523b9dd3a4afd4186a4d7ce5a1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1735,6 +1735,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 51ef325fab982c2fd8a7eb3d7e73cbfdf5b82734..e4b77d55350e93926eef9a7c521a074047542644 100644
+index 62ba8ce35dc5827607c99163c6005ea0c4b7ee16..c92b57e7e5d1b31db8b7e75a9013df41eb2806c4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1156,6 +1156,7 @@ public abstract class PlayerList {

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

@@ -24,7 +24,7 @@ index 34e364afff8cfe060244e5dd7cc0c34033dc6945..c5f1141d46acca284f5489d68d3b628e
                      this.profiler.pop();
                      this.endMetricsRecordingTick();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bb134c5f14b0d52e1e4ffeee20c2cc9293126d22..052eb37087b5f97d92c00944968c13fec343d5a3 100644
+index 09f1d0355f0dabbf742cdef544ae630666b455fb..f85849c637c338d42aa6f8d5f96b189113658422 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -192,4 +192,9 @@ public class PurpurConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index aa1d31016c89e9988976ca28ce025f675cdc4c77..34349fa7a39841dad19be112eef8b02033945f3e 100644
+index d5df366dcbbd92523b9dd3a4afd4186a4d7ce5a1..b9896dd54fe1cd6084f55f697e0f36a3ea242545 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -767,7 +767,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34349fa7a39841dad19be112eef8b02033945f3e..28a763cb92cd5c63e5f9083e451802d5b1516eb1 100644
+index b9896dd54fe1cd6084f55f697e0f36a3ea242545..d2828fabedd353fb8a854fbd0beb978f5a93b504 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4262,5 +4262,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4259,5 +4259,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean processClick(InteractionHand hand) {
          return false;
      }

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

@@ -17,7 +17,7 @@ index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 052eb37087b5f97d92c00944968c13fec343d5a3..4f63424369ad76249bfb340e7ee23c25537546be 100644
+index f85849c637c338d42aa6f8d5f96b189113658422..e4031bdfca9cfd1b54d13187f276b15c640dea88 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,12 +133,14 @@ public class PurpurConfig {

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

@@ -17,7 +17,7 @@ index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4f63424369ad76249bfb340e7ee23c25537546be..4eccccee09c8bcb9daa264b10116f7253a737f3c 100644
+index e4031bdfca9cfd1b54d13187f276b15c640dea88..47c71cf5793c8e0c72795effeb189c46f29d6a41 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,6 +133,7 @@ public class PurpurConfig {

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

@@ -17,7 +17,7 @@ index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a6
              net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4eccccee09c8bcb9daa264b10116f7253a737f3c..49c1be11f0e1d00a9bdaaf4cca7348d0dddbfc05 100644
+index 47c71cf5793c8e0c72795effeb189c46f29d6a41..d847ef8fc7c156e44cc83929f2d7232eea3c0f14 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,6 +133,7 @@ public class PurpurConfig {

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

@@ -68,7 +68,7 @@ index df4f2c729f09d5229553308e4876f29de648543f..f2b0278679fa649bbc2904660e0dc9ab
          } else {
              world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 49c1be11f0e1d00a9bdaaf4cca7348d0dddbfc05..98737d9dd6fe299f4c5d88d1a6a2400665f2e2bf 100644
+index d847ef8fc7c156e44cc83929f2d7232eea3c0f14..9fb6bf4cd4d812481fc9bb11075a4ce9c7eaab0b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -192,6 +192,11 @@ public class PurpurConfig {

patches/server/0087-Configurable-feature-seed-settings.patch

@@ -835,7 +835,7 @@ index ed3944a60d09495eb424dd11d00e8c3585177d51..fcf25cc905ece0213a0eb6365a0a5756
              return false;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 98737d9dd6fe299f4c5d88d1a6a2400665f2e2bf..8c7b8e8035e7ab91406f1a7cba7313ac9de1c742 100644
+index 9fb6bf4cd4d812481fc9bb11075a4ce9c7eaab0b..18af1952331ea6037495c1aa57ab41fbd080f0f9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@

patches/server/0093-Add-option-to-disable-certain-block-updates.patch

@@ -117,7 +117,7 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8c7b8e8035e7ab91406f1a7cba7313ac9de1c742..d7cce288e6eeef6d63325a4d30a03acf36933b9b 100644
+index 18af1952331ea6037495c1aa57ab41fbd080f0f9..11694f63641932c165c343bec254d0b1a94358ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -320,6 +320,15 @@ public class PurpurConfig {

patches/server/0098-Short-enderman-height.patch

@@ -31,7 +31,7 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
              if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d7cce288e6eeef6d63325a4d30a03acf36933b9b..dcc1548a3ca7afab671ede65a8ef265e4a80772a 100644
+index 11694f63641932c165c343bec254d0b1a94358ea..223d93c5c03a43076d8544232e3656c4c29ad2d0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -3,6 +3,8 @@ package net.pl3x.purpur;

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 28a763cb92cd5c63e5f9083e451802d5b1516eb1..a4c5bf20c69432a35ce04846e49c347364ecfaff 100644
+index d2828fabedd353fb8a854fbd0beb978f5a93b504..e43b31f07d6f0cbb35f925dca952b5947fe1fd4f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3832,11 +3832,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3829,11 +3829,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.yRotO = this.getYRot();
      }
  

patches/server/0101-Crying-obsidian-valid-for-portal-frames.patch

@@ -18,7 +18,7 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
      private final LevelAccessor level;
      private final Direction.Axis axis;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index dcc1548a3ca7afab671ede65a8ef265e4a80772a..c620ce09ae3e10f2a28ca4301eab6ce0b4f59558 100644
+index 223d93c5c03a43076d8544232e3656c4c29ad2d0..cd9f2217beba48a204edd3769429fa1ab312ab69 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -296,6 +296,7 @@ public class PurpurConfig {

patches/server/0102-Entities-can-use-portals-configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a4c5bf20c69432a35ce04846e49c347364ecfaff..13650930c6e573da323a718df778dce4f73d4adc 100644
+index e43b31f07d6f0cbb35f925dca952b5947fe1fd4f..cc5854281d976c2faa453c2a6b07b5747eed6100 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2701,7 +2701,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n