Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

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)

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/server/0005-Tuinity-Server-Config.patch

@@ -20,10 +20,10 @@ index e33e889c291d37a821a4fbd40d9aac7bb079de0d..5dfa0658838c4801cdf260eae8b98163
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..0f66484a80d3cc7caaf8a111bd50229e673bd8e0
+index 0000000000000000000000000000000000000000..508534e91eda174645b7f432bf844c9db8bc2e26
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,292 @@
 +package com.tuinity.tuinity.config;
 +
 +import com.destroystokyo.paper.util.SneakyThrow;
@@ -219,6 +219,16 @@ index 0000000000000000000000000000000000000000..0f66484a80d3cc7caaf8a111bd50229e
 +            return config == null ? this.worldDefaults.getBoolean(path) : config.getBoolean(path, this.worldDefaults.getBoolean(path));
 +        }
 +
++        boolean getBooleanRaw(final String path, final boolean dfl) {
++            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
++            if (TuinityConfig.configVersion < 1) {
++                if (config != null && config.getBoolean(path) == dfl) {
++                    config.set(path, null);
++                }
++            }
++            return config == null ? this.worldDefaults.getBoolean(path, dfl) : config.getBoolean(path, this.worldDefaults.getBoolean(path, dfl));
++        }
++
 +        int getInt(final String path, final int dfl) {
 +            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
 +            this.worldDefaults.addDefault(path, Integer.valueOf(dfl));
@@ -230,6 +240,16 @@ index 0000000000000000000000000000000000000000..0f66484a80d3cc7caaf8a111bd50229e
 +            return config == null ? this.worldDefaults.getInt(path) : config.getInt(path, this.worldDefaults.getInt(path));
 +        }
 +
++        int getIntRaw(final String path, final int dfl) {
++            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
++            if (TuinityConfig.configVersion < 1) {
++                if (config != null && config.getInt(path) == dfl) {
++                    config.set(path, null);
++                }
++            }
++            return config == null ? this.worldDefaults.getInt(path, dfl) : config.getInt(path, this.worldDefaults.getInt(path, dfl));
++        }
++
 +        long getLong(final String path, final long dfl) {
 +            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
 +            this.worldDefaults.addDefault(path, Long.valueOf(dfl));
@@ -241,6 +261,16 @@ index 0000000000000000000000000000000000000000..0f66484a80d3cc7caaf8a111bd50229e
 +            return config == null ? this.worldDefaults.getLong(path) : config.getLong(path, this.worldDefaults.getLong(path));
 +        }
 +
++        long getLongRaw(final String path, final long dfl) {
++            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
++            if (TuinityConfig.configVersion < 1) {
++                if (config != null && config.getLong(path) == dfl) {
++                    config.set(path, null);
++                }
++            }
++            return config == null ? this.worldDefaults.getLong(path, dfl) : config.getLong(path, this.worldDefaults.getLong(path, dfl));
++        }
++
 +        double getDouble(final String path, final double dfl) {
 +            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
 +            this.worldDefaults.addDefault(path, Double.valueOf(dfl));
@@ -252,11 +282,37 @@ index 0000000000000000000000000000000000000000..0f66484a80d3cc7caaf8a111bd50229e
 +            return config == null ? this.worldDefaults.getDouble(path) : config.getDouble(path, this.worldDefaults.getDouble(path));
 +        }
 +
++        double getDoubleRaw(final String path, final double dfl) {
++            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
++            if (TuinityConfig.configVersion < 1) {
++                if (config != null && config.getDouble(path) == dfl) {
++                    config.set(path, null);
++                }
++            }
++            return config == null ? this.worldDefaults.getDouble(path, dfl) : config.getDouble(path, this.worldDefaults.getDouble(path, dfl));
++        }
++
 +        String getString(final String path, final String dfl) {
 +            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
 +            this.worldDefaults.addDefault(path, dfl);
 +            return config == null ? this.worldDefaults.getString(path) : config.getString(path, this.worldDefaults.getString(path));
 +        }
++
++        String getStringRaw(final String path, final String dfl) {
++            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
++            return config == null ? this.worldDefaults.getString(path, dfl) : config.getString(path, this.worldDefaults.getString(path, dfl));
++        }
++
++        List getList(final String path, final List dfl) {
++            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
++            this.worldDefaults.addDefault(path, dfl);
++            return config == null ? this.worldDefaults.getList(path) : config.getList(path, this.worldDefaults.getList(path));
++        }
++
++        List getListRaw(final String path, final List dfl) {
++            final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
++            return config == null ? this.worldDefaults.getList(path, dfl) : config.getList(path, this.worldDefaults.getList(path, dfl));
++        }
 +    }
 +
 +}

patches/server/0007-Multi-Threaded-ticking-CraftBukkit.patch

@@ -8,7 +8,7 @@ These are the changes to CB
 Currently a placeholder patch.
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 0f66484a80d3cc7caaf8a111bd50229e673bd8e0..f10fa659680f8a574f77d260bbc52be349c244e8 100644
+index 508534e91eda174645b7f432bf844c9db8bc2e26..8b72d044e2d56c7933b48bdf5f6139d64f9660b7 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -110,6 +110,19 @@ public final class TuinityConfig {
@@ -31,9 +31,9 @@ index 0f66484a80d3cc7caaf8a111bd50229e673bd8e0..f10fa659680f8a574f77d260bbc52be3
      public static final class WorldConfig {
 
          public final String worldName;
-@@ -231,6 +244,15 @@ public final class TuinityConfig {
-             this.worldDefaults.addDefault(path, dfl);
-             return config == null ? this.worldDefaults.getString(path) : config.getString(path, this.worldDefaults.getString(path));
+@@ -287,6 +300,15 @@ public final class TuinityConfig {
+             final ConfigurationSection config = TuinityConfig.config.getConfigurationSection(this.configPath);
+             return config == null ? this.worldDefaults.getList(path, dfl) : config.getList(path, this.worldDefaults.getList(path, dfl));
          }
 +
 +        /** ignored if {@link TuinityConfig#tickWorldsInParallel} == false */

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

@@ -19,7 +19,7 @@ affects player loaded chunks, when we want to target all
 loads.
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index f10fa659680f8a574f77d260bbc52be349c244e8..dea6aabc0c145b0723badf7024a9f8a0b241f24c 100644
+index 8b72d044e2d56c7933b48bdf5f6139d64f9660b7..a9f5b1370c9dcb921a66a736d57d5bd6e8a4a19e 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 @@
@@ -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/server/0011-Lag-compensate-block-breaking.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensate block breaking
 Use time instead of ticks if ticks fall behind
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index dea6aabc0c145b0723badf7024a9f8a0b241f24c..6edc8765df8644426613c40557d890620060fab1 100644
+index a9f5b1370c9dcb921a66a736d57d5bd6e8a4a19e..189f4b912960ae3d611a344f99eeb0ad9af82f5d 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -133,6 +133,12 @@ public final class TuinityConfig {

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

@@ -6,10 +6,10 @@ 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 6edc8765df8644426613c40557d890620060fab1..fdc56a5080ab2f7331431ee1f5976ba669b725ac 100644
+index 189f4b912960ae3d611a344f99eeb0ad9af82f5d..a725ced3e0b5f800335bf6e0fbc47cbc2206358e 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 {
+@@ -325,6 +325,22 @@ public final class TuinityConfig {
              final int threads = this.getInt("tick-threads", -1);
              this.threads = threads == -1 ? TuinityConfig.tickThreads : threads;
          }*/
@@ -23,33 +23,43 @@ index 6edc8765df8644426613c40557d890620060fab1..fdc56a5080ab2f7331431ee1f5976ba6
 +        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);
++            this.spawnLimitMonsters = this.getIntRaw(path + ".monsters", -1);
++            this.spawnLimitAnimals = this.getIntRaw(path + ".animals", -1);
++            this.spawnLimitWaterAmbient = this.getIntRaw(path + ".water-ambient", -1);
++            this.spawnLimitWaterAnimals = this.getIntRaw(path + ".water-animals", -1);
++            this.spawnLimitAmbient = this.getIntRaw(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
+index 41ef459b6574f5abf24e51280210f16322b6a0ed..8a81022634d11a050243d39e128c9f50b0d09a51 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 {
+@@ -353,13 +353,20 @@ 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
++        // Tuinity start - per world spawn limits
++        this.monsterSpawn = world.tuinityConfig.spawnLimitMonsters;
++        this.animalSpawn = world.tuinityConfig.spawnLimitAnimals;
++        this.waterAmbientSpawn = world.tuinityConfig.spawnLimitWaterAmbient;
++        this.waterAnimalSpawn = world.tuinityConfig.spawnLimitWaterAnimals;
++        this.ambientSpawn = world.tuinityConfig.spawnLimitAmbient;
+         // Paper start - per world spawn limits
+-        this.monsterSpawn = this.world.paperConfig.spawnLimitMonsters;
+-        this.animalSpawn = this.world.paperConfig.spawnLimitAnimals;
+-        this.waterAnimalSpawn = this.world.paperConfig.spawnLimitWaterAnimals;
+-        this.waterAmbientSpawn = this.world.paperConfig.spawnLimitWaterAmbient;
+-        this.ambientSpawn = this.world.paperConfig.spawnLimitAmbient;
++        if (this.monsterSpawn == -1) this.monsterSpawn = this.world.paperConfig.spawnLimitMonsters;
++        if (this.animalSpawn == -1) this.animalSpawn = this.world.paperConfig.spawnLimitAnimals;
++        if (this.waterAnimalSpawn == -1) this.waterAnimalSpawn = this.world.paperConfig.spawnLimitWaterAnimals;
++        if (this.waterAmbientSpawn == -1) this.waterAmbientSpawn = this.world.paperConfig.spawnLimitWaterAmbient;
++        if (this.ambientSpawn == -1) this.ambientSpawn = this.world.paperConfig.spawnLimitAmbient;
+         // Paper end
++        // Tuinity end - per world spawn limits
      }
 
      @Override

patches/server/0014-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/server/0021-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/server/0025-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;
      }