Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
466820160 Upstream Update (#5211)
2a0ee4b65 Add support for hex color codes in console
4e958e229 We're going on an Adventure! (#4842)
1a9735611 Stop loop when flags set to false (#5101)
a5928db4a [Auto] Updated Upstream (CraftBukkit)

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

@@ -10921,10 +10921,10 @@ index 7636a51a7ef0aa05b5b2aaa9d17e7b551dedac96..480a02a8f6ec7110f9af8f2037fdc09a
  
          double d0 = this.locX() + vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a9a409eebabae11ab84cf9bcced1f9a030b4a479..173a210392d71cdfc551f095dc0d9c9040d22d3f 100644
+index 17f6031558d98182c32b3df3fb60daf528d5e684..81249a38ecfdb04a8e266c8d9c3d00d63ccead4b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -528,6 +528,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -531,6 +531,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  }
              }
  
@@ -11905,10 +11905,10 @@ index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..001ac05cf26237eec8a77c476e678ff6
  
      public void a(int i) {
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c61cd50df0c81f7ab12bd0c955fd6f07f2b02e64..d987483255195c0bde713a92676baced1eaff2b3 100644
+index 6be12b7ae8501c22a7c544638c44fc6faedd5b07..2b4ac8d1f3218e89b73fb9e1d3eed8cb8bf7334d 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
-@@ -234,7 +234,7 @@ public class LoginListener implements PacketLoginInListener {
+@@ -235,7 +235,7 @@ public class LoginListener implements PacketLoginInListener {
  
              s = (new BigInteger(MinecraftEncryption.a("", this.server.getKeyPair().getPublic(), this.loginKey))).toString(16);
              this.g = LoginListener.EnumProtocolState.AUTHENTICATING;
@@ -13758,7 +13758,7 @@ index 49008cdec739b19409fdaf1b0ed806a6c0e93200..61570ab947b5a153a4c2bcb5a09344f0
      }
      // Paper end - optimised tracker
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 87b1ff21957d5d708209257e569785aeaf191181..4185ec46435ddf48d9e25c4d71ac4e14eb6301cf 100644
+index 4e3aa45856015d55bd87d43738533e8d7b01beda..674889b81ec338338d2d21d89bd4613f89a77a9e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -14124,10 +14124,10 @@ index 114e986e5132e5e4bb42d0f08a067429bce53ba6..05656ea8448aa569e8dd480461e2d5f7
              this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1eb44877e7384ae0a028a12b832684126b8d50ec..eabd1aa2b740bcb6db40be300cd6daf59674fa3f 100644
+index e1ab296811081a0d1449d48d16de065c070fde23..e86ab7dd06df2c6973456def1b43dfb5518ec739 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -98,6 +98,7 @@ public abstract class PlayerList {
+@@ -100,6 +100,7 @@ public abstract class PlayerList {
      }
  
      public void a(NetworkManager networkmanager, EntityPlayer entityplayer) {
@@ -14135,7 +14135,7 @@ index 1eb44877e7384ae0a028a12b832684126b8d50ec..eabd1aa2b740bcb6db40be300cd6daf5
          EntityPlayer prev = pendingPlayers.put(entityplayer.getUniqueID(), entityplayer);// Paper
          if (prev != null) {
              disconnectPendingPlayer(prev);
-@@ -637,7 +638,7 @@ public abstract class PlayerList {
+@@ -639,7 +640,7 @@ public abstract class PlayerList {
          SocketAddress socketaddress = loginlistener.networkManager.getSocketAddress();
  
          EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(World.OVERWORLD), gameprofile, new PlayerInteractManager(this.server.getWorldServer(World.OVERWORLD)));
@@ -17620,7 +17620,7 @@ index 7511e38130f38703164395a670f12d1af648ff04..e602efcb3fad390bb6bff1055e782bba
                  }
                  value.append("},");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf798fed9b62 100644
+index f4263b7a787a3b60d20d63aec3fd42658ca4af38..6c226d46e970fe2ade300fabf0fdd5e9f2679593 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
@@ -17632,7 +17632,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -860,6 +860,7 @@ public final class CraftServer implements Server {
+@@ -863,6 +863,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -17640,7 +17640,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -894,6 +895,7 @@ public final class CraftServer implements Server {
+@@ -897,6 +898,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -17648,7 +17648,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1857,7 +1859,10 @@ public final class CraftServer implements Server {
+@@ -1899,7 +1901,10 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -17659,8 +17659,8 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
 +        // Tuinity End
      }
  
-     @Override
-@@ -2285,6 +2290,14 @@ public final class CraftServer implements Server {
+     // Paper start
+@@ -2333,6 +2338,14 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
@@ -17786,10 +17786,10 @@ index 22bde395939f97086e411cef190bb2b1e7ede79a..0f6cb508a170360b6479f9c340484124
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 475dc1aa2cba77c13033938e719a66707f358914..a6d849facba1526ae2a2b7f3fb9a140d0b50289c 100644
+index bb474fbdf44dbc61b4fa0bced4d15bc2d1fb548f..744e6351c58e5aa4a0c668f2ff1adb76a3dc0822 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -508,27 +508,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -509,27 +509,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          entity.setHeadRotation(yaw);
      }
  
@@ -17818,7 +17818,7 @@ index 475dc1aa2cba77c13033938e719a66707f358914..a6d849facba1526ae2a2b7f3fb9a140d
  
      @Override
      public boolean teleport(Location location) {
-@@ -562,6 +542,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -563,6 +543,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return true;
      }
  

patches/server/0002-Rebrand.patch

@@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..d8b408f061d96e2fa8e2e587462e2221
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 44524e08bed8897e43e408b6f179bf798fed9b62..19a209cfc71e30edd3ff2d8c319df5e8b331e6cf 100644
+index 6c226d46e970fe2ade300fabf0fdd5e9f2679593..559bcf739ebe9e96c98e11836e29e4e1cd2e87c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper

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

@@ -373,10 +373,10 @@ index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547ca1f221d7 100644
+index 559bcf739ebe9e96c98e11836e29e4e1cd2e87c4..cb0ab8a9641b1d026d58664b55feaa6239931755 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -861,6 +861,7 @@ public final class CraftServer implements Server {
+@@ -864,6 +864,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
          com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
@@ -384,7 +384,7 @@ index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547c
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -896,6 +897,7 @@ public final class CraftServer implements Server {
+@@ -899,6 +900,7 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
              world.tuinityConfig.init(); // Tuinity - Server Config
@@ -392,7 +392,7 @@ index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547c
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -914,6 +916,7 @@ public final class CraftServer implements Server {
+@@ -917,6 +919,7 @@ public final class CraftServer implements Server {
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -400,7 +400,7 @@ index 19a209cfc71e30edd3ff2d8c319df5e8b331e6cf..8cd8db287bb4110e17ec0da57ee1547c
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2298,6 +2301,18 @@ public final class CraftServer implements Server {
+@@ -2346,6 +2349,18 @@ public final class CraftServer implements Server {
          }
          // Tuinity end - add config to timings report
  

patches/server/0005-Add-component-util.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 15 Aug 2020 03:49:33 -0500
-Subject: [PATCH] Add component util
-
-
-diff --git a/src/main/java/net/pl3x/purpur/ComponentUtil.java b/src/main/java/net/pl3x/purpur/ComponentUtil.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..3f7bc68d1a6fb00758b178bb46113e38b8bc24bc
---- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/ComponentUtil.java
-@@ -0,0 +1,32 @@
-+package net.pl3x.purpur;
-+
-+import net.md_5.bungee.api.chat.BaseComponent;
-+import net.md_5.bungee.api.chat.TextComponent;
-+import net.md_5.bungee.chat.ComponentSerializer;
-+import net.minecraft.server.IChatBaseComponent;
-+import net.minecraft.server.MinecraftServer;
-+
-+import java.util.List;
-+
-+public class ComponentUtil {
-+    public static String fromComponent(IChatBaseComponent component) {
-+        String json = "";
-+        try {
-+            int chop;
-+            List<IChatBaseComponent> siblings = component.getSiblings();
-+            if (siblings.size() > 0) chop = siblings.get(0).getChatModifier().getColor() == null ? 4 : 2;
-+            else chop = component.getChatModifier().getColor() == null ? 2 : 0;
-+            json = IChatBaseComponent.ChatSerializer.componentToJson(component);
-+            BaseComponent[] parsed = ComponentSerializer.parse(json);
-+            return TextComponent.toLegacyText(parsed).substring(chop);
-+        } catch (Exception e) {
-+            MinecraftServer.LOGGER.warn("There was a problem processing a chat component!");
-+            MinecraftServer.LOGGER.warn("We have fallen back to legacy colorless string to prevent real errors");
-+            MinecraftServer.LOGGER.warn("Please report this to Purpur!");
-+            MinecraftServer.LOGGER.warn("JSON: " + json);
-+            MinecraftServer.LOGGER.warn("The following error describes what went wrong:");
-+            e.printStackTrace();
-+            return component.getString();
-+        }
-+    }
-+}

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

@@ -143,10 +143,10 @@ index 00eb196f8caa2e4f2478972c14f4596071adbd2a..cb7e34924cb5dbff25d1ffe05cfe5bc2
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 8c714c7430c0a6b8fd7f4a158d9a271e1642bd7a..cae362bae9e1e253c34bc81813d251fece839de3 100644
+index 97c9b528f9ee8eb156a311d68d5d897fb1d837b7..08d35aa86919b97408f05d3669cd68164a3cb64f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -198,8 +198,10 @@ public class CraftContainer extends Container {
+@@ -212,8 +212,10 @@ public class CraftContainer extends Container {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:

patches/server/0008-AFK-API.patch

@@ -25,10 +25,10 @@ index 59b00c78f8d92bcceca35d0f25e4d94b3ebdc6e2..e0cf2af8fcbfc66fc32aa8e693b62160
          super(EntityTypes.PLAYER, world);
          this.bL = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 173a210392d71cdfc551f095dc0d9c9040d22d3f..af4fb76d000594229e0c0dfdcde48fbafc087de0 100644
+index 81249a38ecfdb04a8e266c8d9c3d00d63ccead4b..771f634a06eca998853830d78b4d1546dd2b4c67 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1927,8 +1927,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1929,8 +1929,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.ca = SystemUtils.getMonotonicMillis();
@@ -149,10 +149,10 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4185ec46435ddf48d9e25c4d71ac4e14eb6301cf..1d810a9b23d236493db121dde92c7ebce25a25fe 100644
+index 674889b81ec338338d2d21d89bd4613f89a77a9e..07a481d9f49028cc8911e8bd348b2d2996d565ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -252,6 +252,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
@@ -263,10 +263,10 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ed7b91bf703c7e7d5cbe323d9ab1c299c33ebad1..e319f3b1282af8019ae706f46e3978e789fbc877 100644
+index 66522b820786649a1b82647d8ccdb086edf420f6..3838e2f2430c1e21315cb93b986e428cfde6f591 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2222,4 +2222,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2427,4 +2427,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end
@@ -289,10 +289,10 @@ index ed7b91bf703c7e7d5cbe323d9ab1c299c33ebad1..e319f3b1282af8019ae706f46e3978e7
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 6ade13fd88c381280f619daaa8d6b241c67dd9d9..f80526939be358ac46430f35f3fdc7f88038c262 100644
+index 18295dceeacefd2586f3e3fe8bd58790740ba14d..f2e978107ef1163ceadb3ea7594eba6e900a8a28 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -205,6 +205,7 @@ public class ActivationRange
+@@ -206,6 +206,7 @@ public class ActivationRange
          {
  
              player.activatedTick = MinecraftServer.currentTick;

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

@@ -17,10 +17,10 @@ index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db57
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8cd8db287bb4110e17ec0da57ee1547ca1f221d7..529f50aa6755c202ac2d3a6d0e4dfd38c4eaf6e8 100644
+index cb0ab8a9641b1d026d58664b55feaa6239931755..5b48d7f1b6a42c4d41053cbc1a5f1b3240c71751 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2451,4 +2451,11 @@ public final class CraftServer implements Server {
+@@ -2509,4 +2509,11 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end

patches/server/0012-Lagging-threshold.patch

@@ -41,10 +41,10 @@ index 4627261562a1482aecf4034b8717ecccc2dd9eb0..a34ed978596f1a466b0b48e7db92ac4f
      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 529f50aa6755c202ac2d3a6d0e4dfd38c4eaf6e8..cb54a5c340a8f2b82668fc7b8e3beeb977cd3c80 100644
+index 5b48d7f1b6a42c4d41053cbc1a5f1b3240c71751..d1ebee6dd6fe01300a0b661120b1661d18aedb20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2457,5 +2457,10 @@ public final class CraftServer implements Server {
+@@ -2515,5 +2515,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }

patches/server/0013-ItemFactory-getMonsterEgg.patch

@@ -18,10 +18,10 @@ index a236e0441fc20270b4c44ed5a7d5b94297949226..eeac4aeaf21b43647aa643ec55a1ae84
      private final int c;
      private final EntityTypes<?> d;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index af84813c703813ec3a6ca89ff437d89e31a9100f..2d38a4782d85dd9c5e6097bea6c13c6185ea05ab 100644
+index c79623339cfe8fb8484bcc2a8c3eb119b9e83093..3a6a1f8ce0a30f2bdc08ec36fe9a2381439e7fa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -388,4 +388,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -396,4 +396,18 @@ public final class CraftItemFactory implements ItemFactory {
              new net.md_5.bungee.api.chat.TextComponent(customName));
      }
      // Paper end

patches/server/0016-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813b5abe8f6 100644
+index 771f634a06eca998853830d78b4d1546dd2b4c67..f4f6e85bd98ce57bf2daeb9ea30bccc25fdae8ec 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -151,6 +151,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -154,6 +154,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.canPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -17,7 +17,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
      }
      // Paper start
      public BlockPosition getPointInFront(double inFront) {
-@@ -992,6 +994,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -989,6 +991,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -30,7 +30,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
-@@ -999,7 +1007,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -996,7 +1004,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          } else {
              boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
  
@@ -39,7 +39,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -1175,6 +1183,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1172,6 +1180,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              }
              // Paper end
  
@@ -47,7 +47,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
              return this;
          }
      }
-@@ -2345,9 +2354,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2347,9 +2356,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -67,7 +67,7 @@ index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1d810a9b23d236493db121dde92c7ebce25a25fe..218ebc7befca683607b0b9863384a5b5d6bd3a2f 100644
+index 07a481d9f49028cc8911e8bd348b2d2996d565ec..3839f0ab12b42ddcafc6b469d6fafeee9781ae10 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1733,6 +1733,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,10 +79,10 @@ index 1d810a9b23d236493db121dde92c7ebce25a25fe..218ebc7befca683607b0b9863384a5b5
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index eabd1aa2b740bcb6db40be300cd6daf59674fa3f..46043d3a4f4056fff93b867c65d363ac1277db7a 100644
+index e86ab7dd06df2c6973456def1b43dfb5518ec739..757238ed5a7b62bcea8a9b57030dee21a2d7ad9e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -915,6 +915,8 @@ public abstract class PlayerList {
+@@ -917,6 +917,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -108,10 +108,10 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e319f3b1282af8019ae706f46e3978e789fbc877..62ef7bb712e91fed150bf9c16c11635a9aaaab67 100644
+index 3838e2f2430c1e21315cb93b986e428cfde6f591..bae2a248349e07718e3b4668691ed3c65736f4ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2238,5 +2238,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2443,5 +2443,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetIdleTimer();
      }

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

@@ -17,10 +17,10 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 218ebc7befca683607b0b9863384a5b5d6bd3a2f..dc93f0c8f65e2a796604b8e4488c1b3bd155b64e 100644
+index 3839f0ab12b42ddcafc6b469d6fafeee9781ae10..917609140f5d5200c918bd467998736dd504d909 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -86,6 +86,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private long lastKeepAlive = SystemUtils.getMonotonicMillis(); private void setLastPing(long lastPing) { this.lastKeepAlive = lastPing;}; private long getLastPing() { return this.lastKeepAlive;}; // Paper - OBFHELPER
      private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER
      private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; };  // Paper - OBFHELPER
@@ -28,7 +28,7 @@ index 218ebc7befca683607b0b9863384a5b5d6bd3a2f..dc93f0c8f65e2a796604b8e4488c1b3b
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
-@@ -218,6 +219,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -220,6 +221,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
          long currentTime = SystemUtils.getMonotonicMillis();
          long elapsedTime = currentTime - this.getLastPing();
  
@@ -50,7 +50,7 @@ index 218ebc7befca683607b0b9863384a5b5d6bd3a2f..dc93f0c8f65e2a796604b8e4488c1b3b
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -2907,6 +2923,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2909,6 +2925,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 9beb6fad228ccb3081b661c845836f4f29404d86..b98d094422f09ddffe09bac7cf1a9c7e92ae5aa6 100644
+index d0fad346dd4511722f958a8c0bda67492184fb62..1df22ad7b35d6bd974e7fe805920542654c1b9d0 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -133,6 +133,7 @@ public class PacketStatusListener implements PacketStatusInListener {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5e157aabc8326a32a6a1825fef0f9813b5abe8f6..c533c24aefa6693dd5c11d690930327c5d7a8802 100644
+index f4f6e85bd98ce57bf2daeb9ea30bccc25fdae8ec..a76d4ed8a0baa09340fcf58e647afa1ce18d9c97 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1452,6 +1452,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1449,6 +1449,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void openSign(TileEntitySign tileentitysign) {
@@ -17,29 +17,38 @@ index 5e157aabc8326a32a6a1825fef0f9813b5abe8f6..c533c24aefa6693dd5c11d690930327c
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dc93f0c8f65e2a796604b8e4488c1b3bd155b64e..eaddc933261aeccc963ac0f35eebb387c16ae6a0 100644
+index 917609140f5d5200c918bd467998736dd504d909..bce0c34a7acf686e715f6cfc73098f5840f269ca 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2904,6 +2904,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2903,6 +2903,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end
 +                // Purpur start
 +                if (worldserver.purpurConfig.signAllowColors) {
-+                    lines[i] = currentLine;
-+                    if (player.hasPermission("purpur.sign.color")) lines[i] = lines[i].replaceAll("(?i)&([0-9a-fr])", "\u00a7$1");
-+                    if (player.hasPermission("purpur.sign.style")) lines[i] = lines[i].replaceAll("(?i)&([l-or])", "\u00a7$1");
-+                    if (player.hasPermission("purpur.sign.magic")) lines[i] = lines[i].replaceAll("(?i)&([kr])", "\u00a7$1");
++                    final org.bukkit.entity.Player bukkitPlayer = player.getBukkitEntity();
++                    if (bukkitPlayer.hasPermission("purpur.sign.color")) currentLine = currentLine.replaceAll("(?i)&([0-9a-fr])", "\u00a7$1");
++                    if (bukkitPlayer.hasPermission("purpur.sign.style")) currentLine = currentLine.replaceAll("(?i)&([l-or])", "\u00a7$1");
++                    if (bukkitPlayer.hasPermission("purpur.sign.magic")) currentLine = currentLine.replaceAll("(?i)&([kr])", "\u00a7$1");
++                    lines.add(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(currentLine));
 +                } else
 +                // Purpur end
-                 lines[i] = SharedConstants.filterAllowedChatCharacters(currentLine); // Paper - Replaced with anvil color stripping method to stop exploits that allow colored signs to be created.
+                 lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterAllowedChatCharacters(currentLine))); // Paper - Replaced with anvil color stripping method to stop exploits that allow colored signs to be created.
              }
-             SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
+             SignChangeEvent event = new SignChangeEvent(org.bukkit.craftbukkit.block.CraftBlock.at(worldserver, blockposition), this.getPlayer(), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc90b897e91 100644
+index 316766970243e8ac00e4c82f6c710de5edc3fa51..be6c9e17379e2c9bf50c58f11632c308efded6c3 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
-@@ -93,6 +93,18 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
+@@ -1,6 +1,7 @@
+ package net.minecraft.server;
+ 
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
++import io.papermc.paper.adventure.PaperAdventure; // Purpur
+ import java.util.UUID;
+ import javax.annotation.Nullable;
+ 
+@@ -93,6 +94,18 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
          this.g[i] = null;
      }
  
@@ -47,8 +56,8 @@ index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc9
 +    public PacketPlayOutTileEntityData getTranslatedUpdatePacket() {
 +        NBTTagCompound nbt = save(new NBTTagCompound());
 +        for (int i = 0; i < 4; ++i) {
-+            String line = net.pl3x.purpur.ComponentUtil.fromComponent(lines[i]).replace("\u00a7", "&");
-+            nbt.setString("Text" + (i + 1), IChatBaseComponent.ChatSerializer.componentToJson(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(line)[0]));
++            String line = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().serialize(PaperAdventure.asAdventure(lines[i]));
++            nbt.setString("Text" + (i + 1), net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().serialize(net.kyori.adventure.text.Component.text(line)));
 +        }
 +        nbt.setString("PurpurEditor", "true");
 +        return new PacketPlayOutTileEntityData(position, 9, nbt);

patches/server/0047-Controllable-Minecarts.patch

@@ -106,10 +106,10 @@ index 022dfdc5b6af4b243e7e4da8660e8e41d04e1a30..298af30b1a7f12d42216fc1b7ee801fd
          this.move(EnumMoveType.SELF, this.getMot());
          if (!this.onGround) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c533c24aefa6693dd5c11d690930327c5d7a8802..26237522deb4495df374d144335a0034ba046762 100644
+index a76d4ed8a0baa09340fcf58e647afa1ce18d9c97..26220aa522f5bfa64fe0cacbe3800624b41299bb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1005,6 +1005,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1002,6 +1002,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {

patches/server/0049-Players-should-not-cram-to-death.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 26237522deb4495df374d144335a0034ba046762..41f9b0b905fd79a9c570be601048f817aba64bbd 100644
+index 26220aa522f5bfa64fe0cacbe3800624b41299bb..d3b0e7d03b625f13b1317025d88d93886a900c95 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1429,7 +1429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1426,7 +1426,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 46043d3a4f4056fff93b867c65d363ac1277db7a..726e3292318f6a0de474f68fe30da4a954c7600a 100644
+index 757238ed5a7b62bcea8a9b57030dee21a2d7ad9e..3bf7fcc900fdb6d8cf155cb04bd4d4ce9142f898 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1074,6 +1074,7 @@ public abstract class PlayerList {
+@@ -1076,6 +1076,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }

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

@@ -47,10 +47,10 @@ index b795128c5a69f65883fdd318a8a5b2a65512bb16..1296d06bd7c4abb3a43679e382e83319
                          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 cb54a5c340a8f2b82668fc7b8e3beeb977cd3c80..dfe6777db04bb550ae0e761addd26b2d5abf3baf 100644
+index d1ebee6dd6fe01300a0b661120b1661d18aedb20..1f17349c00522cd4768836d78e712cd6c184fd11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2247,6 +2247,7 @@ public final class CraftServer implements Server {
+@@ -2295,6 +2295,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

patches/server/0083-Allow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eaddc933261aeccc963ac0f35eebb387c16ae6a0..67fa3bd958876abc39c46d9e517551836b0e86ed 100644
+index bce0c34a7acf686e715f6cfc73098f5840f269ca..a5952ce1e6d0f48d7801104bdbd05eb21a0df4de 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1054,7 +1054,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0084-Entity-lifespan.patch

@@ -92,10 +92,10 @@ index 9807441d53fcf4ef7aaffe3801542f5a371eb7af..43cdeaae22bf020d0b3c1e1c56e65e73
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 67fa3bd958876abc39c46d9e517551836b0e86ed..94353290087df17e441dba8fe8999ad558652cda 100644
+index a5952ce1e6d0f48d7801104bdbd05eb21a0df4de..cd13a09ace9341e6741956058c0faca16fe6ac16 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2296,6 +2296,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2299,6 +2299,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
                      Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
                      PlayerInteractEntityEvent event;

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

@@ -17,10 +17,10 @@ index ba678ad67d1a48724738a71e1ff3b4e85b672f2c..67f33647cd66c32fcc6d91edd7f66684
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 41f9b0b905fd79a9c570be601048f817aba64bbd..fa8e8cdb2ee594fea47c32acf6013771ad1e59a5 100644
+index d3b0e7d03b625f13b1317025d88d93886a900c95..fd923594c67f51cfd77ca22f5b6664a3b7136e7e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -2412,4 +2412,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2414,4 +2414,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end

patches/server/0086-Squid-EAR-immunity.patch

@@ -21,10 +21,10 @@ index 5d35651f43de81c8cf047479ad9c88c4b3f1c38c..32bb2524641722d16b6bafcc6b1af279
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerCanBeLeashed = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f80526939be358ac46430f35f3fdc7f88038c262..66b7c75929cd98737628b9d4f22829b5b65b8373 100644
+index f2e978107ef1163ceadb3ea7594eba6e900a8a28..05b165f4f2de1f09164c33c0b222dc660c86ebb9 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -376,6 +376,7 @@ public class ActivationRange
+@@ -377,6 +377,7 @@ public class ActivationRange
       */
      public static boolean checkIfActive(Entity entity)
      {

patches/server/0094-Fix-death-message-colors.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 19 Jul 2020 14:08:33 -0500
-Subject: [PATCH] Fix death message colors
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fa8e8cdb2ee594fea47c32acf6013771ad1e59a5..5aee348399622959afe421b896c182863151d0d1 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -853,7 +853,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
- 
-         IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();
- 
--        String deathmessage = defaultMessage.getString();
-+        // Purpur start
-+        String deathmessage;
-+        String json = "";
-+        try {
-+            json = IChatBaseComponent.ChatSerializer.componentToJson(defaultMessage);
-+            net.md_5.bungee.api.chat.BaseComponent[] parsed = net.md_5.bungee.chat.ComponentSerializer.parse(json);
-+            net.md_5.bungee.api.chat.TextComponent wrapped = new net.md_5.bungee.api.chat.TextComponent(parsed);
-+            deathmessage = wrapped.toLegacyText();
-+        } catch (Exception e) {
-+            deathmessage = defaultMessage.getString();
-+            MinecraftServer.LOGGER.warn("There was a problem processing the death message json component!");
-+            MinecraftServer.LOGGER.warn("We have fallen back to legacy colorless death message to prevent real errors");
-+            MinecraftServer.LOGGER.warn("Please report this to Purpur!");
-+            MinecraftServer.LOGGER.warn("JSON: " + json);
-+            MinecraftServer.LOGGER.warn("The following error describes what went wrong:");
-+            e.printStackTrace();
-+        }
-+        // Purpur end
-         org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
-         // Paper start - cancellable death event
-         if (event.isCancelled()) {

patches/server/0095-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 19 Jul 2020 15:30:50 -0500
-Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
- chat event
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 94353290087df17e441dba8fe8999ad558652cda..05f2cc5904f196c70e8e83625810673f6110aba0 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2055,7 +2055,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
-                             return null;
-                         }
- 
--                        String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage());
-+                        // Purpur Start - Support for vanilla world scoreboard name coloring (copied from paper's diff below)
-+                        String displayName = queueEvent.getPlayer().getDisplayName();
-+                        if (PlayerConnection.this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {
-+                            IChatBaseComponent nameFromTeam = ScoreboardTeam.a(PlayerConnection.this.player.getScoreboardTeam(), PlayerConnection.this.player.getDisplayName());
-+                            // Explicitly add a RESET here, vanilla uses components for this now...
-+                            displayName = new net.md_5.bungee.api.chat.TextComponent(net.md_5.bungee.chat.ComponentSerializer.parse(IChatBaseComponent.ChatSerializer.componentToJson(nameFromTeam))).toLegacyText() + org.bukkit.ChatColor.RESET;
-+                        }
-+                        String message = String.format(queueEvent.getFormat(), displayName, queueEvent.getMessage());
-+                        // Purpur end
-                         PlayerConnection.this.minecraftServer.console.sendMessage(message);
-                         if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
-                             for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
-@@ -2088,7 +2096,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
-                 // Paper Start - (Meh) Support for vanilla world scoreboard name coloring
-                 String displayName = event.getPlayer().getDisplayName();
-                 if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {
--                    IChatBaseComponent nameFromTeam = ScoreboardTeam.a(this.player.getScoreboardTeam(), ((CraftPlayer) player).getHandle().getDisplayName());
-+                    IChatBaseComponent nameFromTeam = ScoreboardTeam.a(this.player.getScoreboardTeam(), this.player.getDisplayName()); // Purpur - why are we casting bukkit player back to nms player when we already have a nms player...
-                     // Explicitly add a RESET here, vanilla uses components for this now...
-                     displayName = new net.md_5.bungee.api.chat.TextComponent(net.md_5.bungee.chat.ComponentSerializer.parse(IChatBaseComponent.ChatSerializer.componentToJson(nameFromTeam))).toLegacyText() + org.bukkit.ChatColor.RESET;
-                 }