Update to 1.16.5

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

@@ -425,7 +425,7 @@ This patch also prevents the saving/unloading of POI data when
 world saving is disabled.
 
 diff --git a/pom.xml b/pom.xml
-index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78ee27f3cee 100644
+index 9ba379b7e3ee3bc8c6d2c8ec46213c404c73d682..e83e4241a56fe131a75fe21cc1518992c089da2c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -435,7 +435,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
 -    <artifactId>paper</artifactId>
 +    <artifactId>tuinity</artifactId>
      <packaging>jar</packaging>
-     <version>1.16.4-R0.1-SNAPSHOT</version>
+     <version>1.16.5-R0.1-SNAPSHOT</version>
 -    <name>Paper</name>
 -    <url>https://papermc.io</url>
 +    <name>Tuinity-Server</name>
@@ -443,7 +443,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
  
      <properties>
          <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-@@ -18,16 +18,16 @@
+@@ -19,16 +19,16 @@
      </properties>
  
      <parent>
@@ -464,7 +464,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -37,6 +37,13 @@
+@@ -38,6 +38,13 @@
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -478,7 +478,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
          <dependency>
              <groupId>io.papermc</groupId>
              <artifactId>minecraft-server</artifactId>
-@@ -97,11 +104,7 @@
+@@ -105,11 +112,7 @@
              <artifactId>cleaner</artifactId>
              <version>1.0-SNAPSHOT</version>
          </dependency>
@@ -491,7 +491,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
          <!-- deprecated API depend -->
          <dependency>
              <groupId>com.googlecode.json-simple</groupId>
-@@ -141,6 +144,13 @@
+@@ -149,6 +152,13 @@
              <version>4.8.47</version>
              <scope>test</scope>
          </dependency>
@@ -505,7 +505,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
      </dependencies>
  
      <repositories>
-@@ -165,15 +175,15 @@
+@@ -173,15 +183,15 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -9634,7 +9634,7 @@ index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 36fbe16e6f06fca3eb282cce5b8c5fcc87a0166d..259ee6dd50c0782b1d137cadba878e7c209f3329 100644
+index f9d7419e376268b00db2eb98a3db4116bdb72bd8..a125489d6a3b202d7e2b3d7df26fd72b81f2bd98 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -10030,7 +10030,7 @@ index 36fbe16e6f06fca3eb282cce5b8c5fcc87a0166d..259ee6dd50c0782b1d137cadba878e7c
      }
  
 @@ -2849,7 +3092,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             this.cp().forEach((entity) -> {
+             this.recursiveStream().forEach((entity) -> {
                  worldserver.chunkCheck(entity);
                  entity.az = true;
 -                Iterator iterator = entity.passengers.iterator();
@@ -10079,7 +10079,7 @@ index 957a351c3f6c4f66d7af6657ab0c3cbeed94662f..57166a543a9af9e10e38c983487fac7e
              this.setPersistent();
          }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 6d716214e756fe1326cd3d2becea969076f6fd5b..fb1d640d89258477dd1286fff929deecffb69d9e 100644
+index eb5c3a1f0d9ff665631caf5bf579e83d1ed25e4f..7582a3a0955db2bc79daeced8e9c869f4276815a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -710,7 +710,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -10111,7 +10111,7 @@ index f41aaa7623c052b9f4044898d1bdee898c03057a..d99cecc4075338d7b8f154ab94d8ac04
              x = MathHelper.floorLong(x * 4096.0D) * (1 / 4096.0D);
              y = MathHelper.floorLong(y * 4096.0D) * (1 / 4096.0D);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c8cdce899b109a7f554fec7aaa8235df4224cd1d..1c396ec56f35d8764e3bf7b67a7984393eb94b3b 100644
+index d417878a1584c9e5ec33b94fc65b29f84fb3a5e9..4fe5a8d0201d662c68dd58eeb8cf1d304787edb4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2858,7 +2858,11 @@ public abstract class EntityLiving extends Entity {
@@ -10138,7 +10138,7 @@ index c8cdce899b109a7f554fec7aaa8235df4224cd1d..1c396ec56f35d8764e3bf7b67a798439
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7240b885d96eb2df187b6229449af1a893a4524e..40f56858143651bb0addd0b74db7388ecbe56521 100644
+index 04d505c7a19775d0353c10424a84a1ce8885dc2c..9f5b7243ccbe0729a061345c25033d9145b91b3f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -527,6 +527,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -10340,7 +10340,7 @@ index 4efc40c01ec12b80bd7cf9d35cf0ea0df973baf7..f322dccd834ff56b99f8796309709b5b
  
          if (!list.equals(this.p)) {
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 36aafc3b71013bcec0f4d956761fc2710848b3fd..c9963c19892c3e408964b72983bc6e26f8b63b67 100644
+index 1aa070db60f5473576fb5d056cadde5106766489..24e6f3141ff4434f770e956a8d240bf856442933 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -160,8 +160,8 @@ public enum EnumDirection implements INamable {
@@ -11113,7 +11113,7 @@ index ff74be14512a947e81b62d53e616131ca7d7f609..e79e773f2219f9a9ae076fcbc8108b79
      public static <T> void mergeSortedSets(final java.util.function.Consumer<T> consumer, final java.util.Comparator<? super T> comparator, final java.util.SortedSet<T>...sets) {
          final ObjectRBTreeSet<T> all = new ObjectRBTreeSet<>(comparator);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c3fb69b18bf66ac8532196d953d9729ffb394721..28c1995e37cb134979b953028844fd5567aa9d00 100644
+index 8c384171ca56a0989ffef1813ad0a9ee3ea31d29..45e310e249a83714d0001d85b2ead8d4f8a2d742 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -151,6 +151,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -14779,7 +14779,7 @@ index 0b40c2f4dada7d8432e3f91e9cf206c2bda3b24b..6eaf9fc9cc93f79a497b07a3549d459b
      private int c;
      private final Runnable d;
 diff --git a/src/main/java/net/minecraft/server/VillagePlaceSection.java b/src/main/java/net/minecraft/server/VillagePlaceSection.java
-index 77c66bc9952542d2444b402896a3d9f622ca2ff9..f43bc1f7d693d63c6bbdba976c048d2d0c8767b1 100644
+index b86963aa34b5ae479f924c5a52afc5b5b66dba76..943a437ff27162eae09211c28bdc0d141fa6a404 100644
 --- a/src/main/java/net/minecraft/server/VillagePlaceSection.java
 +++ b/src/main/java/net/minecraft/server/VillagePlaceSection.java
 @@ -23,12 +23,12 @@ public class VillagePlaceSection {
@@ -15542,7 +15542,7 @@ index f011869880fedae4b69e505491e8bdbc5f51dfba..0d10d317cd0b60fc0866ae505c7fd71f
          return this.j.d();
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 136fe0d65bf6356d84be1b962383c8630e990d89..1774beea5a06214368f5df7be872bb830711568e 100644
+index fbe7f43f6c1010e7a34114f8afb0e64934744335..6ff5ef6b710652f1c4fe6461ff230ee78988f623 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,12 +55,13 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -16432,7 +16432,7 @@ index dc7de2b59ec5ca3e5fba34dbb2aa2e6aed8f95cb..a383ba5e897101a3da1544c877148b43
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0314cb1270803265dc4bf4268697b09aabf2c612..8904b39db2203118fe3589133cb7e64334c20f33 100644
+index d86c25593db7cc0a73db1c37af94ae4e41bb4e93..f34e1570052eac83fb3e03b3e361d8d4f451abac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -341,6 +341,14 @@ public class CraftWorld implements World {