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

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:
988e550 Updated Upstream (Paper)

Purpur Changes:
ea7a301 Fix lag
424607f Updated Upstream (Paper)

Purpur

@@ -1 +1 @@
-Subproject commit 32b7926e7092c24b6ed04f0f88d31cc96bded508
+Subproject commit ea7a301947a7256c52f99696a29c78fb7997004c

Tuinity

@@ -1 +1 @@
-Subproject commit 84aecdb8b07d83495c4589e992d2114673ce5877
+Subproject commit 988e5501fb06ada7fd9dad5bf813d3578c072988

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

@@ -1288,7 +1288,7 @@ index 2ae4a20ca763c60c9661661d2ae558bd5b6f79a1..00000000000000000000000000000000
 -                             IChunkAccess ichunkaccess = iworldreader.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS, !(iworldreader instanceof World) || !((World) iworldreader).origamiConfig.onlyFindGeneratedFeatures);
 -                             if (ichunkaccess == null) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c0815269be89c2b9d316ccaf8ccfa15beec98cc4..b06264b2315d7fed50946050445117c8aa930b3c 100644
+index 13aa1a10f3cbcceb4f05d407d4b6d36f5e8a06a0..b365596205f97efef2d1eac70df18401910c22d7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -96,6 +96,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0015-lithium-MixinLandPathNodeMaker.patch

@@ -7,7 +7,7 @@ Original code by JellySquid, licensed under GNU Lesser General Public License v3
 you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index 9caf6598f8a267ce057e863a32ee29fa5fdb0641..56da391b4d415630b881cccbaa50507eb2c23cc0 100644
+index 7341b5afd31eb771b3a7dc883d6540f575d37b4b..c58a9f26175582062ce3a0a38656778f910ae270 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -7,9 +7,15 @@ import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
@@ -40,13 +40,13 @@ index 9caf6598f8a267ce057e863a32ee29fa5fdb0641..56da391b4d415630b881cccbaa50507e
 +        if (type == null) {
 +            commonTypes.put(iblockdata, type = getPathType(iblockdata));
 +        }
- 
++
 +        if (type == PathType.OPEN) {
 +            if (!iblockdata.a(iblockaccess, blockposition, PathMode.LAND)) {
 +                return PathType.BLOCKED;
 +            }
 +        }
-+
+ 
 +        /*
          if (iblockdata.isAir()) {
              return PathType.OPEN;

patches/server/0021-Optimize-TileEntity-load-unload.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize TileEntity load/unload
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b06264b2315d7fed50946050445117c8aa930b3c..1b08df02c18230bffb37a945944073fff22b16c9 100644
+index b365596205f97efef2d1eac70df18401910c22d7..b356686a963e6f5367f39735967b1fb43ad075dc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -42,9 +42,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0034-lithium-collision-optimizations.patch

@@ -1029,7 +1029,7 @@ index 882b82d8952d34f6e3c639404d1a1521dedf1bb0..ccf1416000354b78ccef78b072062ce0
  
      default EntityHuman findNearbyPlayer(Entity entity, double d0, @Nullable Predicate<Entity> predicate) { return this.findNearbyPlayer(entity.locX(), entity.locY(), entity.locZ(), d0, predicate); } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e94d99f2284aec0e0c374a880122ff7d30f9c2be..6c8cb39ac8786734cda994ef29ba74c685f3b9be 100644
+index 1f7a8694f69345288c53df0f3a1845f2721f6c7b..2c5c224e90f85d0c5a99daf4fcf5a49d5abcc299 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1334,11 +1334,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

patches/server/0036-lithium-MixinChunkSection.patch

@@ -7,18 +7,18 @@ Original code by JellySquid, licensed under LGPLv3
 you can find the original code on https://github.com/jellysquid3/lithium-fabric/ (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 100afe2000c981c6837b98436bd53add96e17a29..fb083996c10f553d7eff629a815b11eb7f0bf42c 100644
+index 00bf3ceae4f341277c6442d8555537d9a6066bcd..344b23dfe54df6dee5e2d6bf1bbbe4a9d1da87c4 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
-@@ -345,6 +345,8 @@ public abstract class BlockBase {
+@@ -350,6 +350,8 @@ public abstract class BlockBase {
          }
          // Tuinity end
  
 +        public final boolean shapeExceedsCubeUncached() { return this.a == null || this.a.c; } // Yatopia - uncached shapeExceedsCube due to collisions stuff
 +
-         // Tuinity start
-         protected boolean isTicking;
-         protected Fluid fluid;
+         public void a() {
+             this.fluid = this.getBlock().d(this.p()); // Paper - moved from getFluid()
+             this.isTicking = this.getBlock().isTicking(this.p()); // Paper - moved from isTicking()
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
 index cebd808e273dbdb88feb16920dd7a2f60390b34f..d210ac3d5775491e9beb885dde608f5e8fda8eb2 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java

patches/server/0038-Nuke-streams-off-BlockPosition.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Nuke streams off BlockPosition
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index fb083996c10f553d7eff629a815b11eb7f0bf42c..17c8e5fe9e3e18244bbcf479267289dce01f9615 100644
+index 344b23dfe54df6dee5e2d6bf1bbbe4a9d1da87c4..9f1acd52c7d16dfc00cf2d361295f72f764bc7ac 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -637,6 +637,7 @@ public abstract class BlockBase {

patches/server/0044-Respect-PlayerKickEvent-leaveMessage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Respect PlayerKickEvent leaveMessage
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7f551ad4b80c092b3cb22f040dcf9a40ec5b03e9..f4a2bae611806aa861b4f12b7f42c3117d528d95 100644
+index 14e4d7388b2920be72e5c8e7bbf891fec22d74e8..0af1106b6d616edc898731a05e92a409c0a53323 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -308,7 +308,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0058-Configurable-flight-checks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flight checks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f4a2bae611806aa861b4f12b7f42c3117d528d95..b690fcdd1fdfa1cc2c34961ae8f6c533a4e8da02 100644
+index 0af1106b6d616edc898731a05e92a409c0a53323..9aae647587935ff1b9fc5e3987af77d0efcf4768 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -166,7 +166,7 @@ public class PlayerConnection implements PacketListenerPlayIn {