Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane/Empirecraft)

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.

Paper Changes:
c64958508 fix: wrong return in javadocs for bookmeta (#5579)
3dbb8926e Fix PotionSplashEvent for water splash potions (#5697)
b759d006e Adds per-world spawn limits (#4837)
81de619d3 Updated Upstream (CraftBukkit) (#5786)
5e3604f1b Better fix for invulnerable crystals and improve Origin API (#5761)
d5fe9c817 Updated Upstream (CraftBukkit) (#5784)
d20e5b195 Fix timings sometimes incorrectly marking commands (#5783)

Tuinity Changes:
df76b3c Updated Upstream (Paper)

Airplane Changes:
a13c511 Simple item block collision toggle
3cd9d1c Updated Upstream (Tuinity)

Empirecraft Changes:
c7ef1a7a Updated Paper

PATCHES.md

@@ -136,7 +136,6 @@ # Patches
 | server |  Option for simpler Villagers      | tr7zw |  |
 | server |  Origami Server Config      | Phoenix616 |  |
 | server |  Patch Paper to use fast item merge raytracing      | Paul Sauve |  |
-| server |  Per World Spawn Limits      | Chase Whipple |  |
 | server |  Per entity (type) collision settings      | MrIvanPlays | tr7zw |
 | api |  Per player viewdistances      | Spottedleaf |  |
 | api |  PlayerAttackEntityEvent      | Ivan Pekov |  |
@@ -168,6 +167,7 @@ # Patches
 | server |  Send full pos packets for hard colliding entities      | Spottedleaf |  |
 | server |  Separate lookup locking from state access in UserCache      | Spottedleaf |  |
 | server |  Shutdown Bootstrap thread pool      | foss-mc |  |
+| server |  Simple item block collision toggle      | Paul Sauve |  |
 | server |  Simpler ShapelessRecipes comparison for Vanilla      | Paul Sauve |  |
 | server |  Skip POI finding if stuck in vehicle      | Paul Sauve |  |
 | server |  Skip copying unloading tile entities      | Paul Sauve |  |

Paper

@@ -1 +1 @@
-Subproject commit 0daded2f25184b45fcc0be6ea86b63492df96024
+Subproject commit c6495850826bcd797b9d0e21d1a4349117fa6868

patches/Airplane/patches/server/0004-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch

@@ -55,7 +55,7 @@ index cc566784c7dd21cc2c44e0f351347f657e57ddcf..e9e7fcf2b63febe2a7d055826fabb86b
          return d0 == 0.0D ? 0 : (d0 > 0.0D ? 1 : -1);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 2ff3297fb8c0e4f8c969ba2727eecb7fe06525c4..cfd2b2607be0d30ece36d1dd51178fb667018dcc 100644
+index 2ff3297fb8c0e4f8c969ba2727eecb7fe06525c4..56812a96b57586d91c0f218f4720807e2d957627 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -111,6 +111,7 @@ import net.minecraft.world.phys.AxisAlignedBB;
@@ -66,12 +66,15 @@ index 2ff3297fb8c0e4f8c969ba2727eecb7fe06525c4..cfd2b2607be0d30ece36d1dd51178fb6
  import net.minecraft.world.scores.ScoreboardTeam;
  import org.apache.logging.log4j.Logger;
  
-@@ -3102,7 +3103,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3102,7 +3103,10 @@ public abstract class EntityLiving extends Entity {
          Vec3D vec3d1 = new Vec3D(entity.locX(), entity.getHeadY(), entity.locZ());
  
          // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
 -        return this.world.rayTrace(new RayTrace(vec3d, vec3d1, RayTrace.BlockCollisionOption.COLLIDER, RayTrace.FluidCollisionOption.NONE, this)).getType() == MovingObjectPosition.EnumMovingObjectType.MISS;
-+        return this.world.rayTraceDirect(vec3d, vec3d1, VoxelShapeCollision.a(this)) == MovingObjectPosition.EnumMovingObjectType.MISS; // Airplane - use direct method
++        // Airplane start - use direct method
++        //return this.world.rayTrace(new RayTrace(vec3d, vec3d1, RayTrace.BlockCollisionOption.COLLIDER, RayTrace.FluidCollisionOption.NONE, this)).getType() == MovingObjectPosition.EnumMovingObjectType.MISS;
++        return this.world.rayTraceDirect(vec3d, vec3d1, VoxelShapeCollision.a(this)) == MovingObjectPosition.EnumMovingObjectType.MISS;
++        // Airplane end
      }
  
      @Override

patches/Airplane/patches/server/0010-Don-t-get-entity-equipment-if-not-needed.patch

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index cfd2b2607be0d30ece36d1dd51178fb667018dcc..c782a51340cdcae3837d1ab7563c45a075310317 100644
+index 56812a96b57586d91c0f218f4720807e2d957627..6b82dffa3d0938a94114ead277b42c71ea3bb52b 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -910,11 +910,13 @@ public abstract class EntityLiving extends Entity {

patches/Airplane/patches/server/0011-Dynamic-activation-range.patch

@@ -69,7 +69,7 @@ index ab019b577002677a4ce788106f8e5a1d7757a2ae..5077e70e4f408814b1072ceb45c52a32
 +
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dc562eecac56c6e71c7ad0293507879ca6b04586..e921602fd4f7a86b38c4d09d9cedf5074f1a8508 100644
+index 89852779fd9cfd19058afe40feb0cf14ca8d2896..5fb3f2968f20e78d76382bec52c9236add4fc060 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -289,6 +289,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

patches/Airplane/patches/server/0024-Skip-creating-hashset-for-entity-track-range.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Skip creating hashset for entity track range
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e921602fd4f7a86b38c4d09d9cedf5074f1a8508..9f2079b88c5e93a73ccb9c3c9ccbce5960241924 100644
+index 5fb3f2968f20e78d76382bec52c9236add4fc060..7ddbc56eb2ea8491cd32987843801e9bee9dbe0b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -319,10 +319,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

patches/Airplane/patches/server/0025-Cache-climbing-check-for-activation.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache climbing check for activation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index c782a51340cdcae3837d1ab7563c45a075310317..e5372dfc25f99c63a66acdf085d6ae2a7c2102fa 100644
+index 6b82dffa3d0938a94114ead277b42c71ea3bb52b..88fc16e49076cf5589e27660a388909291447fac 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1745,6 +1745,19 @@ public abstract class EntityLiving extends Entity {

patches/Airplane/patches/server/0036-Simple-item-block-collision-toggle.patch

@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paul Sauve <paul@technove.co>
+Date: Sun, 6 Jun 2021 17:13:03 -0500
+Subject: [PATCH] Simple item block collision toggle
+
+
+diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java
+index 6fc23a85ddd66a69b83684cdb602b6a312e9d72b..e234e2944f9f764f8110c473997d438a9dc66146 100644
+--- a/src/main/java/gg/airplane/AirplaneConfig.java
++++ b/src/main/java/gg/airplane/AirplaneConfig.java
+@@ -113,11 +113,16 @@ public class AirplaneConfig {
+ 
+ 
+     public static boolean disableMethodProfiler;
++    public static boolean simplerItemCollision;
+ 
+     private static void miscSettings() {
+         config.setComment("misc", "Settings for things that don't belong elsewhere");
+ 
+         disableMethodProfiler = config.getBoolean("misc.disable-method-profiler", true);
++        simplerItemCollision = config.getBoolean("misc.simpler-item-collision", false,
++          "When an item is inside a block, it gets pushed up.",
++          "This option when true makes the check simpler,",
++          "ignoring entities and complex collisions like pistons.");
+     }
+ 
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+index e1581f0616748da885f457c7fa0f1515490c53f4..cb5c4379bfd16a74debaf23f840dbf1e5535ad7f 100644
+--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
++++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+@@ -110,6 +110,12 @@ public class EntityItem extends Entity {
+             if (this.world.isClientSide) {
+                 this.noclip = false;
+             } else {
++                // Airplane start - simpler solid block check
++                if (gg.airplane.AirplaneConfig.simplerItemCollision) {
++                    net.minecraft.world.level.block.state.IBlockData block = this.world.getTypeIfLoaded(this.getChunkCoordinates());
++                    this.noclip = block != null && block.isOpaque();
++                } else
++                    // Airplane end
+                 this.noclip = !this.world.getCubes(this);
+                 if (this.noclip) {
+                     this.l(this.locX(), (this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D, this.locZ());

patches/Akarin/patches/server/0003-Swaps-the-predicate-order-of-collision.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Swaps the predicate order of collision
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9f2079b88c5e93a73ccb9c3c9ccbce5960241924..814cd9d46917cee21e3c715b62e82fa2e4547e33 100644
+index 7ddbc56eb2ea8491cd32987843801e9bee9dbe0b..32372e46103958e985582796964a47120ec9c1a3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1775,8 +1775,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

patches/Origami/patches/server/0006-Don-t-wake-up-entities-when-damage-event-is-cancelle.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't wake up entities when damage event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index e5372dfc25f99c63a66acdf085d6ae2a7c2102fa..ee2922d68cb1970c7b3b0b4b03d870a46ff63d71 100644
+index 88fc16e49076cf5589e27660a388909291447fac..d8fb0edceba805b9359d02304751182cd0c5a79f 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1208,9 +1208,12 @@ public abstract class EntityLiving extends Entity {

patches/Tuinity/patches/server/0004-Util-patch.patch

@@ -2531,7 +2531,7 @@ index f68a252378a94c8fcab622d2d89d738aceab45a4..afee018d10d0dbc31f1201477084e315
      public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, DimensionManager dimensionmanager, WorldLoadListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<MobSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
          super(iworlddataserver, resourcekey, dimensionmanager, minecraftserver::getMethodProfiler, false, flag, i, gen, env, executor); // Paper pass executor
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8ef41182056052686055b7eb88ab19c161e84ed4..62687478c8a8213bde78e8cf7d85b923f2ec840a 100644
+index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..7cb70daddfeb27949230fdd829232786a4748118 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -299,6 +299,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

patches/Tuinity/patches/server/0009-Delay-chunk-unloads.patch

@@ -247,10 +247,10 @@ index 3c804c7b20a14ea6e510810e2be10c1cc89ff5c1..47da7efffde2e6d63c1a064b950abf81
          return new TicketType<>(s, comparator, 0L);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 02198dbe9e80c2990e8a09b2b763748dae727a03..9948af982f4965bcbbbfa2362e20575823b39361 100644
+index c0b49a0eaeda06b89a4fb425eec3d5bfa9717379..41ef459b6574f5abf24e51280210f16322b6a0ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -516,6 +516,7 @@ public class CraftWorld implements World {
+@@ -523,6 +523,7 @@ public class CraftWorld implements World {
          org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
          if (isChunkLoaded(x, z)) {
              world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 0, Unit.INSTANCE); // Paper

patches/Tuinity/patches/server/0013-Detail-more-information-in-watchdog-dumps.patch

@@ -119,7 +119,7 @@ index ed3d4753eb6005337fc13a24021f138da5704a7f..64b9e420d8590e541cfad0881b9dc1fa
  
      public void a(Entity entity, Entity entity1) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 62687478c8a8213bde78e8cf7d85b923f2ec840a..745445a45ca583395b32bfba8326ee6c27d45212 100644
+index 7cb70daddfeb27949230fdd829232786a4748118..8867fd1fff9cadceb526fbeccf34cd2239f67a35 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -722,7 +722,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -176,7 +176,7 @@ index 62687478c8a8213bde78e8cf7d85b923f2ec840a..745445a45ca583395b32bfba8326ee6c
      }
  
      protected BlockPosition ap() {
-@@ -3440,12 +3479,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3445,12 +3484,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.locBlock;
      }
  
@@ -193,7 +193,7 @@ index 62687478c8a8213bde78e8cf7d85b923f2ec840a..745445a45ca583395b32bfba8326ee6c
      }
  
      public void setMot(double d0, double d1, double d2) {
-@@ -3500,7 +3543,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3505,7 +3548,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          }
          // Paper end
          if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {

patches/Tuinity/patches/server/0013-Per-World-Spawn-Limits.patch

@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Chase Whipple <chasewhip20@gmail.com>
-Date: Thu, 26 Mar 2020 21:45:54 -0600
-Subject: [PATCH] Per World Spawn Limits
-
-This patch is licensed under the MIT license. See /licenses/MIT.md.
-
-diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 5aa558bd05c4ab735730263f220478c36a4ba0fd..6473b951788a3ecbeee4811ea0288ff47b48355f 100644
---- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-@@ -269,6 +269,23 @@ public final class TuinityConfig {
-             final int threads = this.getInt("tick-threads", -1);
-             this.threads = threads == -1 ? TuinityConfig.tickThreads : threads;
-         }*/
-+
-+        public int spawnLimitMonsters;
-+        public int spawnLimitAnimals;
-+        public int spawnLimitWaterAmbient;
-+        public int spawnLimitWaterAnimals;
-+        public int spawnLimitAmbient;
-+
-+        private void perWorldSpawnLimit() {
-+            final String path = "spawn-limits";
-+
-+            this.spawnLimitMonsters = this.getInt(path + ".monsters", -1);
-+            this.spawnLimitAnimals = this.getInt(path + ".animals", -1);
-+            this.spawnLimitWaterAmbient = this.getInt(path + ".water-ambient", -1);
-+            this.spawnLimitWaterAnimals = this.getInt(path + ".water-animals", -1);
-+            this.spawnLimitAmbient = this.getInt(path + ".ambient", -1);
-+        }
-+
-     }
- 
- }
-\ No newline at end of file
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9948af982f4965bcbbbfa2362e20575823b39361..d312d316ddb7ed59ad918ef2582f98e055c486c3 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -353,6 +353,14 @@ public class CraftWorld implements World {
-         this.generator = gen;
- 
-         environment = env;
-+
-+        //Tuinity start - per world spawn limits
-+        monsterSpawn = world.tuinityConfig.spawnLimitMonsters;
-+        animalSpawn = world.tuinityConfig.spawnLimitAnimals;
-+        waterAmbientSpawn = world.tuinityConfig.spawnLimitWaterAmbient;
-+        waterAnimalSpawn = world.tuinityConfig.spawnLimitWaterAnimals;
-+        ambientSpawn = world.tuinityConfig.spawnLimitAmbient;
-+        //Tuinity end
-     }
- 
-     @Override

patches/Tuinity/patches/server/0020-Optimise-entity-hard-collision-checking.patch

@@ -11,7 +11,7 @@ Less crammed entities are likely to show significantly less benefit.
 Effectively, this patch optimises crammed entity situations.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 745445a45ca583395b32bfba8326ee6c27d45212..b5119308f16c79a0111d41f800446e40ed42a80e 100644
+index 8867fd1fff9cadceb526fbeccf34cd2239f67a35..cb01757dc466452ac9d927009ca4b6190871328f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -353,6 +353,41 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -56,7 +56,7 @@ index 745445a45ca583395b32bfba8326ee6c27d45212..b5119308f16c79a0111d41f800446e40
      public Entity(EntityTypes<?> entitytypes, World world) {
          this.id = Entity.entityCount.incrementAndGet();
          this.passengers = Lists.newArrayList();
-@@ -2125,11 +2160,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2130,11 +2165,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return EnumInteractionResult.PASS;
      }
  

patches/Tuinity/patches/server/0023-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch

@@ -552,7 +552,7 @@ index 90776231b1faffb11e4394f555f336ca248e3004..db8f0d8b63cbefffcd010568cbfab1ea
          }
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b5119308f16c79a0111d41f800446e40ed42a80e..4115cd420ed18a0de91ebce9ba6f6504ca42aa7d 100644
+index cb01757dc466452ac9d927009ca4b6190871328f..cdea6b2b39f316a4467216c115a610a56d8808a3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -228,7 +228,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -791,7 +791,7 @@ index b5119308f16c79a0111d41f800446e40ed42a80e..4115cd420ed18a0de91ebce9ba6f6504
          }
  
      }
-@@ -2150,9 +2299,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2155,9 +2304,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              float f1 = this.size.width * 0.8F;
              AxisAlignedBB axisalignedbb = AxisAlignedBB.g((double) f1, 0.10000000149011612D, (double) f1).d(this.locX(), this.getHeadY(), this.locZ());
  
@@ -803,7 +803,7 @@ index b5119308f16c79a0111d41f800446e40ed42a80e..4115cd420ed18a0de91ebce9ba6f6504
          }
      }
  
-@@ -2160,10 +2309,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2165,10 +2314,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return EnumInteractionResult.PASS;
      }
  

patches/Tuinity/patches/server/0028-Revert-getChunkAt-Async-retaining-chunks-for-long-pe.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Revert getChunkAt(Async) retaining chunks for long periods of
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d312d316ddb7ed59ad918ef2582f98e055c486c3..638f6415382ab40d026ec89fd19cc1a7dd2c3e86 100644
+index 41ef459b6574f5abf24e51280210f16322b6a0ed..95c678efcc5ed39ad78d9543a194270427aa2813 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -434,14 +434,7 @@ public class CraftWorld implements World {
+@@ -433,14 +433,7 @@ public class CraftWorld implements World {
  
      @Override
      public Chunk getChunkAt(int x, int z) {
@@ -25,7 +25,7 @@ index d312d316ddb7ed59ad918ef2582f98e055c486c3..638f6415382ab40d026ec89fd19cc1a7
      }
  
      // Paper start
-@@ -2670,7 +2663,7 @@ public class CraftWorld implements World {
+@@ -2669,7 +2662,7 @@ public class CraftWorld implements World {
          }
          return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
              net.minecraft.world.level.chunk.Chunk chunk = (net.minecraft.world.level.chunk.Chunk) either.left().orElse(null);

patches/Tuinity/patches/server/0042-Add-packet-limiter-config.patch

@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 6473b951788a3ecbeee4811ea0288ff47b48355f..373b36fa36f98f64bb9ffa0dfaecefa3626729f4 100644
+index 5aa558bd05c4ab735730263f220478c36a4ba0fd..761b03d08bbdfd2733ac5e4fc12931ef6a0ea8e5 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -1,6 +1,7 @@

patches/Tuinity/patches/server/0045-Remove-streams-for-villager-AI.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove streams for villager AI
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4115cd420ed18a0de91ebce9ba6f6504ca42aa7d..0db18127cc1abbd4d6ffa1d3a019aba9549b09a5 100644
+index cdea6b2b39f316a4467216c115a610a56d8808a3..94531317716028e9de3d56314934e5e769d568fb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1712,6 +1712,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

patches/Tuinity/patches/server/0051-Do-not-load-chunks-during-a-crash-report.patch

@@ -22,10 +22,10 @@ index e50731723d266ba65b2163df2e935afb8b013a93..a6736d15282715d920bab85eb92074cd
                  }
                  value.append("},");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 638f6415382ab40d026ec89fd19cc1a7dd2c3e86..8e259ccad6a494e6a1aaa455bc7a69739de537ab 100644
+index 95c678efcc5ed39ad78d9543a194270427aa2813..d66a3441c8e31da87b4e434b1b718d8e6e936953 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -731,6 +731,30 @@ public class CraftWorld implements World {
+@@ -730,6 +730,30 @@ public class CraftWorld implements World {
          return ret.entrySet().stream().collect(ImmutableMap.toImmutableMap(Map.Entry::getKey, (entry) -> entry.getValue().build()));
      }
  

patches/Tuinity/patches/server/0053-Copy-passenger-list-in-enderTeleportTo.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Copy passenger list in enderTeleportTo
 Fixes https://github.com/Spottedleaf/Tuinity/issues/208
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0db18127cc1abbd4d6ffa1d3a019aba9549b09a5..14e7d217cd98b671a2946f269edbbe77451e1cf7 100644
+index 94531317716028e9de3d56314934e5e769d568fb..a60a42aa4ef44c6b5feff896de8c96639f554286 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3208,7 +3208,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3213,7 +3213,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              this.recursiveStream().forEach((entity) -> {
                  worldserver.chunkCheck(entity);
                  entity.az = true;

patches/Tuinity/patches/server/0056-Rewrite-the-light-engine.patch

@@ -3709,7 +3709,7 @@ index 0000000000000000000000000000000000000000..0e4442a94559346b19a536d35ce5def6
 +    }
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 373b36fa36f98f64bb9ffa0dfaecefa3626729f4..1fb7a0e44cdbf563a7858003806a57a5cbda445b 100644
+index 761b03d08bbdfd2733ac5e4fc12931ef6a0ea8e5..edc26e8a1bea5dc5ebbc5abec0dcea604c410d95 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -232,6 +232,12 @@ public final class TuinityConfig {

patches/Tuinity/patches/server/0059-Send-full-pos-packets-for-hard-colliding-entities.patch

@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 1fb7a0e44cdbf563a7858003806a57a5cbda445b..edb9b246bf327f67a8500f77f81b46eb9e04c9b0 100644
+index edc26e8a1bea5dc5ebbc5abec0dcea604c410d95..9832f676f7e549598193fbe4ad04ee5d5ca20c1c 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -238,6 +238,12 @@ public final class TuinityConfig {

patches/Tuinity/patches/server/0063-Make-entity-tracker-use-highest-range-of-passengers.patch

@@ -30,7 +30,7 @@ index cb1d81d605870f782dc5f35c20735b0ec6d96934..6fadeddc7aada2a7319a428258c62240
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 14e7d217cd98b671a2946f269edbbe77451e1cf7..dc562eecac56c6e71c7ad0293507879ca6b04586 100644
+index a60a42aa4ef44c6b5feff896de8c96639f554286..89852779fd9cfd19058afe40feb0cf14ca8d2896 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -317,8 +317,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

patches/Tuinity/patches/server/0071-Replace-player-chunk-loader-system.patch

@@ -1032,7 +1032,7 @@ index 0000000000000000000000000000000000000000..0d577aa1c7868ce89c3902535adcb554
 +    }
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index edb9b246bf327f67a8500f77f81b46eb9e04c9b0..e1dc7c1025e19f7393a45719af8fe7aae016184d 100644
+index 9832f676f7e549598193fbe4ad04ee5d5ca20c1c..24940f1824d33727bacd82bb16136229bbbfbcc2 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -244,6 +244,25 @@ public final class TuinityConfig {
@@ -1750,10 +1750,10 @@ index 3fe1508b091e1fd0325eae50138d02fa6445c9ff..a19a26a88f247d359354902efeece992
          return new Vec3D((double) baseblockposition.getX() + 0.5D, (double) baseblockposition.getY() + 0.5D, (double) baseblockposition.getZ() + 0.5D);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8e259ccad6a494e6a1aaa455bc7a69739de537ab..bae07ab043040c1f242271d58fc2f611c403ed46 100644
+index d66a3441c8e31da87b4e434b1b718d8e6e936953..811f702c00addc9f9cf467833d350bb472bf9bc5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2712,14 +2712,14 @@ public class CraftWorld implements World {
+@@ -2711,14 +2711,14 @@ public class CraftWorld implements World {
              throw new IllegalArgumentException("View distance " + viewDistance + " is out of range of [2, 32]");
          }
          PlayerChunkMap chunkMap = getHandle().getChunkProvider().playerChunkMap;
@@ -1770,7 +1770,7 @@ index 8e259ccad6a494e6a1aaa455bc7a69739de537ab..bae07ab043040c1f242271d58fc2f611
      }
  
      @Override
-@@ -2728,11 +2728,22 @@ public class CraftWorld implements World {
+@@ -2727,11 +2727,22 @@ public class CraftWorld implements World {
              throw new IllegalArgumentException("View distance " + viewDistance + " is out of range of [2, 32]");
          }
          PlayerChunkMap chunkMap = getHandle().getChunkProvider().playerChunkMap;

patches/Tuinity/patches/server/0078-Do-not-copy-visible-chunks.patch

@@ -166,7 +166,7 @@ index c6c34babd618d201bab26eb9e9edaa6e68d510bf..d827e18d8c3b9b5869dbb1e233f415ba
  
      protected PlayerChunkMap.a e() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bae07ab043040c1f242271d58fc2f611c403ed46..3b6b1f3229b07c84d99db652e01661bcc78368fd 100644
+index 811f702c00addc9f9cf467833d350bb472bf9bc5..3562c20dee06913d03aee49d12cb27831c008842 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -298,7 +298,7 @@ public class CraftWorld implements World {
@@ -187,7 +187,7 @@ index bae07ab043040c1f242271d58fc2f611c403ed46..3b6b1f3229b07c84d99db652e01661bc
              if (chunkHolder.getChunk() != null) {
                  ++ret;
              }
-@@ -482,13 +482,16 @@ public class CraftWorld implements World {
+@@ -481,13 +481,16 @@ public class CraftWorld implements World {
      public Chunk[] getLoadedChunks() {
          // Paper start
          if (Thread.currentThread() != world.getMinecraftWorld().serverThread) {

patches/server/0006-Yatopia-configuration.patch

@@ -60,7 +60,7 @@ index 5936075251ef3d6dda3e93866009d0e996598698..b10b1960260d89b5e5c7b960f5bc18ec
          playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.abilities));
          playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index ee2922d68cb1970c7b3b0b4b03d870a46ff63d71..1c1ad06fe8699fbcf922cede825cdfdc65ba6a21 100644
+index d8fb0edceba805b9359d02304751182cd0c5a79f..cfd2846c70db349aaf5377217ede422560964e29 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -362,6 +362,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0007-Per-entity-type-collision-settings.patch

@@ -59,7 +59,7 @@ index 9a008acd3e6dd5522d163dfbe09c611f6f717d4e..a088b8f84f01ce3863ae949f4cd3d7ae
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 1c1ad06fe8699fbcf922cede825cdfdc65ba6a21..8ca4765005271fbb234a9f1512045acaa1bf4f92 100644
+index cfd2846c70db349aaf5377217ede422560964e29..3541a869e85b45d9d5a0c2547357a6200836ee1e 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -3001,7 +3001,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0009-Modify-default-configs.patch

@@ -18,7 +18,7 @@ index 7acf077bc131af718c7548cc29deef558c04e463..2690504fa53edd3e899100957e1f9da1
          TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
          TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses", "settings.velocity-support.secret"));
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5c91c007691efeea1d4383efcd1ca06990d0660c..f64c805cba64350996238228aa0f8fd6e8fa17c7 100644
+index fcacc08db8f5a58ddd06be7f9f2cb2cf6b2231c3..5d88bbb56e8a25ed45d8e01ad0fba81111a3b420 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -635,7 +635,7 @@ public class PaperWorldConfig {

patches/server/0012-lithium-enum_values.patch

@@ -65,7 +65,7 @@ index 8078e4f5b79eaada03508265ba6b81db636e822a..b2d26289a6f501b093ec229394f75864
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 8ca4765005271fbb234a9f1512045acaa1bf4f92..92447667f53b86c3a7b0f5f462ba37ffd3007dc8 100644
+index 3541a869e85b45d9d5a0c2547357a6200836ee1e..6132c711836908569006a8993973526275c9fb7c 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2708,10 +2708,12 @@ public abstract class EntityLiving extends Entity {

patches/server/0014-Item-stuck-sleep-config.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] Item stuck sleep config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
-index e1581f0616748da885f457c7fa0f1515490c53f4..d4888803ad002636ad3aa15e39d197bc6ecc9025 100644
+index cb5c4379bfd16a74debaf23f840dbf1e5535ad7f..392f51e435021352cf14554361fc6425b70d06e6 100644
 --- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
 +++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
-@@ -109,7 +109,7 @@ public class EntityItem extends Entity {
- 
-             if (this.world.isClientSide) {
-                 this.noclip = false;
--            } else {
-+            } else if (!this.onGround || this.noclip || this.ticksLived % org.yatopiamc.yatopia.server.YatopiaConfig.itemStuckSleepTicks == 0) { // Yatopia
+@@ -114,7 +114,7 @@ public class EntityItem extends Entity {
+                 if (gg.airplane.AirplaneConfig.simplerItemCollision) {
+                     net.minecraft.world.level.block.state.IBlockData block = this.world.getTypeIfLoaded(this.getChunkCoordinates());
+                     this.noclip = block != null && block.isOpaque();
+-                } else
++                } else if (!this.onGround || this.noclip || this.ticksLived % org.yatopiamc.yatopia.server.YatopiaConfig.itemStuckSleepTicks == 0)
+                     // Airplane end
                  this.noclip = !this.world.getCubes(this);
                  if (this.noclip) {
-                     this.l(this.locX(), (this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D, this.locZ());
 diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
 index f5a43e607f9c13e07a0f5e7e139eed93f159185b..4722a170519dfebc7b41ce886563a3b80c8e111b 100644
 --- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java

patches/server/0021-Fix-lead-fall-dmg-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix lead fall dmg config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 814cd9d46917cee21e3c715b62e82fa2e4547e33..30168844c52d57ab20abd6a1592aabfa658f714a 100644
+index 32372e46103958e985582796964a47120ec9c1a3..b742f457d72eee4f00f5df7a2b5b3cfdeb917a86 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1451,6 +1451,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

patches/server/0060-tic-tacs-unblocking.patch

@@ -70,7 +70,7 @@ index 861c834e9bfa653e78bc884d5a9712b990a7b632..49b8048de109625f82988ad3baad7708
      public static final BlockPosition a = new BlockPosition(100, 50, 0);
      private static final Logger LOGGER = LogManager.getLogger();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 30168844c52d57ab20abd6a1592aabfa658f714a..3475e74ad2a3d9cf6088e51e55c50bcac28e00b5 100644
+index b742f457d72eee4f00f5df7a2b5b3cfdeb917a86..c4d3f716dda0e33b444de6caa6f336d8d33daf5b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -141,9 +141,12 @@ import org.bukkit.event.entity.EntityPoseChangeEvent;
@@ -200,7 +200,7 @@ index 30168844c52d57ab20abd6a1592aabfa658f714a..3475e74ad2a3d9cf6088e51e55c50bca
  
          if (iblockdata.h() != EnumRenderType.INVISIBLE) {
              Vec3D vec3d = this.getMot();
-@@ -2862,7 +2875,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2867,7 +2880,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              EnumDirection enumdirection1 = aenumdirection[j];
  
              blockposition_mutableblockposition.a((BaseBlockPosition) blockposition, enumdirection1);
@@ -209,7 +209,7 @@ index 30168844c52d57ab20abd6a1592aabfa658f714a..3475e74ad2a3d9cf6088e51e55c50bca
                  double d4 = vec3d.a(enumdirection1.n());
                  double d5 = enumdirection1.e() == EnumDirection.EnumAxisDirection.POSITIVE ? 1.0D - d4 : d4;
  
-@@ -3076,14 +3089,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3081,14 +3094,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
                  return (ShapeDetectorShape) this.findOrCreatePortal(worldserver, blockposition, flag2, event.getSearchRadius(), event.getCanCreatePortal(), event.getCreationRadius()).map((blockutil_rectangle) -> {
                      // CraftBukkit end
@@ -226,7 +226,7 @@ index 30168844c52d57ab20abd6a1592aabfa658f714a..3475e74ad2a3d9cf6088e51e55c50bca
                          });
  
                          vec3d = this.a(enumdirection_enumaxis, blockutil_rectangle1);
-@@ -3438,6 +3451,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3443,6 +3456,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
  
      public boolean cl() {
@@ -234,7 +234,7 @@ index 30168844c52d57ab20abd6a1592aabfa658f714a..3475e74ad2a3d9cf6088e51e55c50bca
          boolean flag = this.au;
  
          this.au = false;
-@@ -3636,7 +3650,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3641,7 +3655,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
                  for (int i2 = k; i2 < l; ++i2) {
                      for (int j2 = i1; j2 < j1; ++j2) {
                          blockposition_mutableblockposition.d(l1, i2, j2);
@@ -244,7 +244,7 @@ index 30168844c52d57ab20abd6a1592aabfa658f714a..3475e74ad2a3d9cf6088e51e55c50bca
                          if (fluid.a(tag)) {
                              double d2 = (double) ((float) i2 + fluid.getHeight(this.world, blockposition_mutableblockposition));
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 92447667f53b86c3a7b0f5f462ba37ffd3007dc8..4de845117c06915943d517bdab7fcc3651589dcf 100644
+index 6132c711836908569006a8993973526275c9fb7c..02f7a588f883c0ed8b5daef6839e385b4ce1334b 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -139,6 +139,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -342,7 +342,7 @@ index 92447667f53b86c3a7b0f5f462ba37ffd3007dc8..4de845117c06915943d517bdab7fcc36
  
                  f = this.onGround ? f5 * 0.91F : 0.91F;
                  Vec3D vec3d6 = this.a(vec3d, f5);
-@@ -3502,7 +3505,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3505,7 +3508,7 @@ public abstract class EntityLiving extends Entity {
  
              while (!flag2 && blockposition.getY() > 0) {
                  BlockPosition blockposition1 = blockposition.down();
@@ -351,7 +351,7 @@ index 92447667f53b86c3a7b0f5f462ba37ffd3007dc8..4de845117c06915943d517bdab7fcc36
  
                  if (iblockdata.getMaterial().isSolid()) {
                      flag2 = true;
-@@ -3614,7 +3617,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3617,7 +3620,7 @@ public abstract class EntityLiving extends Entity {
              this.stopRiding();
          }
  
@@ -360,7 +360,7 @@ index 92447667f53b86c3a7b0f5f462ba37ffd3007dc8..4de845117c06915943d517bdab7fcc36
  
          if (iblockdata.getBlock() instanceof BlockBed) {
              this.world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockBed.OCCUPIED, true), 3);
-@@ -3633,7 +3636,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3636,7 +3639,7 @@ public abstract class EntityLiving extends Entity {
  
      private boolean x() {
          return (Boolean) this.getBedPosition().map((blockposition) -> {
@@ -369,7 +369,7 @@ index 92447667f53b86c3a7b0f5f462ba37ffd3007dc8..4de845117c06915943d517bdab7fcc36
          }).orElse(false);
      }
  
-@@ -3643,7 +3646,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3646,7 +3649,7 @@ public abstract class EntityLiving extends Entity {
  
          this.world.getClass();
          optional.filter(world::isLoaded).ifPresent((blockposition) -> {

patches/server/0063-lithium-entity.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] lithium entity
 Co-authored-by: Hugo Planque <hookwood01@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 4de845117c06915943d517bdab7fcc3651589dcf..a0d1d98135cfea5b2afa2b68a1ab95aa46b8f485 100644
+index 02f7a588f883c0ed8b5daef6839e385b4ce1334b..81ad2ad6494f4808c4d240342a5d1d2971fa52ca 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -276,6 +276,9 @@ public abstract class EntityLiving extends Entity {

patches/server/0064-lithium-shape.patch

@@ -270,10 +270,10 @@ index b95115aca72ba0cf6451096ddbd8b50a8f3bb5c6..0afb8c643cb3e5938e12183c6132797d
          int j = i - 1;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3475e74ad2a3d9cf6088e51e55c50bcac28e00b5..198d22377a9fc3d6601a078cd2fa4294a6b2987b 100644
+index c4d3f716dda0e33b444de6caa6f336d8d33daf5b..d212e9c4ffe44b6fdcb78d0cf2a7547bc98f57a3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2682,6 +2682,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2687,6 +2687,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.isSneaking();
      }
  

upstream/Airplane

@@ -1 +1 @@
-Subproject commit 2be99de1879d77f697c89bb4f9941753b794422e
+Subproject commit a13c511bd2e18e441852b57946cf700793d5b653

upstream/Empirecraft

@@ -1 +1 @@
-Subproject commit 33438474421589039cc384be99b5584bfdce487b
+Subproject commit c7ef1a7a3ab3825b1f40be5ad355b81b61cb002a

upstream/Tuinity

@@ -1 +1 @@
-Subproject commit 2683c775cc9b25ca8bfc0c9b04bbffea6c5fa9fd
+Subproject commit df76b3cc5abe56163c9b51b1a8eb2737601b492f

upstreamCommits/Airplane

@@ -1 +1 @@
-2be99de1879d77f697c89bb4f9941753b794422e
+a13c511bd2e18e441852b57946cf700793d5b653

upstreamCommits/Empirecraft

@@ -1 +1 @@
-33438474421589039cc384be99b5584bfdce487b
+c7ef1a7a3ab3825b1f40be5ad355b81b61cb002a

upstreamCommits/Tuinity

@@ -1 +1 @@
-2683c775cc9b25ca8bfc0c9b04bbffea6c5fa9fd
+df76b3cc5abe56163c9b51b1a8eb2737601b492f

upstreamConfig/0001-Tuinity.properties

@@ -1,4 +1,4 @@
 name=Tuinity
 useBlackList=True
-list=server/Properly-handle-cancellation-of-projectile-hit-event.patch,server/Improved-oversized-chunk-data-packet-handling.patch
+list=server/Properly-handle-cancellation-of-projectile-hit-event.patch,server/Improved-oversized-chunk-data-packet-handling.patch,server/Per-World-Spawn-Limits.patch
 branch=origin/master