Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a6ff84ad Revert Nibble patch, causing issues still
f1a8eb7f Use a finalizer for light packet instead of onPacketDone
03c9bb05 Optimize NibbleArray to use pooled buffers
d0a528b1 Move delayed init down later in tick, improve accuracy of startup time

current-paper

@@ -1 +1 @@
-1.15.2--2bfa820e227768fa937f45494564265a51b4c6e2
+1.15.2--71d8d9b1520d9af29fe86461f959e208dac6c9c6

patches/server/0001-Rebrand.patch

@@ -1,4 +1,4 @@
-From 83354a397f8da9106fa538b50ae6a182722db15d Mon Sep 17 00:00:00 2001
+From 3137c64676b0170b7984033742e003bee6247542 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -107,10 +107,10 @@ index cd6e25923..bb227bc0f 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b952e9efa..89afe0933 100644
+index 1a4bc9043..9c96994f2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1544,7 +1544,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1555,7 +1555,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
 
      public String getServerModName() {

patches/server/0007-Ridables.patch

@@ -1,10 +1,10 @@
-From 129bb5241948459108c22dd3c2eaa78463c9c19e Mon Sep 17 00:00:00 2001
+From 84b8fe88a684f32494286c90864dadfe9617502b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
 
 ---
- .../paper/entity/ai/MobGoalHelper.java        |   7 +
+ .../paper/entity/ai/MobGoalHelper.java        |   5 +
  .../net/minecraft/server/AxisAlignedBB.java   |   2 +
  .../server/ControllerLookDolphin.java         |   4 +-
  .../net/minecraft/server/ControllerMove.java  |   6 +-
@@ -104,7 +104,7 @@ Subject: [PATCH] Ridables
  .../pathfinder/PathfinderGoalHasRider.java    |  21 +
  .../craftbukkit/entity/CraftEntity.java       |  27 +
  src/main/resources/purpur.lang                |   4 +-
- 100 files changed, 3629 insertions(+), 213 deletions(-)
+ 100 files changed, 3627 insertions(+), 211 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -115,36 +115,21 @@ Subject: [PATCH] Ridables
  create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index d6ee94107..e8e0b3d25 100644
+index d6ee94107..0ab87b458 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -118,6 +118,13 @@ public class MobGoalHelper {
+@@ -118,6 +118,11 @@ public class MobGoalHelper {
          ignored.add("selector_1");
          ignored.add("selector_2");
          ignored.add("wrapped");
 +        // Purpur start
 +        ignored.add("horse_abstract_1");
 +        ignored.add("llama_3");
 +        ignored.add("llama_4");
-+        ignored.add("find_crystal_goal");
-+        ignored.add("orbit_crystal_goal");
 +        // Purpur end
 
          bukkitMap.put(EntityInsentient.class, Mob.class);
          bukkitMap.put(EntityAgeable.class, Ageable.class);
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index e8e0b3d2..0ab87b45 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -122,8 +122,6 @@ public class MobGoalHelper {
-         ignored.add("horse_abstract_1");
-         ignored.add("llama_3");
-         ignored.add("llama_4");
--        ignored.add("find_crystal_goal");
--        ignored.add("orbit_crystal_goal");
-         // Purpur end
-
-         bukkitMap.put(EntityInsentient.class, Mob.class);
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 index 3fdb52007..7e67292c2 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java

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

@@ -1,4 +1,4 @@
-From 30c61bc04a59a9312d587f60881a58f9703c032a Mon Sep 17 00:00:00 2001
+From 566ac634b6c6db3e101070eaef5a7e851ef4b303 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
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
  create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 018def64a..fe474e4eb 100644
+index cf5abd393..73d2b32c5 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -88,10 +88,10 @@ index 018def64a..fe474e4eb 100644
 
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 89afe0933..a8d572aa4 100644
+index 9c96994f2..6b6439493 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1351,6 +1351,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1362,6 +1362,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return true;
      }
 

patches/server/0047-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 78083ab2e5aeb0c439fbb0d8565427b7213b4524 Mon Sep 17 00:00:00 2001
+From 5f65fb06c56c7d4381ae245c2e46b4ddf1053dfa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  3 files changed, 14 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a8d572aa4..533230432 100644
+index 6b6439493..d8822c29f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -21,7 +21,7 @@ index a8d572aa4..533230432 100644
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
 
-@@ -929,6 +930,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -940,6 +941,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          recentTps[1] = tps5.getAverage();
                          recentTps[2] = tps15.getAverage();
                          // Paper end

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

@@ -1,4 +1,4 @@
-From 1701f8bd731b30777cb1513bb38f32408ecba9e3 Mon Sep 17 00:00:00 2001
+From 311e767e57053c7e13ec74b143d4fc4e115a9572 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 28 Jul 2019 01:27:37 -0500
 Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 533230432..493d9efe6 100644
+index d8822c29f..e06c0bb39 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -183,7 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -22,15 +22,15 @@ index 533230432..493d9efe6 100644
      public boolean lagging = false; // Purpur
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -845,6 +845,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -844,6 +844,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
 +    public final RollingAverage tps5s = new RollingAverage(5); // Purpur
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -922,13 +923,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -933,13 +934,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      {
                          final long diff = curTime - tickSection;
                          java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);

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

@@ -1,4 +1,4 @@
-From c6a8dc971d2342d520ab4deb98e220dcc8fa0b04 Mon Sep 17 00:00:00 2001
+From eff9e802ad2abe60b19c5ba3418bb47e0e310cd5 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
@@ -42,7 +42,7 @@ index 6ca410444..46101cdbe 100644
 
      <pluginRepositories>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fe474e4eb..18fdaf53e 100644
+index 73d2b32c5..a522ed5c3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -78,7 +78,7 @@ index fe474e4eb..18fdaf53e 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 493d9efe6..f6260c34b 100644
+index e06c0bb39..28fefa0ca 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -89,7 +89,7 @@ index 493d9efe6..f6260c34b 100644
 
      public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
          super("Server");
-@@ -738,6 +739,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -737,6 +738,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
          MinecraftTimings.stopServer(); // Paper

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

@@ -1,4 +1,4 @@
-From 9776c64707afaad5f98971260985d922230e8f1a Mon Sep 17 00:00:00 2001
+From e7ac3f7ec7a140fa09a32050abe8506dc77ee3cd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 11:47:39 -0500
 Subject: [PATCH] Configurable server mod name
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable server mod name
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f6260c34b..6e1d698af 100644
+index 28fefa0ca..142633ddb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1562,7 +1562,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1573,7 +1573,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
 
      public String getServerModName() {

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

@@ -1,4 +1,4 @@
-From 3547892fa751381762e0de55111d29cb091ff6c3 Mon Sep 17 00:00:00 2001
+From 70f0d85f03cee8323f15fec7597f1ef44c1e0e17 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable TPS Catchup
  2 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6e1d698af..902a5f98f 100644
+index 142633ddb..8aed5ff43 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -965,6 +965,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -976,6 +976,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      this.methodProfiler.exitEnter("nextTickWait");
                      this.ac = true;
                      this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);

patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch

@@ -1,4 +1,4 @@
-From d7a4327da2fedcd01c616bb9789e4483dd67c3de Mon Sep 17 00:00:00 2001
+From bdbadad11796ee8102d30ca98c237914c56dd2a8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Fri, 3 Apr 2020 02:21:13 -0700
 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server
@@ -12,10 +12,10 @@ chunks.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 902a5f98f..23f2da8a8 100644
+index 8aed5ff43..606e8dd97 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1091,7 +1091,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1102,7 +1102,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
 
      protected boolean canExecute(TickTask ticktask) {

patches/server/0124-YAPFA-Disable-mojang-profiler.patch

@@ -1,4 +1,4 @@
-From e4e02cb7f8becda34ad53bfcf03a4ce98613a84a Mon Sep 17 00:00:00 2001
+From 0ddd9826204572dc1bec0941dda0dcaaa41af7be Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 23:08:01 +0100
 Subject: [PATCH] YAPFA - Disable mojang profiler
@@ -43,7 +43,7 @@ index f0d72ea39..e38a68406 100644
              throw CommandDebug.b.create();
          } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 23f2da8a8..a1905366f 100644
+index 606e8dd97..616dcbf7f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -55,7 +55,7 @@ index 23f2da8a8..a1905366f 100644
      private ServerConnection serverConnection;
      public final WorldLoadListenerFactory worldLoadListenerFactory;
      private final ServerPing serverPing = new ServerPing();
-@@ -1445,6 +1445,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1456,6 +1456,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              String s1 = (String) Optional.ofNullable(optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              final DedicatedServer dedicatedserver = new DedicatedServer(optionset, dedicatedserversettings, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new, s1);
 
@@ -64,7 +64,7 @@ index 23f2da8a8..a1905366f 100644
              /*
              dedicatedserver.i((String) optionset.valueOf(optionspec7));
              dedicatedserver.setPort((Integer) optionset.valueOf(optionspec10));
-@@ -1870,6 +1872,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1881,6 +1883,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
 
      public abstract boolean a(EnumGamemode enumgamemode, boolean flag, int i);