Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
01b965e0 Fix getChunkAtIfCachedImmediately (#2915)
0a897d6e Rebuild patches
5792c862 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c9eebbb8 Fix Player#applyMending NPE (#2917)
d16a5d88 Performance patches prerequisite (#2802)

current-paper

@@ -1 +1 @@
-1.15.2--f04e2989db6a1166dee756a67ad1f68ac0793fa4
+1.15.2--c75a0f34551c25d98afa3d2884eb242e39ae23aa

patches/api/0002-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From 6b57d8de1bfc0480aaf902eb577f3bbb52a18a7a Mon Sep 17 00:00:00 2001
+From c7a9cc3cca9498a9d55596b6941f5376f2e2b1bf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 20 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 231bc6e31..21bc13f79 100644
+index 388c2bbfa..e4d874557 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1605,6 +1605,17 @@ public final class Bukkit {
@@ -28,13 +28,13 @@ index 231bc6e31..21bc13f79 100644
 +    // Purpur end
 +
      @NotNull
-     public static Server.Spigot spigot()
-     {
+     public static Server.Spigot spigot() {
+         return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 314704790..c12e3ba90 100644
+index a13717306..8179c7e72 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1406,4 +1406,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1404,4 +1404,13 @@ public interface Server extends PluginMessageRecipient {
       */
      int getCurrentTick();
      // Paper end
@@ -49,5 +49,5 @@ index 314704790..c12e3ba90 100644
 +    // Purpur end
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/api/0012-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 010289186dcb60b25f38edec1f9cd04fa4823b60 Mon Sep 17 00:00:00 2001
+From a16b381d7e18bf1f5bec89265dac170878e706f9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement lagging threshold
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 21bc13f79..b6f8942c0 100644
+index e4d874557..c45a1161f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1614,6 +1614,15 @@ public final class Bukkit {
@@ -29,10 +29,10 @@ index 21bc13f79..b6f8942c0 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c12e3ba90..ee768158b 100644
+index 8179c7e72..ec702f290 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1414,5 +1414,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1412,5 +1412,12 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      String getServerName();
@@ -46,5 +46,5 @@ index c12e3ba90..ee768158b 100644
      // Purpur end
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/api/0013-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 817e206de1b706e4d070f4f8b9eae40cc5856dfa Mon Sep 17 00:00:00 2001
+From 2fa5ae33c37672f73d97561789f802555505ab5a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 10 Aug 2019 22:19:56 -0500
 Subject: [PATCH] Implement AFK API
@@ -86,10 +86,10 @@ index 000000000..4db334854
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7f771b356..d7c4118de 100644
+index 877ea4f32..b9fe2a0fa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2073,4 +2073,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0018-Add-block-and-fluid-tick-events.patch

@@ -1,4 +1,4 @@
-From cb458f71ac63c46f685c10bbf70b7a7db1328438 Mon Sep 17 00:00:00 2001
+From a826a72e5296e80f2858925861cbe089f149fe29 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:58:29 -0500
 Subject: [PATCH] Add block and fluid tick events
@@ -134,10 +134,10 @@ index 000000000..1a8f0b674
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b46b27194..72c83510e 100644
+index 6fe025338..1edf1ec72 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3061,6 +3061,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3058,6 +3058,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public List<Raid> getRaids();
  

patches/api/0020-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 80badd7d99ee6288238e318bfdb1ad8953f899c8 Mon Sep 17 00:00:00 2001
+From 211fe2b9508d8cbdd4b1d9a38e0b7c98e7d37745 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:36 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 72c83510e..86d1f1663 100644
+index 1edf1ec72..5a28b8bed 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3089,6 +3089,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3086,6 +3086,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param enabled True to enable
       */
      void setFluidTickEventEnabled(boolean enabled);

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

@@ -1,4 +1,4 @@
-From 882af062f7613780c7e01c4fedc3e37976a70eb7 Mon Sep 17 00:00:00 2001
+From 8377227e21f726b0fbdd19d13fd35540bac7af07 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -20,7 +20,7 @@ Subject: [PATCH] Purpur config files
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1d7d1ffbf..d886f1d14 100644
+index 1d7d1ffbf7..d886f1d145 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -96,10 +96,12 @@ public class PaperConfig {
@@ -37,10 +37,10 @@ index 1d7d1ffbf..d886f1d14 100644
  
      static void readConfig(Class<?> clazz, Object instance) {
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index a74fae9ed..8b5f4cab0 100644
+index 349a0ea213..d70c8cab2b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -185,6 +185,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
          com.destroystokyo.paper.PaperConfig.registerCommands();
@@ -57,10 +57,10 @@ index a74fae9ed..8b5f4cab0 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9df079d8a..7a7874c0a 100644
+index 9135113884..b737a0f0ca 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -96,6 +96,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -80,6 +80,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
      public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
@@ -69,7 +69,7 @@ index 9df079d8a..7a7874c0a 100644
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPosition lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -145,6 +147,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -129,6 +131,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -79,7 +79,7 @@ index 9df079d8a..7a7874c0a 100644
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java
 new file mode 100644
-index 000000000..246eb8140
+index 0000000000..246eb8140f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/Metrics.java
 @@ -0,0 +1,598 @@
@@ -683,7 +683,7 @@ index 000000000..246eb8140
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java
 new file mode 100644
-index 000000000..f8cf4ad23
+index 0000000000..f8cf4ad234
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
 @@ -0,0 +1,66 @@
@@ -755,7 +755,7 @@ index 000000000..f8cf4ad23
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 000000000..6f378b5f6
+index 0000000000..6f378b5f69
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,133 @@
@@ -894,7 +894,7 @@ index 000000000..6f378b5f6
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 000000000..4985f2173
+index 0000000000..4985f21733
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -0,0 +1,60 @@
@@ -959,7 +959,7 @@ index 000000000..4985f2173
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 55b849237..4c15bd403 100644
+index 55b8492373..4c15bd403d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -794,6 +794,7 @@ public final class CraftServer implements Server {
@@ -987,7 +987,7 @@ index 55b849237..4c15bd403 100644
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index eb5f44e30..7e8b6cab7 100644
+index eb5f44e300..7e8b6cab74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -138,6 +138,14 @@ public class Main {

patches/server/0020-Allow-color-codes-on-signs.patch

@@ -1,4 +1,4 @@
-From 75624e914d39270de5805777883611d434357ae4 Mon Sep 17 00:00:00 2001
+From 370e0d0af302dfdcc30802a93f7b24d8a7a10bab Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Allow color codes on signs
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs
  4 files changed, 28 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9a61dda82..4c1ccdd6f 100644
+index 15230a834c..5e56e0e3e8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1120,6 +1120,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1124,6 +1124,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);
@@ -23,7 +23,7 @@ index 9a61dda82..4c1ccdd6f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a1ce2d2e0..213f7992d 100644
+index a1ce2d2e07..213f7992dc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2575,6 +2575,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index a1ce2d2e0..213f7992d 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 5eb86c434..8810a1120 100644
+index 5eb86c4341..8810a1120b 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -119,6 +119,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 5eb86c434..8810a1120 100644
      @Override
      public PacketPlayOutTileEntityData getUpdatePacket() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6cb887ca8..061b02e45 100644
+index 6cb887ca8b..061b02e45a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -95,4 +95,9 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
-From 81f8ef12bb7e7269371fd4d472f97dcc40b0a074 Mon Sep 17 00:00:00 2001
+From 66f5145a4f2f12ad8346fcc523eecdbb4ef1e3f8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first
@@ -11,7 +11,7 @@ Subject: [PATCH] Mending mends most damages equipment first
  4 files changed, 39 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index fabc7a8dd7..5dc6b92f69 100644
+index d96c03a1a1..79f9a8776f 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -246,9 +246,32 @@ public class EnchantmentManager {
@@ -42,10 +42,10 @@ index fabc7a8dd7..5dc6b92f69 100644
 +    // Purpur end
 +
      // Paper - OBFHELPER
-     public static @Nullable ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) {
+     public static @javax.annotation.Nonnull ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) {
 -        Entry<EnumItemSlot, ItemStack> entry = b(enchantment, entityliving);
 +        Entry<EnumItemSlot, ItemStack> entry = enchantment == Enchantments.MENDING && net.pl3x.purpur.PurpurConfig.useBetterMending ? getMostDamagedEquipment(enchantment, entityliving) : b(enchantment, entityliving); // Purpur
-         return entry != null ? entry.getValue() : null;
+         return entry != null ? entry.getValue() : ItemStack.NULL_ITEM;
      }
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -62,7 +62,7 @@ index 53c6c33892..462e0976a4 100644
                  if (entry != null) {
                      ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index df85f9df0a..222a8fdc3b 100644
+index d6e43313bf..72ce83a2d9 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -369,10 +369,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index df85f9df0a..222a8fdc3b 100644
          return this.tag == null ? 0 : this.tag.getInt("Damage");
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ef00ce307e..1a49dd4d80 100644
+index 8396509c88..83112e6ec0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -151,6 +151,11 @@ public class PurpurConfig {
@@ -102,5 +102,5 @@ index ef00ce307e..1a49dd4d80 100644
      private static void requireShiftToMount() {
          requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
 -- 
-2.24.0.rc1
+2.24.0
 

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

@@ -1,4 +1,4 @@
-From ffdf3c98b94794ee51cb65db5ac085e7a6271fde Mon Sep 17 00:00:00 2001
+From 3a716b3f4749b7a960c083219e070a3cfdaf0c2b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4c1ccdd6f..df20e5706 100644
+index 5e56e0e3e8..d72b45119d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1094,7 +1094,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1098,7 +1098,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {

patches/server/0050-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 8f9291b0064b5f283fca8915db808cf4b6767ab5 Mon Sep 17 00:00:00 2001
+From 4337b1d75f67fd41da02eda525fac381840a33de Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -17,7 +17,7 @@ Subject: [PATCH] Implement AFK API
  10 files changed, 112 insertions(+), 24 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 416eb5d77..c24f7071a 100644
+index 3be37a1008..9904b78c6c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1375,6 +1375,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -29,7 +29,7 @@ index 416eb5d77..c24f7071a 100644
          double d3 = this.locX() - d0;
          double d4 = this.locY() - d1;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d5e8831f1..1302c36b2 100644
+index de22cad764..9d26bd1e4c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -49,10 +49,10 @@ index d5e8831f1..1302c36b2 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5545df892..621e3948e 100644
+index d72b45119d..6022079a9d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1611,8 +1611,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1615,8 +1615,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.cj = SystemUtils.getMonotonicMillis();
@@ -105,7 +105,7 @@ index 5545df892..621e3948e 100644
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 774ec96f0..5ef881634 100644
+index 774ec96f0a..5ef8816340 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -116,28 +116,18 @@ public interface IEntityAccess {
@@ -150,7 +150,7 @@ index 774ec96f0..5ef881634 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 8d7273a38..71c61dc45 100644
+index 8d7273a38b..71c61dc45e 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -170,7 +170,7 @@ index 8d7273a38..71c61dc45 100644
      public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
          double d4 = d3 * d3;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a4af019bc..2db59c55c 100644
+index a4af019bc6..2db59c55ca 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -277,6 +277,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,7 +205,7 @@ index a4af019bc..2db59c55c 100644
                                  if (from.getX() != Double.MAX_VALUE) {
                                      Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a0477134d..9d3df98e7 100644
+index 2d0db3e05f..04685efc52 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -376,7 +376,7 @@ public class WorldServer extends World {
@@ -227,7 +227,7 @@ index a0477134d..9d3df98e7 100644
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6d875b78b..7422f361e 100644
+index 6d875b78b9..7422f361e4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -106,6 +106,21 @@ public class PurpurWorldConfig {
@@ -253,7 +253,7 @@ index 6d875b78b..7422f361e 100644
      private void itemsCanBreakTurtleEggs() {
          itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c1acec87f..8c5d7bd2b 100644
+index c1acec87f9..8c5d7bd2b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2089,4 +2089,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -279,7 +279,7 @@ index c1acec87f..8c5d7bd2b 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 6e165a164..da5fef091 100644
+index 6e165a1649..da5fef091a 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -137,6 +137,7 @@ public class ActivationRange

patches/server/0067-Add-block-and-fluid-tick-events.patch

@@ -1,4 +1,4 @@
-From 0ebf3580ed75a053cf80047aea6c28045d39bfb1 Mon Sep 17 00:00:00 2001
+From 3fe2fbbd1250a9665a0cf53d27b1731fe9d2aa28 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:58:56 -0500
 Subject: [PATCH] Add block and fluid tick events
@@ -10,7 +10,7 @@ Subject: [PATCH] Add block and fluid tick events
  3 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4dfcce82de..53763216f0 100644
+index 04685efc52..0a41997edd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -604,7 +604,7 @@ public class WorldServer extends World {
@@ -66,10 +66,10 @@ index b2c62de053..b82fc8d19f 100644
      private void editableSigns() {
          editableSigns = getBoolean("editable-signs", editableSigns);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4d7a7a8fe8..7945904713 100644
+index 7654519c9e..65cf1e7016 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2401,6 +2401,24 @@ public class CraftWorld implements World {
+@@ -2396,6 +2396,24 @@ public class CraftWorld implements World {
          return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
      }
  

patches/server/0069-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 1917eaeb325abd940cfda12932c514362043acaa Mon Sep 17 00:00:00 2001
+From cf3e04647fdfd8bbafa0d2f25174a0c6a0aaa9dd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:43 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 5 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7945904713..4f4d9f0c0b 100644
+index 65cf1e7016..bde927e35b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2417,6 +2417,11 @@ public class CraftWorld implements World {
+@@ -2412,6 +2412,11 @@ public class CraftWorld implements World {
      public void setFluidTickEventEnabled(boolean enabled) {
          getHandle().purpurConfig.fluidTickEvent = enabled;
      }

patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch

@@ -1,4 +1,4 @@
-From a7d8078de39790a06c8bce73b3da4f87a6bc0768 Mon Sep 17 00:00:00 2001
+From ee11f79c178ffe049354797dfdae6025ecebe5f7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 01:42:50 -0500
 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7a7874c0a..726fcc7a1 100644
+index b737a0f0ca..716a3885ac 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1410,8 +1410,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1387,8 +1387,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return blockposition;
      }
  
@@ -25,7 +25,7 @@ index 7a7874c0a..726fcc7a1 100644
  
      public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 02060223f..9a2d0e22b 100644
+index bde927e35b..5217484d76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -380,12 +380,16 @@ public class CraftWorld implements World {

patches/server/0086-Make-the-GUI-better.patch

@@ -1,4 +1,4 @@
-From e61e156fbc28b8c3ec867428fa4814df04e78b07 Mon Sep 17 00:00:00 2001
+From 706430e6dde42ea1db8fe1ea7d66602fb31f8477 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 16 Jan 2020 14:59:16 -0600
 Subject: [PATCH] Make the GUI better
@@ -24,7 +24,7 @@ Subject: [PATCH] Make the GUI better
  create mode 100644 src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8b5f4cab0..aec6040c8 100644
+index d70c8cab2b..61ccb6079e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -51,7 +51,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -36,7 +36,7 @@ index 8b5f4cab0..aec6040c8 100644
  
      // CraftBukkit start - Signature changed
      public DedicatedServer(joptsimple.OptionSet options, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
-@@ -413,7 +413,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -420,7 +420,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      @Override
      public void exit() {
          if (this.p != null) {
@@ -45,7 +45,7 @@ index 8b5f4cab0..aec6040c8 100644
          }
  
          if (this.remoteControlListener != null) {
-@@ -512,7 +512,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -519,7 +519,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
      public void bc() {
          if (this.p == null) {
@@ -55,7 +55,7 @@ index 8b5f4cab0..aec6040c8 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9d5ef40a0..105ac8a04 100644
+index 9d5ef40a03..105ac8a040 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -77,7 +77,7 @@ index 9d5ef40a0..105ac8a04 100644
      }
 diff --git a/src/main/java/net/pl3x/purpur/gui/ColorPane.java b/src/main/java/net/pl3x/purpur/gui/ColorPane.java
 new file mode 100644
-index 000000000..d5d5766e1
+index 0000000000..d5d5766e1d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/ColorPane.java
 @@ -0,0 +1,126 @@
@@ -209,7 +209,7 @@ index 000000000..d5d5766e1
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/ConsolePanel.java b/src/main/java/net/pl3x/purpur/gui/ConsolePanel.java
 new file mode 100644
-index 000000000..a728f46e6
+index 0000000000..a728f46e6c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/ConsolePanel.java
 @@ -0,0 +1,128 @@
@@ -343,7 +343,7 @@ index 000000000..a728f46e6
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/PlayerListComponent.java b/src/main/java/net/pl3x/purpur/gui/PlayerListComponent.java
 new file mode 100644
-index 000000000..c97a6f7dc
+index 0000000000..c97a6f7dc3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/PlayerListComponent.java
 @@ -0,0 +1,27 @@
@@ -376,7 +376,7 @@ index 000000000..c97a6f7dc
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/ServerGUI.java b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
 new file mode 100644
-index 000000000..a779fea68
+index 0000000000..a779fea689
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
 @@ -0,0 +1,121 @@
@@ -503,7 +503,7 @@ index 000000000..a779fea68
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
 new file mode 100644
-index 000000000..b1ea91b49
+index 0000000000..b1ea91b49b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
 @@ -0,0 +1,52 @@
@@ -561,7 +561,7 @@ index 000000000..b1ea91b49
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMGraph.java b/src/main/java/net/pl3x/purpur/gui/info/RAMGraph.java
 new file mode 100644
-index 000000000..7623088ba
+index 0000000000..7623088bae
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/RAMGraph.java
 @@ -0,0 +1,179 @@
@@ -746,7 +746,7 @@ index 000000000..7623088ba
 +}
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
 new file mode 100644
-index 000000000..c4519794c
+index 0000000000..c4519794c9
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
 @@ -0,0 +1,42 @@
@@ -793,7 +793,7 @@ index 000000000..c4519794c
 +    }
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index a9bb98765..707ade70a 100644
+index a9bb987652..707ade70a4 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,7 +2,16 @@

patches/server/0097-UPnP-Port-Forwarding-Service.patch

@@ -1,4 +1,4 @@
-From 81c7a70af91041e318331cd9b6861085d7e898fe Mon Sep 17 00:00:00 2001
+From 05e998cef7295ffb4bdfbd3d237d586b17b6d187 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service
@@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service
  create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 
 diff --git a/pom.xml b/pom.xml
-index 37ff489db..c886104c5 100644
+index 37ff489db8..c886104c5d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -94,6 +94,12 @@
@@ -42,10 +42,10 @@ index 37ff489db..c886104c5 100644
  
      <pluginRepositories>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index aec6040c8..c04940d0a 100644
+index 61ccb6079e..a85df1ff49 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -231,6 +231,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -238,6 +238,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
  
@@ -78,7 +78,7 @@ index aec6040c8..c04940d0a 100644
          // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
          server.loadPlugins();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 105ac8a04..d36bac5d7 100644
+index 105ac8a040..d36bac5d74 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -181,6 +181,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -107,7 +107,7 @@ index 105ac8a04..d36bac5d7 100644
  
      public String getServerIp() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 544c68b0d..917f6503d 100644
+index 544c68b0d8..917f6503d2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -137,6 +137,11 @@ public class PurpurConfig {
@@ -123,7 +123,7 @@ index 544c68b0d..917f6503d 100644
      private static void tickLoopSettings() {
          laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
-index c4519794c..2d9d1859d 100644
+index c4519794c9..2d9d1859d9 100644
 --- a/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
 +++ b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
 @@ -11,6 +11,7 @@ public class ServerInfoPanel extends JPanel {
@@ -153,7 +153,7 @@ index c4519794c..2d9d1859d 100644
      }
 diff --git a/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 new file mode 100644
-index 000000000..af6a7e18f
+index 0000000000..af6a7e18f3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 @@ -0,0 +1,45 @@