Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@c577b11 Milk keeps beneficial effects (#1147)

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sat, 8 Oct 2022 23:50:13 +0000
+Date: Sun, 9 Oct 2022 01:25:32 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original by Kevin Raneri <kevin.raneri@gmail.com>

patches/api/0002-Purpur-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sat, 8 Oct 2022 23:52:16 +0000
+Date: Sun, 9 Oct 2022 01:27:43 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original by PurpurMC Team

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sat, 8 Oct 2022 23:50:13 +0000
+Date: Sun, 9 Oct 2022 01:25:32 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Original by Kevin Raneri <kevin.raneri@gmail.com>

patches/server/0002-Purpur-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Sat, 8 Oct 2022 23:52:16 +0000
+Date: Sun, 9 Oct 2022 01:27:43 +0000
 Subject: [PATCH] Purpur Server Changes
 
 Original by PurpurMC Team
@@ -4461,7 +4461,7 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..5d6cddc221887be20ef75d688817dfe5
 
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9 100644
+index 26efc49b4530112c8bd3f580ce375ab4203c9609..ad4bd5fa9bcd085a1eb99c4da5fc95ebc126d028 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -44,6 +44,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;
@@ -4634,7 +4634,15 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
          }
 
          return d0;
-@@ -1408,13 +1441,13 @@ public abstract class LivingEntity extends Entity {
+@@ -1063,6 +1096,7 @@ public abstract class LivingEntity extends Entity {
+             for (flag = false; iterator.hasNext(); flag = true) {
+                 // CraftBukkit start
+                 MobEffectInstance effect = (MobEffectInstance) iterator.next();
++                if (cause == EntityPotionEffectEvent.Cause.MILK && !this.level.purpurConfig.milkClearsBeneficialEffects && effect.getEffect().isBeneficial()) continue; // Purpur
+                 EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
+                 if (event.isCancelled()) {
+                     continue;
+@@ -1408,13 +1442,13 @@ public abstract class LivingEntity extends Entity {
                  }
 
                  if (entity1 instanceof net.minecraft.world.entity.player.Player) {
@@ -4650,7 +4658,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
                          LivingEntity entityliving = entitywolf.getOwner();
 
                          if (entityliving != null && entityliving.getType() == EntityType.PLAYER) {
-@@ -1539,6 +1572,19 @@ public abstract class LivingEntity extends Entity {
+@@ -1539,6 +1573,19 @@ public abstract class LivingEntity extends Entity {
                  }
              }
 
@@ -4670,7 +4678,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
              org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
              EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
              event.setCancelled(itemstack == null);
-@@ -1699,7 +1745,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1699,7 +1746,7 @@ public abstract class LivingEntity extends Entity {
              boolean flag = false;
 
              if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -4679,23 +4687,23 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
                      BlockPos blockposition = this.blockPosition();
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
 
-@@ -1745,6 +1791,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1745,6 +1792,7 @@ public abstract class LivingEntity extends Entity {
 
          this.dropEquipment(); // CraftBukkit - from below
          if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
 +            if (!(source == DamageSource.CRAMMING && level.purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
              this.dropFromLootTable(source, flag);
              // Paper start
              final boolean prev = this.clearEquipmentSlots;
-@@ -1753,6 +1800,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1753,6 +1801,7 @@ public abstract class LivingEntity extends Entity {
              // Paper end
              this.dropCustomDeathLoot(source, i, flag);
              this.clearEquipmentSlots = prev; // Paper
 +            } // Purpur
          }
          // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
          org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
-@@ -1987,7 +2035,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1987,7 +2036,7 @@ public abstract class LivingEntity extends Entity {
          MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
          float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
 
@@ -4704,7 +4712,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
      }
 
      protected void playBlockFallSound() {
-@@ -2204,6 +2252,20 @@ public abstract class LivingEntity extends Entity {
+@@ -2204,6 +2253,20 @@ public abstract class LivingEntity extends Entity {
                  ((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F));
              }
 
@@ -4725,7 +4733,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
              if (f > 0 || !human) {
                  if (human) {
                      // PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
-@@ -2484,7 +2546,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2484,7 +2547,7 @@ public abstract class LivingEntity extends Entity {
 
      @Override
      protected void outOfWorld() {
@@ -4734,7 +4742,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
      }
 
      protected void updateSwingTime() {
-@@ -2673,7 +2735,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2673,7 +2736,7 @@ public abstract class LivingEntity extends Entity {
      }
 
      protected long lastJumpTime = 0L; // Paper
@@ -4743,15 +4751,15 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
          double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
          Vec3 vec3d = this.getDeltaMovement();
          // Paper start
-@@ -2831,6 +2893,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2831,6 +2894,7 @@ public abstract class LivingEntity extends Entity {
 
                      if (f3 > 0.0F) {
                          this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);
 +                        if (level.purpurConfig.elytraKineticDamage) // Purpur
                          this.hurt(DamageSource.FLY_INTO_WALL, f3);
                      }
                  }
-@@ -3027,10 +3090,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3027,10 +3091,10 @@ public abstract class LivingEntity extends Entity {
          }
 
          this.run += (f3 - this.run) * 0.3F;
@@ -4765,7 +4773,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
 
          // Paper start - stop large pitch and yaw changes from crashing the server
          this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
-@@ -3042,7 +3105,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3042,7 +3106,7 @@ public abstract class LivingEntity extends Entity {
          this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
          // Paper end
 
@@ -4774,7 +4782,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
          this.animStep += f2;
          if (this.isFallFlying()) {
              ++this.fallFlyTicks;
-@@ -3324,19 +3387,19 @@ public abstract class LivingEntity extends Entity {
+@@ -3324,19 +3388,19 @@ public abstract class LivingEntity extends Entity {
          }
 
          this.setDeltaMovement(d4, d5, d6);
@@ -4799,7 +4807,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
          if (this.jumping && this.isAffectedByFluids()) {
              double d7;
 
-@@ -3363,8 +3426,8 @@ public abstract class LivingEntity extends Entity {
+@@ -3363,8 +3427,8 @@ public abstract class LivingEntity extends Entity {
              this.noJumpDelay = 0;
          }
 
@@ -4810,7 +4818,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
          this.xxa *= 0.98F;
          this.zza *= 0.98F;
          this.updateFallFlying();
-@@ -3373,8 +3436,8 @@ public abstract class LivingEntity extends Entity {
+@@ -3373,8 +3437,8 @@ public abstract class LivingEntity extends Entity {
          // SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
          this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
          // SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -4821,7 +4829,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
          boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
          int i;
 
-@@ -3394,18 +3457,20 @@ public abstract class LivingEntity extends Entity {
+@@ -3394,18 +3458,20 @@ public abstract class LivingEntity extends Entity {
              this.hurt(DamageSource.FREEZE, (float) i);
          }
 
@@ -4847,7 +4855,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
                  Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                  Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                  io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3415,12 +3480,48 @@ public abstract class LivingEntity extends Entity {
+@@ -3415,12 +3481,48 @@ public abstract class LivingEntity extends Entity {
                      absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                  }
              }
@@ -4896,7 +4904,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..9dca0d694aa8fa7f8bec0d2504986085
      }
 
      public boolean isSensitiveToWater() {
-@@ -3441,7 +3542,16 @@ public abstract class LivingEntity extends Entity {
+@@ -3441,7 +3543,16 @@ public abstract class LivingEntity extends Entity {
                      int j = i / 10;
 
                      if (j % 2 == 0) {
@@ -21698,10 +21706,10 @@ index 0000000000000000000000000000000000000000..3cfbb4300e82cce409a7a0b53ef98987
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a6356d19f0fc664be523f19c2ea1704191a7a73a
+index 0000000000000000000000000000000000000000..a70caf9a80c39840ea70539d3eedc767fee64872
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -0,0 +1,3135 @@
+@@ -0,0 +1,3137 @@
 +package org.purpurmc.purpur;
 +
 +import gg.pufferfish.pufferfish.PufferfishConfig;
@@ -21835,6 +21843,7 @@ index 0000000000000000000000000000000000000000..a6356d19f0fc664be523f19c2ea17041
 +    public boolean fireballsBypassMobGriefing = false;
 +    public boolean imposeTeleportRestrictionsOnGateways = false;
 +    public boolean milkCuresBadOmen = true;
++    public boolean milkClearsBeneficialEffects = true;
 +    public boolean noteBlockIgnoreAbove = false;
 +    public boolean persistentDroppableEntityDisplayNames = false;
 +    public boolean persistentTileEntityDisplayNames = false;
@@ -21861,6 +21870,7 @@ index 0000000000000000000000000000000000000000..a6356d19f0fc664be523f19c2ea17041
 +        fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
 +        imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways);
 +        milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
++        milkClearsBeneficialEffects = getBoolean("gameplay-mechanics.milk-clears-beneficial-effects", milkClearsBeneficialEffects);
 +        noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
 +        persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
 +        persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);

patches/server/0004-Fix-Purpur-patches.patch

@@ -125,10 +125,10 @@ index 5dab2eea9e9c50e41c7971daefc3bbe819583207..7d310183e7715aac4f442948ef210b47
 
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a6356d19f0fc664be523f19c2ea1704191a7a73a..d3387f68b37a28331f3f28fe2162916d00869d1d 100644
+index a70caf9a80c39840ea70539d3eedc767fee64872..c9d94372a788eefb430b29e123dc37b4bf730f30 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1042,12 +1042,14 @@ public class PurpurWorldConfig {
+@@ -1044,12 +1044,14 @@ public class PurpurWorldConfig {
      public boolean allayRidableInWater = false;
      public boolean allayControllable = true;
      public List<String> allayRespectNBT = new ArrayList<>();
@@ -143,7 +143,7 @@ index a6356d19f0fc664be523f19c2ea1704191a7a73a..d3387f68b37a28331f3f28fe2162916d
      }
 
      public boolean axolotlRidable = false;
-@@ -1561,12 +1563,14 @@ public class PurpurWorldConfig {
+@@ -1563,12 +1565,14 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -158,7 +158,7 @@ index a6356d19f0fc664be523f19c2ea1704191a7a73a..d3387f68b37a28331f3f28fe2162916d
      }
 
      public boolean ghastRidable = false;
-@@ -2614,10 +2618,12 @@ public class PurpurWorldConfig {
+@@ -2616,10 +2620,12 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = false;
      public boolean tadpoleControllable = true;
@@ -171,7 +171,7 @@ index a6356d19f0fc664be523f19c2ea1704191a7a73a..d3387f68b37a28331f3f28fe2162916d
      }
 
      public boolean traderLlamaRidable = false;
-@@ -2828,10 +2834,12 @@ public class PurpurWorldConfig {
+@@ -2830,10 +2836,12 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = false;
      public boolean wardenControllable = true;

patches/server/0009-JettPack-Server-Patches.patch

@@ -896,7 +896,7 @@ index 7a4ade1a4190bf4fbb048919ae2be230f7b80fff..ab33194cb4d00e033632e753fb131d55
 
      protected void doRunTask(R task) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9..8b83f91f009f8d9c1b4ba92660ce9f7c34f55c1f 100644
+index ad4bd5fa9bcd085a1eb99c4da5fc95ebc126d028..e0a5f41477c63c801b3205b04ff3824c96c21311 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -577,11 +577,11 @@ public abstract class LivingEntity extends Entity {
@@ -922,7 +922,7 @@ index 9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9..8b83f91f009f8d9c1b4ba92660ce9f7c
 
      }
 
-@@ -2550,6 +2550,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2551,6 +2551,7 @@ public abstract class LivingEntity extends Entity {
      }
 
      protected void updateSwingTime() {

patches/server/0010-Slice-Server-Patches.patch

@@ -184,7 +184,7 @@ index 3441339e1ba5efb0e25c16fa13cb65d2fbdafc42..869b85b4c482d8bd0a48b948cffcf362
          }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ca9473b6d6824f932bc0c7c308b83fb6c8856aaa..e5769f53fc9a333eefaf5e78f9fde9ec649525db 100644
+index aa8f664ae1bba9729d146efadb8fd46ba03c2db9..0f385b2f877627e70f68b80e80e2754387619f76 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -879,6 +879,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -212,10 +212,10 @@ index ca9473b6d6824f932bc0c7c308b83fb6c8856aaa..e5769f53fc9a333eefaf5e78f9fde9ec
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8b83f91f009f8d9c1b4ba92660ce9f7c34f55c1f..6da27c8b1a77f22235301fa86e7a7936e5605797 100644
+index e0a5f41477c63c801b3205b04ff3824c96c21311..4bfc563ca6590407973b13433e1d1686261220b9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3154,7 +3154,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3155,7 +3155,7 @@ public abstract class LivingEntity extends Entity {
 
              ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
 

patches/server/0020-Optimize-default-configs.patch

@@ -71,7 +71,7 @@ index 88900f7a2077049cc5d78fe17314dbdf57d64a08..71d6bc1a5dd6fc4c28fb81b8c02bda87
          this.broadcastRconToOps = this.get("broadcast-rcon-to-ops", true);
          this.broadcastConsoleToOps = this.get("broadcast-console-to-ops", true);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 223dec38e73b57e9130287ec74bb1786df77eb92..400ec68e3cca48e6a048cec3caf439c722e51dd9 100644
+index 230f938438963523b0c559694932bf614bb04b96..bfb42e1536383d3083eece605a3c46530d0660ed 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -258,7 +258,7 @@ public class PurpurConfig {
@@ -84,10 +84,10 @@ index 223dec38e73b57e9130287ec74bb1786df77eb92..400ec68e3cca48e6a048cec3caf439c7
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6e4d83851f50c9c1c65726cc0cebdabb605f91a0..cb3418654b1eede2de788b57852bd8a80dff2a94 100644
+index c9d94372a788eefb430b29e123dc37b4bf730f30..b9ce818a4ac265787ae2a167c4ae0388f4987099 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -415,7 +415,7 @@ public class PurpurWorldConfig {
+@@ -417,7 +417,7 @@ public class PurpurWorldConfig {
      public boolean playerInvulnerableWhileAcceptingResourcePack = false;
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;

upstream-data

@@ -1,2 +1,2 @@
-purpur = ae430619b602ce9808386e5e77d2fde038475dca
+purpur = c577b117e789145a45f4ab22f74cfdc27f6586a6
 pufferfish = 9d9a0e1a32466455cd3c3eff5b673a9e177491d6