Updated Upstream and Sidestream(s) (Tuinity/EMC/Purpur/AirplaneLite)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
cf37529 Updated Upstream (Paper)

EMC Changes:
27282006 Updated Paper
456edfa4 One more try to fix more chunks on reload

Purpur Changes:
45d5e9a Fix dolphin spit and phantom flames
9e1b8e7 Clean up teleport outside border patch Add sleeping, inventory, and toWorld checks
8428580 [ci-skip] Add 'fast' argument to './purpur jar' to speed up jenkins build time
cea486c Updated Upstream (Paper)
6cd244c Fix infinite furnaces triggering without lava source
a989361 Fix infinite furnaces leaving empty buckets
6cf1672 Add config option for whether Nether Wart farming Villagers should throw extra Nether Warts at other Villagers
07d4056 Add toggle for Zombified Piglin death always counting as a player kill when angry (Zombified Piglin XP farm nerf option)
9935466 Add config option for Cleric Villagers to farm Nether Wart
47a1707 fix typos
6e42ce8 Updated Upstream (Paper)
740b7d2 [ci-skip] Update readme with downloads API info

AirplaneLite Changes:
5526dde Add download link to readme

AirplaneLite

@@ -1 +1 @@
-Subproject commit fd35d6a7f218d33c6792d92f52f09f13e1d7d920
+Subproject commit 5526dde6440a78c288bf95f8b02abddbe539cc1b

Empirecraft

@@ -1 +1 @@
-Subproject commit 90b678eaa1e29ca6c1de226b0278e533ad9aa4f8
+Subproject commit 2728200668347a630d82cd374ed343fdf7a36fef

PATCHES.md

@@ -101,7 +101,6 @@ # Patches
 | server |  PaperPR - Add hex color code support for console logging      | Esophose |  |
 | server |  PaperPR - Projectile load/save limit per chunk      | jmp |  |
 | server |  PaperPR: Fix harming potion dupe      | PepperCode1 |  |
-| server |  PaperPR: Fix merging spawning values      | Mariell Hoversholm |  |
 | server |  Per entity (type) collision settings      | MrIvanPlays | tr7zw |
 | server |  Persistent TileEntity Lore and DisplayName      | jmp |  |
 | api |  PlayerAttackEntityEvent      | Ivan Pekov |  |

Purpur

@@ -1 +1 @@
-Subproject commit 439b8956d82164a1d9b9c6e1af8f7d45dee863b9
+Subproject commit 45d5e9a37551b206acd21e4691bb7dd42ccb4d0c

Tuinity

@@ -1 +1 @@
-Subproject commit 33345cbe9b5a42924ec09ed605f0dd5dcbb0e1be
+Subproject commit cf375294cef8fb5094d9c27947416e2414e45569

patches/server/0001-Yatopia-Server-Fixes.patch

@@ -776,7 +776,7 @@ index ad57dcdf457379d3282e710874808a6cebd3c17f..00000000000000000000000000000000
 -     public boolean armorstandFixNametags = false;
 -     public float armorstandStepHeight = 0.0F;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1ed00fb04c8c8b5a823894a4c3df8f2eca4dd5ad..6c7eabe57ade13d9ac2a2bbfc406fcf73553bd78 100644
+index efc702955a4ef74b6a197d4c0afee1d260356ceb..2f72612371dbdf57f1cffec98b063fb54ef09c33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -858,6 +858,7 @@ public final class CraftServer implements Server {
@@ -795,7 +795,7 @@ index 1ed00fb04c8c8b5a823894a4c3df8f2eca4dd5ad..6c7eabe57ade13d9ac2a2bbfc406fcf7
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -2301,6 +2303,13 @@ public final class CraftServer implements Server {
+@@ -2304,6 +2306,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
  
@@ -809,7 +809,7 @@ index 1ed00fb04c8c8b5a823894a4c3df8f2eca4dd5ad..6c7eabe57ade13d9ac2a2bbfc406fcf7
          @Override
          public void restart() {
              org.spigotmc.RestartCommand.restart();
-@@ -2438,4 +2447,11 @@ public final class CraftServer implements Server {
+@@ -2441,4 +2450,11 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end
@@ -823,12 +823,12 @@ index 1ed00fb04c8c8b5a823894a4c3df8f2eca4dd5ad..6c7eabe57ade13d9ac2a2bbfc406fcf7
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej b/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej
 deleted file mode 100644
-index 1f7601aede1b8460f48ebaae18b9c5b68bc044c8..0000000000000000000000000000000000000000
+index c04d171160438c5d00e5e40c76009ebab7ff6d3b..0000000000000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej
 +++ /dev/null
 @@ -1,12 +0,0 @@
 -diff a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java	(rejected hunks)
--@@ -2443,5 +2443,10 @@ public final class CraftServer implements Server {
+-@@ -2446,5 +2446,10 @@ public final class CraftServer implements Server {
 -     public String getServerName() {
 -         return getProperties().serverName;
 -     }

patches/server/0003-Brandings.patch

@@ -39,7 +39,7 @@ index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c
                  .completer(new ConsoleCommandCompleter(this.server))
          );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7f986ca43e3e7dafc0c5a0e8c83a02c9172a0932..0731462182d388ee30b8a286502f1234a9bd6844 100644
+index 3c4c2cb46151c2d97a534fcd77ddc0b5fab7066c..58cc0832ab17947fdf3089fae98f8e4f173763e7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1521,7 +1521,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,7 +52,7 @@ index 7f986ca43e3e7dafc0c5a0e8c83a02c9172a0932..0731462182d388ee30b8a286502f1234
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c7eabe57ade13d9ac2a2bbfc406fcf73553bd78..cd3908b407df34f7cc0861abc3d47d00be6a066f 100644
+index 2f72612371dbdf57f1cffec98b063fb54ef09c33..181606d22adda556f3267ee7e7c69723c36ba909 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0006-Add-last-tick-time-API.patch

@@ -7,10 +7,10 @@ Original patch by:
 Co-authored-by: tr7zw <tr7zw@live.de>
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0731462182d388ee30b8a286502f1234a9bd6844..9cf7d3b1371e8c05b52248acddb0e84f266a4618 100644
+index 58cc0832ab17947fdf3089fae98f8e4f173763e7..9571184a9846490e9d707968506d0e96526e9bd5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -932,6 +932,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -933,6 +933,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      // Paper End
      // Spigot End
  
@@ -30,10 +30,10 @@ index 0731462182d388ee30b8a286502f1234a9bd6844..9cf7d3b1371e8c05b52248acddb0e84f
                      this.X = true;
                      this.W = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cd3908b407df34f7cc0861abc3d47d00be6a066f..6b2517256ed22c7dcf942e6974e1ad13debf1da4 100644
+index 181606d22adda556f3267ee7e7c69723c36ba909..2488350c60adbc2e00d6878787750951ac965026 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2454,4 +2454,6 @@ public final class CraftServer implements Server {
+@@ -2457,4 +2457,6 @@ public final class CraftServer implements Server {
          return getServer().lagging;
      }
      // Purpur end

patches/server/0007-Yatopia-configuration.patch

@@ -80,7 +80,7 @@ index 9c330ee370f120eb2d498430d799bfaf9eabdc49..b679a6ee7ee2fb00293fb02b3537eddf
          playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.abilities));
          playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6b2517256ed22c7dcf942e6974e1ad13debf1da4..b4c58c8a3fd124931bdbf1f732dfc40aaae691ea 100644
+index 2488350c60adbc2e00d6878787750951ac965026..cd5b90099d60cbf84f3e4763a8f38088a0442d64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -859,6 +859,7 @@ public final class CraftServer implements Server {
@@ -91,7 +91,7 @@ index 6b2517256ed22c7dcf942e6974e1ad13debf1da4..b4c58c8a3fd124931bdbf1f732dfc40a
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -2310,6 +2311,13 @@ public final class CraftServer implements Server {
+@@ -2313,6 +2314,13 @@ public final class CraftServer implements Server {
          }
          // Origami end
  

patches/server/0041-Optimize-whitelist-command-for-multiple-additions-re.patch

@@ -185,7 +185,7 @@ index 0224a6d0e47e836fa485b39e7b4ce5b83ea554bf..fe578d306575bbdc8ca4a993a648e889
          return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9cf7d3b1371e8c05b52248acddb0e84f266a4618..727c0eb502083258537b703531d7e1931cfa43b9 100644
+index 9571184a9846490e9d707968506d0e96526e9bd5..e52b0a579a764579b0fecb23e5caed0411ceca47 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1966,6 +1966,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0046-PaperPR-Fix-merging-spawning-values.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Mon, 28 Sep 2020 16:25:34 +0300
-Subject: [PATCH] PaperPR: Fix merging spawning values
-
-This patch is licensed under bukkit's original license, GPLv3
-
-diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 6c15409982fd8005fede7c56c1ca74db5993d548..5e8c57aa026f5be735b0316da450b919692385f6 100644
---- a/src/main/java/net/minecraft/server/SpawnerCreature.java
-+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
-@@ -157,9 +157,12 @@ public final class SpawnerCreature {
-                     spawnercreature_d.a(entityinsentient, ichunkaccess);
-                 },
-                 difference, worldserver.paperConfig.perPlayerMobSpawns ? worldserver.getChunkProvider().playerChunkMap::updatePlayerMobTypeMap : null);
--                spawnercreature_d.getEntityCountsByType().mergeInt(enumcreaturetype, spawnCount, (keyInMap, valueInMap) -> {
--                    return Integer.valueOf(spawnCount + valueInMap.intValue());
--                });
-+                // Yatopia start - fix this
-+                //spawnercreature_d.getEntityCountsByType().mergeInt(enumcreaturetype, spawnCount, (keyInMap, valueInMap) -> {
-+                //    return Integer.valueOf(spawnCount + valueInMap.intValue());
-+                //});
-+                spawnercreature_d.getEntityCountsByType().mergeInt(enumcreaturetype, spawnCount, Integer::sum);
-+                // Yatopia end
-                 // Paper end - per player mob spawning
-             }
-         }

patches/server/0047-Add-nspt-command.patch

@@ -17,7 +17,7 @@ index 21999986018b93315eea54d0c5f3bff6b7e417f7..d8c1add8d1281d40a7aa13810ed425cc
          de.minebench.origami.OrigamiConfig.init((java.io.File) options.valueOf("origami-settings"));
          this.setPVP(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b4c58c8a3fd124931bdbf1f732dfc40aaae691ea..8bf63976035d563a1ac5092adb4e0705a2c04c6e 100644
+index cd5b90099d60cbf84f3e4763a8f38088a0442d64..0ca0e6728aad9ccbfc6b4844f9bd1c69e3f77b26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -916,6 +916,7 @@ public final class CraftServer implements Server {

patches/server/0059-Configurable-BlockPhysicsEvent.patch

@@ -8,7 +8,7 @@ Paper does alleviate this quite well by only firing if plugins are listening, bu
 This patch implements a hard toggle for the event.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 727c0eb502083258537b703531d7e1931cfa43b9..4c64bdd181e531adb5f4662a5af7aaa2162fb164 100644
+index e52b0a579a764579b0fecb23e5caed0411ceca47..10e7c78a6573dea1c7336a0439c5a25e52c0034d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1409,7 +1409,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0063-Use-faster-random-implementation.patch

@@ -145,10 +145,10 @@ index 9190caed195b9987e3af545f4de63b8d956788a6..178386cfb44152b50757234a624afef0
      private final MinecraftServer server;
      public final NetworkManager networkManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4c64bdd181e531adb5f4662a5af7aaa2162fb164..ed1b32c3cb907fe30a32becb5ae937fb15d1a56e 100644
+index 10e7c78a6573dea1c7336a0439c5a25e52c0034d..09eebe9d04e2783b750aa65af2a29d0e5c7f8cc6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -196,7 +196,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -197,7 +197,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.m = new GameProfilerSwitcher(SystemUtils.a, this::ai);
          this.methodProfiler = GameProfilerDisabled.a;
          this.serverPing = new ServerPing();