Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@8a1e23d Updated Upstream (Paper)
PurpurMC/Purpur@42d0290 return empty itemstack to PlayerBookTooLargeEvent if book is not being held
PurpurMC/Purpur@1f589eb Updated Upstream (Paper)
PurpurMC/Purpur@ea2835b Updated Upstream (Paper)

docs/docs/admin/configuration.md

@@ -46,11 +46,6 @@ Global settings affect all worlds on the server as well as the core server funct
     - **default**: false
     - **description**: Enables a feature to allow players to log in with any username
 
-#### fallback-to-dimension-if-world-uuid-unknown
-
-- **default**: true
-- **description**: Enables a feature to allow players to log in with any username
-
 #### do-not-process-chat-commands
 - **default**: true
 - **description**: This function disables chat/commands processing when a player joins the server

gradle.properties

@@ -1,7 +1,7 @@
 group = gq.bxteam.divinemc
 
 version = 1.20.2-R0.1-SNAPSHOT
-purpurRef = c9aee076fc4f9461bc7fb79c7748b791082f9477
+purpurRef = ea2835bfe1e1625a02f7c7d26c06fe34a6674be1
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0004-Optimize-default-values-for-configs.patch

@@ -36,7 +36,7 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..e51f427eadc0c3b60754d0a67bea3892
          public boolean strictAdvancementDimensionCheck = false;
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index c9ae7e88afb1ca8349a118c6b491a1e1e83517a7..aaa4ded1313875bb9c6533cea472cb1d42de9f42 100644
+index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd2e5485a6 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 @@ -127,9 +127,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -99,7 +99,7 @@ index c9ae7e88afb1ca8349a118c6b491a1e1e83517a7..aaa4ded1313875bb9c6533cea472cb1d
      }
  
      public Fixes fixes;
-@@ -452,7 +452,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -451,7 +451,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Hopper extends ConfigurationPart {
          public boolean cooldownWhenFull = true;
          public boolean disableMoveEvent = false;
@@ -108,7 +108,7 @@ index c9ae7e88afb1ca8349a118c6b491a1e1e83517a7..aaa4ded1313875bb9c6533cea472cb1d
      }
  
      public Collisions collisions;
-@@ -460,9 +460,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -459,9 +459,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Collisions extends ConfigurationPart {
          public boolean onlyPlayersCollide = false;
          public boolean allowVehicleCollisions = true;
@@ -120,7 +120,7 @@ index c9ae7e88afb1ca8349a118c6b491a1e1e83517a7..aaa4ded1313875bb9c6533cea472cb1d
          public boolean allowPlayerCrammingDamage = false;
      }
  
-@@ -470,18 +470,31 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -469,18 +469,31 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Chunks extends ConfigurationPart {
          public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -162,7 +162,7 @@ index c9ae7e88afb1ca8349a118c6b491a1e1e83517a7..aaa4ded1313875bb9c6533cea472cb1d
          });
          public boolean flushRegionsOnSave = false;
      }
-@@ -496,11 +509,22 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -495,11 +508,22 @@ public class WorldConfiguration extends ConfigurationPart {
      public TickRates tickRates;
  
      public class TickRates extends ConfigurationPart {
@@ -190,7 +190,7 @@ index c9ae7e88afb1ca8349a118c6b491a1e1e83517a7..aaa4ded1313875bb9c6533cea472cb1d
      }
  
      @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
-@@ -509,7 +533,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -508,7 +532,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class FeatureSeeds extends ConfigurationPart {
          @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
          @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -199,7 +199,7 @@ index c9ae7e88afb1ca8349a118c6b491a1e1e83517a7..aaa4ded1313875bb9c6533cea472cb1d
          @Setting(FeatureSeedsGeneration.FEATURES_KEY)
          public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
  
-@@ -523,9 +547,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -522,9 +546,9 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Misc extends ConfigurationPart {
          public int lightQueueSize = 20;
@@ -225,7 +225,7 @@ index 1f54e2ec6d73853001642bcf4b355c4a0dd10f6d..d8d19567cf49b41d730a936d46c8e37e
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 612c3169c3463d702b85975e1db79ae6e47d60d0..2138104c5612aac9bdddd7a4feed0f21d08c8d04 100644
+index 68602dfb171d47e47fd0710b4324013ef05214d0..7ccad6b35263b595c4d60ded85333d924ce61e21 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -335,7 +335,7 @@ public class SpigotConfig
@@ -251,7 +251,7 @@ index 612c3169c3463d702b85975e1db79ae6e47d60d0..2138104c5612aac9bdddd7a4feed0f21
  
      public static boolean disablePlayerDataSaving;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..389bcb5e01d66f8e3915e09a49aace5176012191 100644
+index f9b8e2bc039f1a37e47f84909c8785f3ef530284..12358c08e0e90d8d01db25534c6d5c4e726191dc 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -150,14 +150,14 @@ public class SpigotWorldConfig

patches/server/0007-Fix-entity-serialization.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix entity serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 067302709a2291274eeecd1e4e04662b6914da12..8ab1cfdf1a108a968ff81ce6ed08f9bc27ee7cd4 100644
+index d61d7ae47285d9779221011212f871c4ef7de830..24cc1369b6561b8fb99f26253f7ba05be0a5d49b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2297,15 +2297,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2330,15 +2330,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
      }
  

patches/server/0012-Allow-any-username.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Allow any username
 
 
 diff --git a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-index cdf83dc33915632e29291c59eb1841991c03e8a0..512afaa97e89e3beb92cf2ebc46248eddd22cf5c 100644
+index 9e802fbe8e5f1a3c24cb6bc9254c72a2a0c3fde1..426ae4086adc0180e3f3ba06cf6c005476ca891e 100644
 --- a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-@@ -157,4 +157,9 @@ public class DivineConfig {
-     private static void fallbackToDimensionIfWorldUUIDUnknown() {
-         fallbackToDimensionIfWorldUUIDUnknown = getBoolean("settings.fallback-to-dimension-if-world-uuid-unknown", fallbackToDimensionIfWorldUUIDUnknown);
+@@ -152,4 +152,9 @@ public class DivineConfig {
+         }
+         return builder.build();
      }
 +
 +    public static boolean allowAnyUsername = false;
@@ -20,7 +20,7 @@ index cdf83dc33915632e29291c59eb1841991c03e8a0..512afaa97e89e3beb92cf2ebc46248ed
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index f0bbc48e2df1da42e4bf9f7113451738b986fbbf..85542bba7b145070b69b736519aee7f94a03568a 100644
+index 3dcccca8ede9b203c24ba29b2020a583297b895c..272670750afe2d07e51f2f7589c5718a2c155ed4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -16,6 +16,8 @@ import java.util.concurrent.atomic.AtomicInteger;

patches/server/0014-Despawn-shulker-bullets-on-owner-death.patch

@@ -20,7 +20,7 @@ index 9eede8eb7fefc414f3a1207cd3ca2b33deb5ea13..ca344da743a7503795bdaeff0a1b14e0
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java b/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java
-index a38c02af71e0eca2d727342b31a2118d107cfb63..aef2cd823e6672395e365673cc83d2c39819d4ae 100644
+index da0b7ee796c335875914481a5deda5eef5ddd442..ab1127b384cfd8a39543003b692121cc2ed74b4e 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java
 @@ -218,6 +218,17 @@ public class ShulkerBullet extends Projectile {

patches/server/0015-Fix-MC-31819.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-31819
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 20c3d3c9d2150574e9b4761dc1bda11cee04862f..7d15ddcf7d2a7bcdd6a7bebfaef21b2b486c7b14 100644
+index 724329ded5d72eb230db392972d30e7ba4e69ceb..85578b0027d1e82936b07cc4b3a635644e2c4dd4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1974,6 +1974,11 @@ public abstract class Player extends LivingEntity {

patches/server/0016-lithium-collections.goals.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.goals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 8a70bc63e12838f45fa3eade74f2899438715886..93a97455587db28fed1b2fa7ee8063ad08c5120e 100644
+index 02978315bc2b828cc603ce7478408f3f82c249c2..d8ee71cb3afc0f63669d26c4160f7cd7ed2fd453 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 @@ -13,6 +13,7 @@ import java.util.function.Supplier;

patches/server/0017-Reduce-sensor-work.patch

@@ -7,7 +7,7 @@ Original project: Bloom-host/Petal
 Link: https://github.com/Bloom-host/Petal
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index aa7ef9bcd6caffa9b987ae4ae759f89358e3001d..fce06936d2af3e69db2b7ef485d929323d4935e7 100644
+index 02f4a2a0bfd66a557f5167ac9ccd13ff9f3dd763..de103337386b398dfae000ba84769ed35943d00d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1037,20 +1037,19 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0020-Fix-MC-2025.patch

@@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025
 Fix taken from Reddit: https://redd.it/8pgd4q
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c7846eb58611354b9be29ea9a478c076d3f16620..f0329205bdb1b389fc63a6787abf277016f7bac8 100644
+index 24cc1369b6561b8fb99f26253f7ba05be0a5d49b..ae41e6c3f3934d06ee913006cc5341ef87bd1bd9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2451,6 +2451,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2484,6 +2484,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  nbt.putBoolean("Purpur.FireImmune", immuneToFire);
              }
              // Purpur end
@@ -28,7 +28,7 @@ index c7846eb58611354b9be29ea9a478c076d3f16620..f0329205bdb1b389fc63a6787abf2770
              return nbt;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2528,6 +2539,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2561,6 +2572,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                          this.reapplyPosition();
                      }
  

patches/server/0024-Make-entity-goals-public.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make entity goals public
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 6c04c8e7776b2830ac368229da834532e8ce163e..97a65480a9eb1d67b243b39d8aa1d7c184accdf0 100644
+index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf630df9ea5c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -767,7 +767,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {

patches/server/0027-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Do not process chat/commands before player has joined
 
 
 diff --git a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-index 512afaa97e89e3beb92cf2ebc46248eddd22cf5c..b8fa8f551c95503be60f990099b2d41296ea91de 100644
+index 426ae4086adc0180e3f3ba06cf6c005476ca891e..02dc7f154098313ff58a688ac5080457bc108164 100644
 --- a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-@@ -162,4 +162,9 @@ public class DivineConfig {
+@@ -157,4 +157,9 @@ public class DivineConfig {
      private static void allowAnyUsername() {
          allowAnyUsername = getBoolean("settings.player.allow-any-username", allowAnyUsername);
      }
@@ -20,7 +20,7 @@ index 512afaa97e89e3beb92cf2ebc46248eddd22cf5c..b8fa8f551c95503be60f990099b2d412
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6638d769a34287d54b22e4416003556915e153f1..32d2e53a73f70d64db13a7da01c3157bb0cd7395 100644
+index bf74dd38b5d495f8d2ac6a2072fd95dbdd2f44e4..3034e1801efd1b855e29dac1e64f7c10d50cada8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile;
@@ -31,7 +31,7 @@ index 6638d769a34287d54b22e4416003556915e153f1..32d2e53a73f70d64db13a7da01c3157b
  import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry;
  import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
  import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-@@ -2312,6 +2313,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2315,6 +2316,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
              }); // Paper - push to main
              return Optional.empty();