Implement death messages for stonecutter and running with scissors

patches/server/0005-Component-related-conveniences.patch

@@ -102,6 +102,26 @@ index 042be2cf60a9d01698808d84f2e537a5eb952079..6ec5a8a52ec06be917f2ca682f5920ed
      public void broadcastMessage(Component message, ChatType type, UUID sender) {
          this.server.sendMessage(message, sender);
          Iterator iterator = this.players.iterator();
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..19d6165f266fcc39bc3533042109ef1b725ecb77 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+@@ -234,6 +234,15 @@ public class DamageSource {
+         return entityliving1 != null ? new TranslatableComponent(s1, new Object[]{entity.getDisplayName(), entityliving1.getDisplayName()}) : new TranslatableComponent(s, new Object[]{entity.getDisplayName()});
+     }
+ 
++    // Purpur start
++    public Component getLocalizedDeathMessage(String str, LivingEntity entity) {
++        net.kyori.adventure.text.Component name = io.papermc.paper.adventure.PaperAdventure.asAdventure(entity.getDisplayName());
++        net.kyori.adventure.text.minimessage.Template template = net.kyori.adventure.text.minimessage.Template.of("player", name);
++        net.kyori.adventure.text.Component component = net.kyori.adventure.text.minimessage.MiniMessage.get().parse(str, template);
++        return io.papermc.paper.adventure.PaperAdventure.asVanilla(component);
++    }
++    // Purpur end
++
+     public boolean isFire() {
+         return this.isFireSource;
+     }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 8ea81f6ac7503c68f0aea34802843bc545f46db0..605a0e9cf68a4f698ac03b3477585861aeb354c7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java

patches/server/0104-Stonecutter-damage.patch

@@ -4,6 +4,25 @@ Date: Mon, 5 Oct 2020 12:15:14 -0500
 Subject: [PATCH] Stonecutter damage
 
 
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+index 19d6165f266fcc39bc3533042109ef1b725ecb77..32bf8264fecb8873f3ffa0e57a4bb48b5517fb77 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+@@ -39,6 +39,14 @@ public class DamageSource {
+     public static final DamageSource FREEZE = (new DamageSource("freeze")).bypassArmor();
+     public static final DamageSource FALLING_STALACTITE = (new DamageSource("fallingStalactite")).damageHelmet();
+     public static final DamageSource STALAGMITE = (new DamageSource("stalagmite")).bypassArmor().setIsFall();
++    // Purpur start
++    public static final DamageSource STONECUTTER = (new DamageSource("stonecutter") {
++        @Override
++        public Component getLocalizedDeathMessage(LivingEntity entity) {
++            return getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgStonecutter, entity);
++        }
++    }).bypassArmor();
++    // Purpur end
+     private boolean damageHelmet;
+     private boolean bypassArmor;
+     private boolean bypassInvul;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0198b89d3ac768c826d5be22cde88004f3444d48..cd25a1e6671276ecb465a60ee969122fa5648ded 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
@@ -18,7 +37,7 @@ index 0198b89d3ac768c826d5be22cde88004f3444d48..cd25a1e6671276ecb465a60ee969122f
                  }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-index ec1c04f354236af24e137865b3b311ab8eb29ac4..46ef683e027f95bf39a42e0abba3a8e4dcd66740 100644
+index ec1c04f354236af24e137865b3b311ab8eb29ac4..7d3e7c5f8f9946c35384cf18a43efbcf62952228 100644
 --- a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
 @@ -93,4 +93,16 @@ public class StonecutterBlock extends Block {
@@ -31,7 +50,7 @@ index ec1c04f354236af24e137865b3b311ab8eb29ac4..46ef683e027f95bf39a42e0abba3a8e4
 +    public void stepOn(Level level, BlockPos pos, BlockState state, net.minecraft.world.entity.Entity entity) {
 +        if (level.purpurConfig.stonecutterDamage > 0.0F && entity instanceof net.minecraft.world.entity.LivingEntity) {
 +            org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = level.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-+            entity.hurt(net.minecraft.world.damagesource.DamageSource.CACTUS, level.purpurConfig.stonecutterDamage);
++            entity.hurt(net.minecraft.world.damagesource.DamageSource.STONECUTTER, level.purpurConfig.stonecutterDamage);
 +            org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null;
 +        }
 +        super.stepOn(level, pos, state, entity);
@@ -60,6 +79,37 @@ index 737d0405a195d322ffe9a57acadb9f6d645c03b8..d7bdf3c2a5b99ff7adb3e960ff356a1f
                  return BlockPathTypes.DAMAGE_OTHER;
              } else if (blockState.is(Blocks.HONEY_BLOCK)) {
                  return BlockPathTypes.STICKY_HONEY;
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 7be3a8ead9fc634ce990b689ac2cd2ae805030ea..159924aefae87f69492ecc0c93a638758f6632a5 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1033,6 +1033,10 @@ public class CraftEventFactory {
+                 cause = DamageCause.MAGIC;
+             } else if (source == DamageSource.IN_FIRE) {
+                 cause = DamageCause.FIRE;
++            // Purpur start
++            } else if (source == DamageSource.STONECUTTER) {
++                cause = DamageCause.CONTACT;
++            // Purpur end
+             } else {
+                 throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId));
+             }
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index f0051835d259ecfd0300653645c3942749a31937..161dc422a331d02132d5158efeef8ac2150a4d0f 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -176,6 +176,11 @@ public class PurpurConfig {
+         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
+     }
+ 
++    public static String deathMsgStonecutter = "<player> has sawed themself in half";
++    private static void deathMessages() {
++        deathMsgStonecutter = getString("settings.messages.death-message.stonecutter", deathMsgStonecutter);
++    }
++
+     public static String serverModName = "Purpur";
+     private static void serverModName() {
+         serverModName = getString("settings.server-mod-name", serverModName);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 index d10a5465fada1a1e7eb0dc0769a974da2a40746a..b26c67a506959757e1cb586bbdd4b0efd09e6382 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch

@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..5cebd7c16b82eea9dbf39c51c671bacb
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index f0051835d259ecfd0300653645c3942749a31937..e31f6b2dd2ed37070d6a4dde3671e70195384244 100644
+index 161dc422a331d02132d5158efeef8ac2150a4d0f..b366630f15171493b6e098be5c313fa0cd6b68b8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -228,6 +228,16 @@ public class PurpurConfig {
+@@ -233,6 +233,16 @@ public class PurpurConfig {
          cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
      }
  

patches/server/0119-EMC-Configurable-disable-give-dropping.patch

@@ -20,10 +20,10 @@ index a0dc380e90415de9068ea408d62a1605c82631df..fcd65feb5182b806b9aa8ecdcf11b386
                          itemStack.setCount(1);
                          ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e31f6b2dd2ed37070d6a4dde3671e70195384244..5d85d7d732728e53f75892caadf58086a9763956 100644
+index b366630f15171493b6e098be5c313fa0cd6b68b8..9834a5617a7532b7f8e3fc927d6c89fcf1ea0183 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -191,6 +191,11 @@ public class PurpurConfig {
+@@ -196,6 +196,11 @@ public class PurpurConfig {
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
  

patches/server/0127-Implement-TPSBar.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 3e568ce480d01e8ea7cbabd0929a99fb635de1ee..bc418143e63bfe9553f6853b89c6f5e8fb73c36e 100644
+index 40735237cc87a476d08f1ffcb1b67ce563091230..3156e7e43a5114aaaa1276b024f4ec45e797de88 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -208,6 +208,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 3e568ce480d01e8ea7cbabd0929a99fb635de1ee..bc418143e63bfe9553f6853b89c6f5e8
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 70dfa4d3b7a2c9b2a47000bf26100f174ab67d46..e759c7f4686a88fdfd15d9ecd6b891f60b026468 100644
+index 9e62e7ba26648d3ffa393f47a1de1d14182ceb36..dc95a1230ac6f86c32b3c6a8e4876725dbb3c033 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1124,6 +1124,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -105,10 +105,10 @@ index 5c11e91e1eebb0e24aaca9af323a9d5ecdc0a411..63e8397d6eff95ed81ab5d7cdb69495e
  
          entityplayer.awardStat(Stats.LEAVE_GAME);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 5d85d7d732728e53f75892caadf58086a9763956..574f01f5b31c5d8110e2e8a80ef61f4b794e3d21 100644
+index 9834a5617a7532b7f8e3fc927d6c89fcf1ea0183..4592b84984d35ee4cc63beebacad089c5a0317ed 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -196,6 +196,29 @@ public class PurpurConfig {
+@@ -201,6 +201,29 @@ public class PurpurConfig {
          disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
      }
  

patches/server/0142-Dont-run-with-scissors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e95c07f01730613f2df8a093b12e05b8d31a2409..2cbef1eca4a7e95b00773415ccaca7741ed860c8 100644
+index e95c07f01730613f2df8a093b12e05b8d31a2409..6ac5f27c24363814961f0494ca8ca42b4da28eff 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1587,6 +1587,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -14,7 +14,7 @@ index e95c07f01730613f2df8a093b12e05b8d31a2409..2cbef1eca4a7e95b00773415ccaca774
  
 +                                // Purpur Start
 +                                if (this.player.level.purpurConfig.dontRunWithScissors && this.player.isSprinting() && (isScissor(this.player.getItemInHand(InteractionHand.MAIN_HAND)) || isScissor(this.player.getItemInHand(InteractionHand.OFF_HAND))) && (int) (Math.random() * 10) == 0) {
-+                                    this.player.hurt(net.minecraft.world.damagesource.DamageSource.MAGIC, (float) this.player.level.purpurConfig.scissorsRunningDamage);
++                                    this.player.hurt(net.minecraft.world.damagesource.DamageSource.SCISSORS, (float) this.player.level.purpurConfig.scissorsRunningDamage);
 +                                    if (!org.purpurmc.purpur.PurpurConfig.dontRunWithScissors.isBlank()) this.player.sendActionBarMessage(org.purpurmc.purpur.PurpurConfig.dontRunWithScissors);
 +                                }
 +                                // Purpur End
@@ -35,8 +35,38 @@ index e95c07f01730613f2df8a093b12e05b8d31a2409..2cbef1eca4a7e95b00773415ccaca774
      private boolean isPlayerCollidingWithAnythingNew(LevelReader world, AABB box) {
          Iterable<VoxelShape> iterable = world.getCollisions(this.player, this.player.getBoundingBox().deflate(9.999999747378752E-6D));
          VoxelShape voxelshape = Shapes.create(box.deflate(9.999999747378752E-6D));
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+index 32bf8264fecb8873f3ffa0e57a4bb48b5517fb77..0f56c60962b9c61c72d05edc7d9b10e93a119329 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+@@ -46,6 +46,12 @@ public class DamageSource {
+             return getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgStonecutter, entity);
+         }
+     }).bypassArmor();
++    public static final DamageSource SCISSORS = (new DamageSource("scissors") {
++        @Override
++        public Component getLocalizedDeathMessage(LivingEntity entity) {
++            return getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgRunWithScissors, entity);
++        }
++    }).bypassArmor();
+     // Purpur end
+     private boolean damageHelmet;
+     private boolean bypassArmor;
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 159924aefae87f69492ecc0c93a638758f6632a5..ff7012efaa21510ddfbe20a0175b9f8be2f8cca2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1036,6 +1036,8 @@ public class CraftEventFactory {
+             // Purpur start
+             } else if (source == DamageSource.STONECUTTER) {
+                 cause = DamageCause.CONTACT;
++            } else if (source == DamageSource.SCISSORS) {
++                cause = DamageCause.SUICIDE;
+             // Purpur end
+             } else {
+                 throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 574f01f5b31c5d8110e2e8a80ef61f4b794e3d21..05a7c307da51d31f822730b03c83db9873296e25 100644
+index 4592b84984d35ee4cc63beebacad089c5a0317ed..2cd5c8823eb8215b3e2a6eb7dd34b752a480dbd0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -165,6 +165,7 @@ public class PurpurConfig {
@@ -47,13 +77,20 @@ index 574f01f5b31c5d8110e2e8a80ef61f4b794e3d21..05a7c307da51d31f822730b03c83db98
      private static void messages() {
          cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
          afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-@@ -174,6 +175,7 @@ public class PurpurConfig {
+@@ -174,11 +175,14 @@ public class PurpurConfig {
          creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
          demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
          pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
 +        dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
      }
  
+     public static String deathMsgStonecutter = "<player> has sawed themself in half";
++    public static String deathMsgRunWithScissors = "<player> slipped and fell on their shears";
+     private static void deathMessages() {
+         deathMsgStonecutter = getString("settings.messages.death-message.stonecutter", deathMsgStonecutter);
++        deathMsgRunWithScissors = getString("settings.messages.death-message.run-with-scissors", deathMsgRunWithScissors);
+     }
+ 
      public static String serverModName = "Purpur";
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 index dbd316e70d3de436e823a4e850a5adaa6c0e68b3..b6f506bb17369d542e594158e1ebd9bb4ae8d02e 100644

patches/server/0157-Allow-infinity-on-crossbows.patch

@@ -77,10 +77,10 @@ index 11c1eb0e0bc326b28dc0cab16f67c413cc52e98c..7073985656ae5b17a7489518747dc858
              return null;
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 05a7c307da51d31f822730b03c83db9873296e25..7687431598b8f40659d0f8add1f3c0709430cb2c 100644
+index 2cd5c8823eb8215b3e2a6eb7dd34b752a480dbd0..4a058214afcab26acaaf91c06a10e2cf77723d28 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -259,6 +259,7 @@ public class PurpurConfig {
+@@ -266,6 +266,7 @@ public class PurpurConfig {
      }
  
      public static boolean allowInfinityMending = false;
@@ -88,7 +88,7 @@ index 05a7c307da51d31f822730b03c83db9873296e25..7687431598b8f40659d0f8add1f3c070
      private static void enchantmentSettings() {
          if (version < 5) {
              boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -266,6 +267,7 @@ public class PurpurConfig {
+@@ -273,6 +274,7 @@ public class PurpurConfig {
              set("settings.enchantment.allow-infinite-and-mending-together", null);
          }
          allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);

patches/server/0163-Config-to-allow-for-unsafe-enchants.patch

@@ -75,10 +75,10 @@ index 31ac7e1e5cc37cd9abf0ffd0bab1402f51bffed9..fd8d102ac8e84c4bfe6f4431bd1088b8
          this.getOrCreateTag().put(key, element);
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 7687431598b8f40659d0f8add1f3c0709430cb2c..40f73fc7789d3baaa5d7ee4cef3677228d1fece7 100644
+index 4a058214afcab26acaaf91c06a10e2cf77723d28..286fa3ea8822b09dceebd26ebe87ec11270a246b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -260,6 +260,7 @@ public class PurpurConfig {
+@@ -267,6 +267,7 @@ public class PurpurConfig {
  
      public static boolean allowInfinityMending = false;
      public static boolean allowCrossbowInfinity = false;
@@ -86,7 +86,7 @@ index 7687431598b8f40659d0f8add1f3c0709430cb2c..40f73fc7789d3baaa5d7ee4cef367722
      private static void enchantmentSettings() {
          if (version < 5) {
              boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -268,6 +269,7 @@ public class PurpurConfig {
+@@ -275,6 +276,7 @@ public class PurpurConfig {
          }
          allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
          allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);

patches/server/0168-Config-to-change-max-number-of-bees.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to change max number of bees
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 5c784e1155c16dbbe1b75bb5bcb3d73793d146a3..e5a397ec31cbd3ae85f3c37519811f5869cddc5a 100644
+index b05ac56823feaf062b1418c9e6dbe4268225f00f..375f25807ca0f35784653d8fbe4e5086d7033e99 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -43,7 +43,7 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -18,10 +18,10 @@ index 5c784e1155c16dbbe1b75bb5bcb3d73793d146a3..e5a397ec31cbd3ae85f3c37519811f58
      public BeehiveBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.BEEHIVE, pos, state);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 40f73fc7789d3baaa5d7ee4cef3677228d1fece7..7c066e88919468219878615deae233e4ca977d54 100644
+index 286fa3ea8822b09dceebd26ebe87ec11270a246b..9a15cf1c2fd71d56062be77fd343881b0011768f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -225,6 +225,7 @@ public class PurpurConfig {
+@@ -232,6 +232,7 @@ public class PurpurConfig {
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
      public static boolean cryingObsidianValidForPortalFrame = false;
@@ -29,7 +29,7 @@ index 40f73fc7789d3baaa5d7ee4cef3677228d1fece7..7c066e88919468219878615deae233e4
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -256,6 +257,7 @@ public class PurpurConfig {
+@@ -263,6 +264,7 @@ public class PurpurConfig {
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
          cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);

patches/server/0171-Gamemode-extra-permissions.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Gamemode extra permissions
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 6e8111ef16439d2b3025ebe2a0418b245420bd88..c20c7c9a6eb299e1a8d3d3e9bdf986ea282dd98a 100644
+index c26435a6b5cdc61ae5d123dacea711a4a9f666d1..21b3532c29f2f1bcf1eb02a28ab107e9f6531393 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -195,6 +195,21 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
@@ -75,10 +75,10 @@ index 6cc517b394bafefce50d877761e5b2eee8e14c78..46ca899a7abddea108f6ff1b4ca14ca5
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "toggledownfall", "Allows the user to toggle rain on/off for a given world", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "defaultgamemode", "Allows the user to change the default gamemode of the server", PermissionDefault.OP, commands);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 7c066e88919468219878615deae233e4ca977d54..68f1ea235152b6a9e3bc09ae827a6ceb6fb108cd 100644
+index 9a15cf1c2fd71d56062be77fd343881b0011768f..f77735417b28f87c1f3ed74ae4fcd069f8bb4c65 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -208,6 +208,7 @@ public class PurpurConfig {
+@@ -215,6 +215,7 @@ public class PurpurConfig {
      public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
      public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
      public static int commandTPSBarTickInterval = 20;
@@ -86,7 +86,7 @@ index 7c066e88919468219878615deae233e4ca977d54..68f1ea235152b6a9e3bc09ae827a6ceb
      private static void commandSettings() {
          commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
          commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
-@@ -219,6 +220,7 @@ public class PurpurConfig {
+@@ -226,6 +227,7 @@ public class PurpurConfig {
          commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
          commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
          commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);

patches/server/0174-Configurable-broadcast-settings.patch

@@ -17,7 +17,7 @@ index 6f5b7650d45958284f7b5c675c1e32d4b7738494..842acb66c58a1ee66c595bd56afc1f94
                      // Paper end
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 152017d279a29ecdd69e1f7c4a9a96a0291e65ee..7bbe7349bbc3a5eaccdecf57bc7334d5dcfdfe2b 100644
+index a50d5342c5981a7ff5b4c56beea19da7e8a1b77c..6d643998ee32de7f96b94e10fbd0b08a75628978 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -910,6 +910,7 @@ public class ServerPlayer extends Player {
@@ -29,11 +29,11 @@ index 152017d279a29ecdd69e1f7c4a9a96a0291e65ee..7bbe7349bbc3a5eaccdecf57bc7334d5
                  if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
                      this.server.getPlayerList().broadcastToTeam(this, ichatbasecomponent);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 39840a49c3900e227f1410db07abdc98051a7269..96804df7f7e095d0ea0b9d01d8752fa293023ca3 100644
+index f77735417b28f87c1f3ed74ae4fcd069f8bb4c65..9cdb9a52850194ebe13c456f46efc22fb12b2b57 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -178,6 +178,18 @@ public class PurpurConfig {
+@@ -185,6 +185,18 @@ public class PurpurConfig {
-         dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
+         deathMsgRunWithScissors = getString("settings.messages.death-message.run-with-scissors", deathMsgRunWithScissors);
      }
  
 +    public static boolean advancementOnlyBroadcastToAffectedPlayer = false;

patches/server/0176-Hide-hidden-players-from-entity-selector.patch

@@ -59,10 +59,10 @@ index 35cc3bba20afd4a47160cc674415ba6a3a0ec0ec..2cba35dcc479ed9ad3e698aa2e02b4aa
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 077c2293a0982231904a32c55a789f6d3bc3b0f4..111efe9539cb8e70cb2302aa1c4045871509c324 100644
+index 9cdb9a52850194ebe13c456f46efc22fb12b2b57..2a190278fcf98ef8a00f9d6682bb17111f619cc6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -221,6 +221,7 @@ public class PurpurConfig {
+@@ -228,6 +228,7 @@ public class PurpurConfig {
      public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
      public static int commandTPSBarTickInterval = 20;
      public static boolean commandGamemodeRequiresPermission = false;
@@ -70,7 +70,7 @@ index 077c2293a0982231904a32c55a789f6d3bc3b0f4..111efe9539cb8e70cb2302aa1c404587
      private static void commandSettings() {
          commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
          commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
-@@ -233,6 +234,7 @@ public class PurpurConfig {
+@@ -240,6 +241,7 @@ public class PurpurConfig {
          commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
          commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
          commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);

patches/server/0183-Config-for-unverified-username-message.patch

@@ -18,7 +18,7 @@ index 33a29890435d6065a2cc4f8e8bf8209c01d5d114..b86d5e736d786ac3c74fec3ad1285400
                      }
                  } catch (AuthenticationUnavailableException authenticationunavailableexception) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 111efe9539cb8e70cb2302aa1c4045871509c324..a1a6f7ae168c3cd4cdc0a002c74c803024e41190 100644
+index 2a190278fcf98ef8a00f9d6682bb17111f619cc6..bd506b0c95594adc416e6faf3184c3f8afac78f9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -166,6 +166,7 @@ public class PurpurConfig {
@@ -36,4 +36,4 @@ index 111efe9539cb8e70cb2302aa1c4045871509c324..a1a6f7ae168c3cd4cdc0a002c74c8030
 +        unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
      }
  
-     public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
+     public static String deathMsgStonecutter = "<player> has sawed themself in half";

patches/server/0184-Make-anvil-cumulative-cost-configurable.patch

@@ -18,10 +18,10 @@ index 3f786be9c9efc069a3a1bc457f02421310941800..669093b7f531b4ff9d8348d0a08c8690
  
      public void setItemName(String newItemName) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a1a6f7ae168c3cd4cdc0a002c74c803024e41190..e978758dd04868217d1c136ff7dad8c48b97298b 100644
+index bd506b0c95594adc416e6faf3184c3f8afac78f9..ec2a14f8571aa58c782405edac7f100c9131e905 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -244,6 +244,7 @@ public class PurpurConfig {
+@@ -251,6 +251,7 @@ public class PurpurConfig {
      public static boolean enderChestPermissionRows = false;
      public static boolean cryingObsidianValidForPortalFrame = false;
      public static int beeInsideBeeHive = 3;
@@ -29,7 +29,7 @@ index a1a6f7ae168c3cd4cdc0a002c74c803024e41190..e978758dd04868217d1c136ff7dad8c4
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -276,6 +277,7 @@ public class PurpurConfig {
+@@ -283,6 +284,7 @@ public class PurpurConfig {
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
          cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
          beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);

patches/server/0193-Make-lightning-rod-range-configurable.patch

@@ -18,10 +18,10 @@ index fca42bb14e41e7e853af83a2f4b37d586b68c6fa..474bb004678d9482a3fc5c00b2bcf3f3
          return optional.map((blockposition1) -> {
              return blockposition1.above(1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e978758dd04868217d1c136ff7dad8c48b97298b..6be7293e6e368b2b05502b3e086cceb113a3cad4 100644
+index ec2a14f8571aa58c782405edac7f100c9131e905..1f48ae6381464f823650d2774fca1117f38d20e9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -245,6 +245,7 @@ public class PurpurConfig {
+@@ -252,6 +252,7 @@ public class PurpurConfig {
      public static boolean cryingObsidianValidForPortalFrame = false;
      public static int beeInsideBeeHive = 3;
      public static boolean anvilCumulativeCost = true;
@@ -29,7 +29,7 @@ index e978758dd04868217d1c136ff7dad8c48b97298b..6be7293e6e368b2b05502b3e086cceb1
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -278,6 +279,7 @@ public class PurpurConfig {
+@@ -285,6 +286,7 @@ public class PurpurConfig {
          cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
          beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
          anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);

patches/server/0203-Add-uptime-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index abf803d4627b4345c6a91763486320a484f8a81b..4c243155b4a4a5f69bcf0558574ac31b35bea971 100644
+index 3156e7e43a5114aaaa1276b024f4ec45e797de88..e787ccc3c21f7e966c1e291579bf7550ee6de696 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -208,6 +208,7 @@ public class Commands {
@@ -29,7 +29,7 @@ index dc95a1230ac6f86c32b3c6a8e4876725dbb3c033..022cf286342abe9f5349b70e096373a0
      public int autosavePeriod;
      public Commands vanillaCommandDispatcher;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 6be7293e6e368b2b05502b3e086cceb113a3cad4..64a8dad26d17a9f921d4fd57991dab955e08afb5 100644
+index 1f48ae6381464f823650d2774fca1117f38d20e9..bdad489cdcf21c951eba5fb295aaf1c1af563676 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -166,6 +166,7 @@ public class PurpurConfig {
@@ -48,7 +48,7 @@ index 6be7293e6e368b2b05502b3e086cceb113a3cad4..64a8dad26d17a9f921d4fd57991dab95
          unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
      }
  
-@@ -224,6 +226,15 @@ public class PurpurConfig {
+@@ -231,6 +233,15 @@ public class PurpurConfig {
      public static int commandTPSBarTickInterval = 20;
      public static boolean commandGamemodeRequiresPermission = false;
      public static boolean hideHiddenPlayersFromEntitySelector = false;
@@ -64,7 +64,7 @@ index 6be7293e6e368b2b05502b3e086cceb113a3cad4..64a8dad26d17a9f921d4fd57991dab95
      private static void commandSettings() {
          commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
          commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
-@@ -237,6 +248,15 @@ public class PurpurConfig {
+@@ -244,6 +255,15 @@ public class PurpurConfig {
          commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
          commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
          hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);

patches/server/0204-Structure-seed-options.patch

@@ -52,10 +52,10 @@ index 45f11284bf65081b3b2e8da85114efbe5efd5b42..354a923350cbfc76645136858e8e9628
          double d = (double)(context.config()).probability;
          return worldgenRandom.nextDouble() >= d ? false : context.validBiome().test(context.chunkGenerator().getNoiseBiome(QuartPos.fromBlock(context.chunkPos().getMiddleBlockX()), QuartPos.fromBlock(50), QuartPos.fromBlock(context.chunkPos().getMiddleBlockZ())));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 64a8dad26d17a9f921d4fd57991dab955e08afb5..ad8d92f04524fa6e7a7a4c390e8b744889dae968 100644
+index bdad489cdcf21c951eba5fb295aaf1c1af563676..19caecd693a02171606d731572c81e6bfcd2b9ec 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -194,6 +194,17 @@ public class PurpurConfig {
+@@ -201,6 +201,17 @@ public class PurpurConfig {
          deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
      }
  

patches/server/0208-Customizable-sleeping-actionbar-messages.patch

@@ -40,7 +40,7 @@ index 474bb004678d9482a3fc5c00b2bcf3f3a293f217..5a42fde11c219a1572bf31663487ff1f
                  }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ad8d92f04524fa6e7a7a4c390e8b744889dae968..e230f65d8599f1d6f8c567227859935a905426f8 100644
+index 19caecd693a02171606d731572c81e6bfcd2b9ec..d460f1186e1260855ad254b16b2748863946a20c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -168,6 +168,8 @@ public class PurpurConfig {
@@ -60,4 +60,4 @@ index ad8d92f04524fa6e7a7a4c390e8b744889dae968..e230f65d8599f1d6f8c567227859935a
 +        sleepingPlayersPercent = getString("settings.messages.sleeping-players-percent", sleepingPlayersPercent);
      }
  
-     public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
+     public static String deathMsgStonecutter = "<player> has sawed themself in half";

patches/server/0214-Add-compass-command.patch

@@ -59,10 +59,10 @@ index 6d643998ee32de7f96b94e10fbd0b08a75628978..e2e83d8b39ddb154c0e69b63d5b99664
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e230f65d8599f1d6f8c567227859935a905426f8..a75db67d2ed1d3440903396181b4cd6cf982f15d 100644
+index d460f1186e1260855ad254b16b2748863946a20c..209d563791695bfca5becdcdd0e088d88d2d354c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -239,6 +239,11 @@ public class PurpurConfig {
+@@ -246,6 +246,11 @@ public class PurpurConfig {
      public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
      public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
      public static int commandTPSBarTickInterval = 20;
@@ -74,7 +74,7 @@ index e230f65d8599f1d6f8c567227859935a905426f8..a75db67d2ed1d3440903396181b4cd6c
      public static boolean commandGamemodeRequiresPermission = false;
      public static boolean hideHiddenPlayersFromEntitySelector = false;
      public static String uptimeFormat = "<days><hours><minutes><seconds>";
-@@ -261,6 +266,13 @@ public class PurpurConfig {
+@@ -268,6 +273,13 @@ public class PurpurConfig {
          commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
          commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
          commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);

patches/server/0236-Config-for-Grindstones-ignoring-curses.patch

@@ -36,10 +36,10 @@ index 0bdf874ddb951daf8d469575a44144504472d12d..66d1b438227e004d7ffb6e7c5d0cd3e6
  
          EnchantmentHelper.setEnchantments(map, itemstack1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a75db67d2ed1d3440903396181b4cd6cf982f15d..3b07195c1255bdac9bdc8b1286edb5d5c1eb7cf4 100644
+index 209d563791695bfca5becdcdd0e088d88d2d354c..bf666e87d20de7df7470cc0618685f9711f59241 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -293,6 +293,7 @@ public class PurpurConfig {
+@@ -300,6 +300,7 @@ public class PurpurConfig {
      public static int beeInsideBeeHive = 3;
      public static boolean anvilCumulativeCost = true;
      public static int lightningRodRange = 128;
@@ -47,7 +47,7 @@ index a75db67d2ed1d3440903396181b4cd6cf982f15d..3b07195c1255bdac9bdc8b1286edb5d5
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -327,6 +328,7 @@ public class PurpurConfig {
+@@ -334,6 +335,7 @@ public class PurpurConfig {
          beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
          anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
          lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);

patches/server/0237-UPnP-Port-Forwarding.patch

@@ -67,10 +67,10 @@ index cd859eec6b0bee44bce83614e55709381baf5e6b..9412a238aa3538bf958cf3b5ce2be5a9
          // CraftBukkit start
          // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 3b07195c1255bdac9bdc8b1286edb5d5c1eb7cf4..5c9973374991446c39d6a84d745283eac3eb70ab 100644
+index bf666e87d20de7df7470cc0618685f9711f59241..9b07f3ff8ea84aa231e6b183bcd2947bb1b7e4bc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -378,4 +378,9 @@ public class PurpurConfig {
+@@ -385,4 +385,9 @@ public class PurpurConfig {
      private static void tpsCatchup() {
          tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
      }