Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
55e2de5c6 Improve per player mob spawning (#3971)
42433c262 Updated Upstream (Bukkit/CraftBukkit) (#3980)
e5ede546a Fix IDE Debug JVM Flag for 1.16 (#3983)
2712c6888 [Auto] Updated Upstream (Bukkit/CraftBukkit)
0901ffd04 Use title packet for actionbar methods (#3959)
2e11235d1 Expand MaterialTags (#3964)
cc25ae47c Amend last commit to fix decompile error forgot to commit
f503db37c Fix AdvancementDataPlayer leak due from quitting early in login
282763b88 Fix SPIGOT-5885 Unable to disable advancements
9b93d122e Fix SPIGOT-5824 Bukkit world-container is not used
bede4d304 Load config files early on

Tuinity Changes:
b0673b3 Merge dev/optimise-notify into ver/1.16
d3dc35c Name craft scheduler threads according to the plugin using them

patches/api/0001-Tuinity-API-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Tuinity API Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 15ce1c66462351d6d1ba55c111db13ef1c9f0789..63dfd1c647fd4d3b9b9924627d766c095d286f14 100644
+index cb37aea9d..4004ff5d3 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -34,10 +34,10 @@ index 15ce1c66462351d6d1ba55c111db13ef1c9f0789..63dfd1c647fd4d3b9b9924627d766c09
  
      <properties>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0653e0ffe96748dc971ec7e8027f8159696adf62..65a40c4a9b24fa607d284e203becba034520b75d 100644
+index 6e01bf2d5..46c4d98ce 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1438,6 +1438,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1447,6 +1447,14 @@ public interface Server extends PluginMessageRecipient {
          }
          // Paper end
  

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 65a40c4a9..9d18c3d3b 100644
+index 46c4d98ce..49dd5974d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1446,6 +1446,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1455,6 +1455,18 @@ public interface Server extends PluginMessageRecipient {
          }
          // Tuinity end - add config to timings report
  

patches/api/0009-AFK-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] AFK API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 new file mode 100644
-index 00000000..0c8b3e5e
+index 000000000..0c8b3e5e4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -81,10 +81,10 @@ index 00000000..0c8b3e5e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2eb31213..2dca16ac 100644
+index b584f8b15..9dbfe3614 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1870,4 +1870,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1877,4 +1877,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4e92ce182..40c8de479 100644
+index 62cc1c74c..9abb3ba7f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1765,4 +1765,15 @@ public final class Bukkit {
+@@ -1776,4 +1776,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index 4e92ce182..40c8de479 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9d18c3d3b..e21ce51d5 100644
+index 49dd5974d..1f44ee201 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1558,4 +1558,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1567,4 +1567,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
      // Paper end

patches/api/0014-Lagging-threshold.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 40c8de479..be99ddd5e 100644
+index 9abb3ba7f..60746ff04 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1775,5 +1775,14 @@ public final class Bukkit {
+@@ -1786,5 +1786,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index 40c8de479..be99ddd5e 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e21ce51d5..cde8376e2 100644
+index 1f44ee201..1b743968b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1566,5 +1566,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1575,5 +1575,12 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      String getServerName();

patches/api/0025-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2dca16ac..55edcd54 100644
+index 9dbfe3614..1dfe55402 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1890,5 +1890,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1897,5 +1897,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();