Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@49db849 Updated Upstream (Paper)
PurpurMC/Purpur@a43711d Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
 
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT
-purpurRef = 5c0d2f785aa4928ae98a6757f4ca72e98b3de789
+purpurRef = a43711d9b044d53911c6759d9d919cb2dc732e6f
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -21,10 +21,10 @@ index 690086adcb1f87adc0b3ab664fde735ad3e1093a..e5eecd15040d4c0a7c8a0de166e5dddb
          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 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c1404b91e 100644
+index f1b74f7b12fc7b35815886501937725b65f8a8e3..5227e17dc150feba6ae42eb60c721bb6f36d6565 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -153,9 +153,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -154,9 +154,9 @@ public class WorldConfiguration extends ConfigurationPart {
  
          public ArmorStands armorStands;
  
@@ -37,7 +37,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
          }
  
          public Markers markers;
-@@ -261,8 +261,8 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -273,8 +273,8 @@ public class WorldConfiguration extends ConfigurationPart {
          public Behavior behavior;
  
          public class Behavior extends ConfigurationPart {
@@ -48,7 +48,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
              public int experienceMergeMaxValue = -1;
              public boolean shouldRemoveDragon = false;
              public boolean zombiesTargetTurtleEggs = true;
-@@ -286,7 +286,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -298,7 +298,7 @@ public class WorldConfiguration extends ConfigurationPart {
              public int playerInsomniaStartTicks = 72000;
              public int phantomsSpawnAttemptMinSeconds = 60;
              public int phantomsSpawnAttemptMaxSeconds = 119;
@@ -57,7 +57,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
              @BelowZeroToEmpty
              public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT;
              public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot;
-@@ -297,7 +297,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -309,7 +309,7 @@ public class WorldConfiguration extends ConfigurationPart {
              }
  
              public boolean disablePlayerCrits = false;
@@ -66,7 +66,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
              @Comment("Prevents merging items that are not on the same y level, preventing potential visual artifacts.")
              public boolean onlyMergeItemsHorizontally = false;
              public PillagerPatrols pillagerPatrols;
-@@ -393,7 +393,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -405,7 +405,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Environment extends ConfigurationPart {
          public boolean disableThunder = false;
          public boolean disableIceAndSnow = false;
@@ -75,7 +75,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
          public boolean disableExplosionKnockback = false;
          public boolean generateFlatBedrock = false;
          public FrostedIce frostedIce;
-@@ -439,7 +439,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -451,7 +451,7 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Maps extends ConfigurationPart {
          public int itemFrameCursorLimit = 128;
@@ -84,7 +84,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
      }
  
      public Fixes fixes;
-@@ -465,7 +465,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -477,7 +477,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Hopper extends ConfigurationPart {
          public boolean cooldownWhenFull = true;
          public boolean disableMoveEvent = false;
@@ -93,7 +93,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
      }
  
      public Collisions collisions;
-@@ -473,9 +473,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -485,9 +485,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Collisions extends ConfigurationPart {
          public boolean onlyPlayersCollide = false;
          public boolean allowVehicleCollisions = true;
@@ -105,7 +105,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
          public boolean allowPlayerCrammingDamage = false;
      }
  
-@@ -483,18 +483,31 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -495,18 +495,31 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Chunks extends ConfigurationPart {
          public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -147,7 +147,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
          });
          public boolean flushRegionsOnSave = false;
      }
-@@ -509,13 +522,15 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -521,13 +534,15 @@ public class WorldConfiguration extends ConfigurationPart {
      public TickRates tickRates;
  
      public class TickRates extends ConfigurationPart {
@@ -168,7 +168,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
      }
  
      @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
-@@ -524,7 +539,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -536,7 +551,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class FeatureSeeds extends ConfigurationPart {
          @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
          @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -177,7 +177,7 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
          @Setting(FeatureSeedsGeneration.FEATURES_KEY)
          public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
  
-@@ -545,9 +560,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -557,9 +572,9 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Misc extends ConfigurationPart {
          public int lightQueueSize = 20;
@@ -186,9 +186,9 @@ index 95e96fe8aa93efbbb2e0a7dd98377fdc4fe0e6dd..a8db2aba503de72aafb04c3ca2b2f06c
          public boolean showSignClickCommandFailureMsgsToPlayer = false;
 -        public RedstoneImplementation redstoneImplementation = RedstoneImplementation.VANILLA;
 +        public RedstoneImplementation redstoneImplementation = RedstoneImplementation.ALTERNATE_CURRENT; // DivineMC - optimize default values for configs
+         public AlternateCurrentUpdateOrder alternateCurrentUpdateOrder = AlternateCurrentUpdateOrder.HORIZONTAL_FIRST_OUTWARD;
          public boolean disableEndCredits = false;
-         public double maxLeashDistance = Leashable.LEASH_TOO_FAR_DIST;
+         public DoubleOr.Default maxLeashDistance = DoubleOr.Default.USE_DEFAULT;
-         public boolean disableSprintInterruptionOnAttack = false;
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 index 35ee62f6298b4d3bc2e294c263e7ffc862a176fa..c3b39063f4cca69ecf71708e2ad5d92bbafa5ea8 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java

patches/server/0004-Add-missing-purpur-config-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing purpur config options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 0f9196cc26e5c670a7f3454326b762f0303f633c..a8d4e315d66f71538a3f5330509732ca38d78907 100644
+index 62c62fd26660d8405378340315042d7b95ac7046..db8adf098181b5a40f1599fecc09ee7b0cf5310a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 @@ -160,6 +160,18 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -51,7 +51,7 @@ index e88d6d691bb176e33afeb294d735dfb2cbac12ff..c84739e82b7e35ad95f145a48b0da290
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index ee8c232ddaa518377bdfa54e83ffc04f7a2f2c9a..84c6a786658b16fe0535b4d99135ba58cec8d3a9 100644
+index 4c861b18fbfbae3cb2f1e3563393cfcf4005591c..418e8b9227789cc100c5972901bbe8c939c652d3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -166,6 +166,23 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
@@ -79,7 +79,7 @@ index ee8c232ddaa518377bdfa54e83ffc04f7a2f2c9a..84c6a786658b16fe0535b4d99135ba58
      protected Brain.Provider<Frog> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 0656e03bdd71f5d81853e817e136c8f11667c76e..51f12adc5f798ffb9de4ab87dc10728ee049497b 100644
+index 5cd69dd546f42e80a3d3e3a674f65c2ac39f3af9..12a7b075765c9cad88801547eace67c7002095f0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 @@ -95,6 +95,23 @@ public class Tadpole extends AbstractFish {
@@ -130,7 +130,7 @@ index b6f5281705ce4c7a755e3818cf6c4a2235a024f9..13d73b88e33d279ae96bf160fa25d47c
      protected void defineSynchedData(SynchedEntityData.Builder builder) {
          super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 6ee394c1616db9b0203b3e52e39234d064438654..e2bb33de1bd9f281941063f06c3f1decbfcecd3b 100644
+index 8e24cd9ed03e2f11da6f4fb2dd58dd9b9e5d7a06..e7c82656e46201ae144629945dcd33f14774b9de 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 @@ -150,6 +150,23 @@ public class Warden extends Monster implements VibrationSystem {
@@ -158,7 +158,7 @@ index 6ee394c1616db9b0203b3e52e39234d064438654..e2bb33de1bd9f281941063f06c3f1dec
      public Packet<ClientGamePacketListener> getAddEntityPacket(ServerEntity entityTrackerEntry) {
          return new ClientboundAddEntityPacket(this, entityTrackerEntry, this.hasPose(Pose.EMERGING) ? 1 : 0);
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-index 4cdf3b54187ebcb1f5ddfa6114386127a2846f01..72d146777a0310cb08157bf74e8b662598abeb3c 100644
+index c14019a131c90c699b8a76bada82592b66f0fa89..6f3fede6a51c6854dd93fe1462097ab38dd11123 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
 @@ -34,6 +34,9 @@ import org.bukkit.entity.HumanEntity;
@@ -180,7 +180,7 @@ index 4cdf3b54187ebcb1f5ddfa6114386127a2846f01..72d146777a0310cb08157bf74e8b6625
      }
  
      public ChestBoat(Level world, double d0, double d1, double d2) {
-@@ -178,7 +181,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -177,7 +180,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
      @Override
      public int getContainerSize() {

patches/server/0053-Fix-MC-119417.patch

@@ -7,10 +7,10 @@ Original bug on Mojira: https://bugs.mojang.com/browse/MC-119417
 Took here: https://github.com/Winds-Studio/Leaf/blob/ver/1.21/patches/server/0082-Fix-MC-119417.patch
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ceb9c794345922772a69a867a96531167e881d24..478720321d634ed08c816074faa4f2fbee87dd1b 100644
+index 4f72ce384f4c0dbae98effa89aed5c3bb802e635..66028dbd4eab45ab49a46ab09e81d4808adb1d3e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2252,6 +2252,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2256,6 +2256,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
                  this.removeEntitiesOnShoulder();