drop vanilla command permission fix since hasPermission(i, bukkitPermission) works as expected now

patches/server/0023-Fix-vanilla-command-permission-handler.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 28 Mar 2020 01:51:32 -0500
-Subject: [PATCH] Fix vanilla command permission handler
-
-
-diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index 39844531b03eb8a6c70700b4ecbf0ff1a557424d..632ae75cb3bbc7a3955872d14ad0fbc2459f32e8 100644
---- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-@@ -35,6 +35,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
-     private final boolean forks;
-     private Command<S> command;
-     public LiteralCommandNode<CommandSourceStack> clientNode = null; // Paper
-+    private String permission = null; public String getPermission() { return permission; } public void setPermission(String permission) { this.permission = permission; } // Purpur
-     // CraftBukkit start
-     public void removeCommand(String name) {
-         this.children.remove(name);
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 6035af2cf08353b3d3801220d8116d8611a0cd37..7774ab6a2e553a40def4bb4dceea9e5f58d31c1e 100644
---- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -94,6 +94,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
-     }
- 
-     public static String getPermission(CommandNode<CommandSourceStack> vanillaCommand) {
-+        if (vanillaCommand.getPermission() != null) return vanillaCommand.getPermission(); // Purpur
-         // Paper start
-         final String commandName;
-         if (vanillaCommand.getRedirect() == null) {

patches/server/0024-Disable-outdated-build-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f5266df43726a7805ee2664ed18a2dcf79ab6cde..ad4bc3f46bb6f02284ecf62e2701bb627e096b15 100644
+index 5758ce3033c2d4121970eb8757beabc1975c5c83..f1755b7f71672383566a9591348b5af5c658350b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -285,7 +285,7 @@ public class Main {

patches/server/0025-Giants-AI-settings.patch

@@ -120,7 +120,7 @@ index 2050230df7949e21f2158d2be5be885461afb66d..14b393c8b70a1aa950df9dcaef648a90
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1046f6de8a04c4368870596f90236fe01671173d..db811ee761ffd92a7eba4d0209894be54834387f 100644
+index 5320558a12d811afbea5f3a96c3ccce249e6962a..e697c549fd1097b071350a937acb097d39fbd4cd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -551,6 +551,10 @@ public class PurpurWorldConfig {

patches/server/0026-Zombie-horse-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b40bc54e80dadc8eb426ed6217b879631833e4d7..a7c153f957af48cf42ecbb01ada5f8f384c4e5e4 100644
+index 3d641a5721b90230c79dca9e43ccc6fa21f24946..575be84b580f7d7f4968bc4e2a69e0a067a3a617 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -830,10 +830,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -30,7 +30,7 @@ index b40bc54e80dadc8eb426ed6217b879631833e4d7..a7c153f957af48cf42ecbb01ada5f8f3
                          entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
                          this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index db811ee761ffd92a7eba4d0209894be54834387f..c9a38cf24041df4cdcbea59d9b1e09aa45d29e55 100644
+index e697c549fd1097b071350a937acb097d39fbd4cd..5d390156e36b953ade9b009b17332c2907e30b3c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1481,6 +1481,7 @@ public class PurpurWorldConfig {

patches/server/0027-Charged-creeper-naturally-spawn.patch

@@ -24,7 +24,7 @@ index 50fa28f8348625be15e93800e2c071e243afd39a..76d796600411144b73d1e7e67f70bb03
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c9a38cf24041df4cdcbea59d9b1e09aa45d29e55..f4a8e143ba35e36e6d5fb417e249feb3d4e5a7da 100644
+index 5d390156e36b953ade9b009b17332c2907e30b3c..3f994f5563950ebcd23c077e21f3ad691f900762 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -342,6 +342,7 @@ public class PurpurWorldConfig {

patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch

@@ -33,7 +33,7 @@ index ebb85ac5b77450a1ae91c986512125814fa0907f..620cf2c9927648804155495a908df1d3
          int i = world.getRandom().nextInt(100);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f4a8e143ba35e36e6d5fb417e249feb3d4e5a7da..238f1a5bb2f2c826f71c11b7718cd4b64930565d 100644
+index 3f994f5563950ebcd23c077e21f3ad691f900762..ca4f635ac65dcbdf5ebbe8d351623f64dded41e0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -985,6 +985,8 @@ public class PurpurWorldConfig {

patches/server/0030-Tulips-change-fox-type.patch

@@ -75,7 +75,7 @@ index 5de86c59bf857e6697bb768e3dd71a05739fb3d2..d5f536eb87163c946815ace610ba99ad
      // Paper start - Cancellable death event
      protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 238f1a5bb2f2c826f71c11b7718cd4b64930565d..93bdefe8ec286f24df65f72c246673a8833d3050 100644
+index ca4f635ac65dcbdf5ebbe8d351623f64dded41e0..470833e60081dd32a58d5efacad1ecff5b5b1812 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -506,6 +506,7 @@ public class PurpurWorldConfig {

patches/server/0031-Breedable-Polar-Bears.patch

@@ -59,7 +59,7 @@ index 90e5114a5c1a341d0ac64d72d6306ddeb09cb728..69a0e50a4f136a3e799f8fc079bd931a
          this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 93bdefe8ec286f24df65f72c246673a8833d3050..63d0bd7b55d57b1dbdc8a319709e5d8ba2c1c8d5 100644
+index 470833e60081dd32a58d5efacad1ecff5b5b1812..5eaf43ea5d983db45b95acb5c9e5e97e79606785 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -957,6 +957,8 @@ public class PurpurWorldConfig {

patches/server/0032-Chickens-can-retaliate.patch

@@ -51,7 +51,7 @@ index 5207a2a8c06cd413e1d62c5eec7a232dce952b8b..da281eb1355fd753dfdb69cee1366181
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 63d0bd7b55d57b1dbdc8a319709e5d8ba2c1c8d5..47bd9c45b4a560b1fcc01eee9606afef7416f70d 100644
+index 5eaf43ea5d983db45b95acb5c9e5e97e79606785..cefd5086a7fef31a88ed4781b6d0bdbd014d36c6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -296,6 +296,7 @@ public class PurpurWorldConfig {

patches/server/0033-Add-option-to-set-armorstand-step-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a0f63263a2439df93757309a6d9f6394abf81073..af6da7a9b93ef808759c7e213354ebfeed7e7a77 100644
+index 8c158da219c3ee91942ae93454317cfe87641f0d..a332f75440b336f371a30f9a6d6d9a1662fff5bd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -319,7 +319,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -30,7 +30,7 @@ index 3677dd991ae73428984e62e4d6fb757317987887..697d6d6cca0a1c8df9c5bf6852495130
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 47bd9c45b4a560b1fcc01eee9606afef7416f70d..7fe6efbed2bd5f9a9d5b9a8ff5118a799cda4d11 100644
+index cefd5086a7fef31a88ed4781b6d0bdbd014d36c6..09fd86fd7b5a73c65301a7d23e559acf468fd3de 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -92,6 +92,11 @@ public class PurpurWorldConfig {

patches/server/0034-Cat-spawning-options.patch

@@ -51,7 +51,7 @@ index 5f407535298a31a34cfe114dd863fd6a9b977707..29c7e33fe961020e5a0007287fe9b663
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7fe6efbed2bd5f9a9d5b9a8ff5118a799cda4d11..47106d83ed3c1d4fef75cb3e77b8dc87f936bde5 100644
+index 09fd86fd7b5a73c65301a7d23e559acf468fd3de..21fec77f9cbbac41b92450cf7fd4ffc53efc27c3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -269,6 +269,9 @@ public class PurpurWorldConfig {

patches/server/0035-Cows-eat-mushrooms.patch

@@ -114,7 +114,7 @@ index e24173dcd6f083a3ae61edcf71bb7236d644a422..b7a0ee0e055d12e36b411859211367c9
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 47106d83ed3c1d4fef75cb3e77b8dc87f936bde5..5d3e7a0a1fa5b84badd43fb9d474e3c10de35868 100644
+index 21fec77f9cbbac41b92450cf7fd4ffc53efc27c3..068e387bdda6d7fe44fafd54aaee66eb44ff4380 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -339,6 +339,7 @@ public class PurpurWorldConfig {

patches/server/0037-Pigs-give-saddle-back.patch

@@ -27,7 +27,7 @@ index 17cd8463fa5b601946782174f0a0a77a93aacf4d..8734738ce69e2e776b80a4695fce3bcf
              if (!this.level.isClientSide) {
                  player.startRiding(this);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5d3e7a0a1fa5b84badd43fb9d474e3c10de35868..b2851cd99429671d41264b306321552ed2caebef 100644
+index 068e387bdda6d7fe44fafd54aaee66eb44ff4380..7b1387f46691bad7d092fb82e3311c309e0be76b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -908,6 +908,7 @@ public class PurpurWorldConfig {

patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch

@@ -32,7 +32,7 @@ index 7da9fcf10e6480a71d7a3e9934bb91320cac227e..6c6e020522261ca5bbc47a59c25d3e98
              this.forceDrops = false; // CraftBukkit
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b2851cd99429671d41264b306321552ed2caebef..4a7f80f623d30a3781c04e05aa1bcf57f47caab2 100644
+index 7b1387f46691bad7d092fb82e3311c309e0be76b..6c227e9bebd4b6f44ad7da552686468180709f92 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1171,6 +1171,8 @@ public class PurpurWorldConfig {

patches/server/0039-Ender-dragon-always-drop-full-exp.patch

@@ -18,7 +18,7 @@ index a23458734a192425ddbec9b114d8485d8e7a2bd3..178c01444b7894833265c21a50ff6805
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4a7f80f623d30a3781c04e05aa1bcf57f47caab2..d0ce35d161498220eb1b0ce7ff8d0abd8a06fc35 100644
+index 6c227e9bebd4b6f44ad7da552686468180709f92..61afa4ef024e6bb9b48029aeb42977d977a41620 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -452,6 +452,7 @@ public class PurpurWorldConfig {

patches/server/0040-Signs-editable-on-right-click.patch

@@ -50,7 +50,7 @@ index aface9a9697095a29edaf73c9cdabc2c1414b9d7..1a04d0a601b8e481dd6e2592b849b907
                  } else {
                      return InteractionResult.PASS;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d0ce35d161498220eb1b0ce7ff8d0abd8a06fc35..8db5d37e22bc3c20bf9c8f0737968c39d475db9f 100644
+index 61afa4ef024e6bb9b48029aeb42977d977a41620..485925e025c5b374b9bbd183a007380eed0c663e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -151,6 +151,11 @@ public class PurpurWorldConfig {

patches/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch

@@ -18,7 +18,7 @@ index 34d744837e599633a3c2c0b72f253bb0e157f226..fce9ebcaaac18ecee24c7091ea77a32a
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8db5d37e22bc3c20bf9c8f0737968c39d475db9f..7b0829e64b04affe1af155419722c78a187ff216 100644
+index 485925e025c5b374b9bbd183a007380eed0c663e..028581cd6f36f267c81e5c8d09aa6be0172c8691 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -151,6 +151,11 @@ public class PurpurWorldConfig {

patches/server/0042-Minecart-settings-and-WASD-controls.patch

@@ -149,7 +149,7 @@ index 505503a3f59d4b747649275c6f6faa504b7c7b64..532a9920bccfc90ee75ac21714812e88
      protected final float explosionResistance;
      protected final boolean isRandomlyTicking;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7b0829e64b04affe1af155419722c78a187ff216..4ed7b12a08df116807be89123b7b9b689eace49a 100644
+index 028581cd6f36f267c81e5c8d09aa6be0172c8691..49d8e35b254e0df25963f7247326625928ed89e1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,6 +97,68 @@ public class PurpurWorldConfig {

patches/server/0043-Disable-loot-drops-on-death-by-cramming.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cf7ac9f5e18921723b0a8cfd0ed8a829d73e1fd4..5ce0906f891f9465eea4dc8c574b83ccc937f80c 100644
+index ad1591644a429b33c042e84a0114fe36bbcc6ec4..161d52ff7b303f5f1eb5f094a63ed63e06d11d08 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1756,6 +1756,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -25,7 +25,7 @@ index cf7ac9f5e18921723b0a8cfd0ed8a829d73e1fd4..5ce0906f891f9465eea4dc8c574b83cc
          // 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, () -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4ed7b12a08df116807be89123b7b9b689eace49a..6cfd8e222d432ffc23eeb21db240a21e1e52f678 100644
+index 49d8e35b254e0df25963f7247326625928ed89e1..2495ef7023aabb704d47e6b35c100d24828f0208 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,6 +97,11 @@ public class PurpurWorldConfig {

patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch

@@ -28,7 +28,7 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
  
          return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6cfd8e222d432ffc23eeb21db240a21e1e52f678..58ada439e2d02383573c69859f48a2f6286a8899 100644
+index 2495ef7023aabb704d47e6b35c100d24828f0208..ac1cc7a535f76d84877c7f4cb047ddb41c089845 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -98,8 +98,10 @@ public class PurpurWorldConfig {

patches/server/0048-Configurable-TPS-Catchup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c4f8caf7001bb022117466ce723a9ac3ada03d6b..ffc045d1bf40e620fb8364ac8694f39afdb9067b 100644
+index 6cdcd4f105b15f10d60499572f6f4f830565513e..ceaafede643bac0b6714df3d5475b4cb03b2eaed 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1178,7 +1178,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0049-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch

@@ -18,7 +18,7 @@ index db151bf624095014c99d78b4f6748d2c3792abea..fb10fc5a5aa3b6d6220694041778bfd3
                  if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
                      this.spawnAtLocation(this.getPickupItem(), 0.1F);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 58ada439e2d02383573c69859f48a2f6286a8899..65ab2e13ac14ced0272748ff79cc249fdeef3c95 100644
+index ac1cc7a535f76d84877c7f4cb047ddb41c089845..acc6334ecb3523fa9bf76c53b823a6d848ba88a7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -99,9 +99,11 @@ public class PurpurWorldConfig {

patches/server/0050-Add-enderman-and-creeper-griefing-controls.patch

@@ -38,7 +38,7 @@ index 79a5d800434b648c77f25e0d1be8e14b94c30f68..b24d890fb9a85434d612c57b4a876365
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 65ab2e13ac14ced0272748ff79cc249fdeef3c95..85945024793eebecaac97f76766b08c95bdd0f92 100644
+index acc6334ecb3523fa9bf76c53b823a6d848ba88a7..39d293b0007e13a12bc20f6e958038b328285c03 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -439,6 +439,7 @@ public class PurpurWorldConfig {

patches/server/0051-Villagers-follow-emerald-blocks.patch

@@ -54,7 +54,7 @@ index 71212ecb84bdbf838b4a5fbefbe9cfa6343542c4..8bbf7dc66fb225d20fc68d858ce5ed33
          this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
          this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 85945024793eebecaac97f76766b08c95bdd0f92..c95c10551e45993eb8b8402db1ce1b4a5afe9872 100644
+index 39d293b0007e13a12bc20f6e958038b328285c03..10045705f2a8c9af4df59fff7125c5a137bbf14d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1437,6 +1437,7 @@ public class PurpurWorldConfig {

patches/server/0052-Allow-leashing-villagers.patch

@@ -49,7 +49,7 @@ index 8bbf7dc66fb225d20fc68d858ce5ed339482b1ef..559bad9524a00a5357973f30d54b0f1a
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c95c10551e45993eb8b8402db1ce1b4a5afe9872..46fa35c5defbf98e34c611a87b3733836907bb54 100644
+index 10045705f2a8c9af4df59fff7125c5a137bbf14d..422d784c62423933b78a624292d4bf9fa78358f1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1438,6 +1438,7 @@ public class PurpurWorldConfig {

patches/server/0053-Implement-infinite-liquids.patch

@@ -67,7 +67,7 @@ index 82e85fbbd45244d02df90fa00c9046e7f51275a2..ec6c63075306f9e5389e83641d2c8a82
      @Override
      protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 46fa35c5defbf98e34c611a87b3733836907bb54..22bf8f3679aaaa6d972c49c439c8f27a9acfef12 100644
+index 422d784c62423933b78a624292d4bf9fa78358f1..2db284e2c4a4bd22c964c2ed39a54797b6d22e35 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -227,6 +227,11 @@ public class PurpurWorldConfig {

patches/server/0054-Make-lava-flow-speed-configurable.patch

@@ -18,7 +18,7 @@ index e965d2cafdd887a7c61058ba2931596709e5aaa2..3a04cb4c646c07abf4338c70c865a4c4
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 22bf8f3679aaaa6d972c49c439c8f27a9acfef12..ebd4d17fca246502b5aab101254d17b7efcde365 100644
+index 2db284e2c4a4bd22c964c2ed39a54797b6d22e35..3f3bb568d6991c00335f0c48a7d28663c3031aba 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -228,8 +228,12 @@ public class PurpurWorldConfig {

patches/server/0055-Add-player-death-exp-control-options.patch

@@ -32,7 +32,7 @@ index 05106a3bd2284d1ab25067241248238bb69d4610..cd5d9b5e6853cebb556c347ebdcb0ec9
              return 0;
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ebd4d17fca246502b5aab101254d17b7efcde365..bbb69fe3b60c2123f23bc7999cb8939ebcb4bb70 100644
+index 3f3bb568d6991c00335f0c48a7d28663c3031aba..0cd282a9c4ace413c6fe66c3bafc2137573f529f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -175,6 +175,8 @@ public class PurpurWorldConfig {

patches/server/0056-Configurable-void-damage-height-and-damage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index af6da7a9b93ef808759c7e213354ebfeed7e7a77..49956239c2f9d0dcbc44352974a8d00e09a965a2 100644
+index a332f75440b336f371a30f9a6d6d9a1662fff5bd..12642555cc6a57315740bd1c8911432db5b0b225 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -893,7 +893,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -18,7 +18,7 @@ index af6da7a9b93ef808759c7e213354ebfeed7e7a77..49956239c2f9d0dcbc44352974a8d00e
              && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
              // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5ce0906f891f9465eea4dc8c574b83ccc937f80c..3949c313203f60c9dc288a510f43e1fbc55cc535 100644
+index 161d52ff7b303f5f1eb5f094a63ed63e06d11d08..f55f39536356224438b52b2201ec7f66680865c8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2462,7 +2462,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -31,7 +31,7 @@ index 5ce0906f891f9465eea4dc8c574b83ccc937f80c..3949c313203f60c9dc288a510f43e1fb
  
      protected void updateSwingTime() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bbb69fe3b60c2123f23bc7999cb8939ebcb4bb70..79861cc30db69fcd41890da881fc8713fce25935 100644
+index 0cd282a9c4ace413c6fe66c3bafc2137573f529f..3c6025ff4fffdfd5f45011a1b65bf27323031a5c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -100,10 +100,14 @@ public class PurpurWorldConfig {

patches/server/0057-Add-canSaveToDisk-to-Entity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3b62c02aaf5354a52eeb1b10c195d1d6619e8175..7b9f92b3e42146ac33fd72ca943ed91fba4992ad 100644
+index 12642555cc6a57315740bd1c8911432db5b0b225..2c624a1779ada0c89ce0eb13234a4924bb16b9e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4792,5 +4792,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0058-Dispenser-curse-of-binding-protection.patch

@@ -43,7 +43,7 @@ index d7a0cbde8f8c99276307502674c71463fbe7e89c..3500c56cb85d8c76b2acd77976d374ea
              // CraftBukkit start
              Level world = pointer.getLevel();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 79861cc30db69fcd41890da881fc8713fce25935..e089e59365459966dcae4108b908200534e9858d 100644
+index 3c6025ff4fffdfd5f45011a1b65bf27323031a5c..b94467efbde7113bac462a0c698a95643beff41d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -230,6 +230,11 @@ public class PurpurWorldConfig {

patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch

@@ -17,7 +17,7 @@ index 5095e47b4910167235afdd8f1a7e9c45124ecadb..fb8f2d0a15c7a56c8e75b8fda781bf36
              } else {
                  return Boat.Status.IN_AIR;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e089e59365459966dcae4108b908200534e9858d..8f1b86b3511615281aca45cf7ffba506bbd09e0d 100644
+index b94467efbde7113bac462a0c698a95643beff41d..06f0e13063fc8e5438bce551c88b8d3b7b12d6d9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,12 +97,14 @@ public class PurpurWorldConfig {

patches/server/0063-Item-entity-immunities.patch

@@ -115,7 +115,7 @@ index a925b5c490e7129b27370aa57b5fad1cf05530c6..09001578b88658c44d0661d340a0ee0f
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7a20e3b127edf85de93d1ea0d1dbee3a06f11e43..2802191b8582840532e0774369082bca487a081d 100644
+index 67ffbf096e4fcd29266eb329451213c72415e439..0ea436e503d76a7ee74c8ef30722dfd06ed7449f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -127,6 +127,49 @@ public class PurpurWorldConfig {

patches/server/0064-Add-ping-command.patch

@@ -37,7 +37,7 @@ index 01ac09bda83703c16aed64133096377d7113693e..27b35e12eafd3ee735fcea201c9d371c
      public static String serverModName = "Purpur";
 diff --git a/src/main/java/org/purpurmc/purpur/command/PingCommand.java b/src/main/java/org/purpurmc/purpur/command/PingCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7c57e812451320da5c97008dd36f74856fec7c8
+index 0000000000000000000000000000000000000000..5e89694a7f01d9b09c7f75745f8faa4c5748c173
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/command/PingCommand.java
 @@ -0,0 +1,32 @@
@@ -57,12 +57,12 @@ index 0000000000000000000000000000000000000000..b7c57e812451320da5c97008dd36f748
 +public class PingCommand {
 +    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
 +        dispatcher.register(Commands.literal("ping")
-+                .requires((listener) -> listener.hasPermission(2))
++                .requires((listener) -> listener.hasPermission(2, "bukkit.command.ping"))
 +                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
 +                .then(Commands.argument("targets", EntityArgument.players())
 +                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
 +                )
-+        ).setPermission("bukkit.command.ping");
++        );
 +    }
 +
 +    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {

patches/server/0065-Add-demo-command.patch

@@ -38,7 +38,7 @@ index 27b35e12eafd3ee735fcea201c9d371c2480e4da..fdcffdc618fcbc2413f6e6949d82ed1f
  
 diff --git a/src/main/java/org/purpurmc/purpur/command/DemoCommand.java b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..83b3d1fb934d417702fc280e679f88d80f63cff2
+index 0000000000000000000000000000000000000000..cb76bb1345738084e4f5797229fd04bd65e8e0f6
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java
 @@ -0,0 +1,34 @@
@@ -58,12 +58,12 @@ index 0000000000000000000000000000000000000000..83b3d1fb934d417702fc280e679f88d8
 +public class DemoCommand {
 +    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
 +        dispatcher.register(Commands.literal("demo")
-+                .requires((listener) -> listener.hasPermission(2))
++                .requires((listener) -> listener.hasPermission(2, "bukkit.command.demo"))
 +                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
 +                .then(Commands.argument("targets", EntityArgument.players())
 +                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
 +                )
-+        ).setPermission("bukkit.command.demo");
++        );
 +    }
 +
 +    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {

patches/server/0066-Add-credits-command.patch

@@ -38,7 +38,7 @@ index fdcffdc618fcbc2413f6e6949d82ed1f138086b1..28711abdabec6894faefb3a5bcff503c
      }
 diff --git a/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2189ca24f9fe53ad20ffba73ea73f6a0dc7891b8
+index 0000000000000000000000000000000000000000..8ea09a5154a566b310648ebc32f6840c510a4eba
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java
 @@ -0,0 +1,34 @@
@@ -58,12 +58,12 @@ index 0000000000000000000000000000000000000000..2189ca24f9fe53ad20ffba73ea73f6a0
 +public class CreditsCommand {
 +    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
 +        dispatcher.register(Commands.literal("credits")
-+                .requires((listener) -> listener.hasPermission(2))
++                .requires((listener) -> listener.hasPermission(2, "bukkit.command.credits"))
 +                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
 +                .then(Commands.argument("targets", EntityArgument.players())
 +                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
 +                )
-+        ).setPermission("bukkit.command.credits");
++        );
 +    }
 +
 +    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {

patches/server/0067-Configurable-jockey-options.patch

@@ -167,7 +167,7 @@ index 2df1aa1af12b403e9cd87d61b2ff1516f754f589..f2c690c92dd2bf55f986f629ed79b76f
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2802191b8582840532e0774369082bca487a081d..c362dbe806269a04765babafa0866b774ed396a1 100644
+index 0ea436e503d76a7ee74c8ef30722dfd06ed7449f..d98383a21bb7fbc64525e701add25f8d32499e9a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -590,6 +590,9 @@ public class PurpurWorldConfig {

patches/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -258,7 +258,7 @@ index e271555ac03fcbb565a7fe08efdc9a6036164e74..fd02dfb905c71fa10e0830cf0a02d4b6
  
          private float speed = 0.1F;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c362dbe806269a04765babafa0866b774ed396a1..988e7255df7f32dff84f1d2abc2ec642095e3d58 100644
+index d98383a21bb7fbc64525e701add25f8d32499e9a..20573f2979277aa53f5377974ad910ec4428c435 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1067,6 +1067,9 @@ public class PurpurWorldConfig {

patches/server/0069-Add-phantom-spawning-options.patch

@@ -40,7 +40,7 @@ index e8ae4449696d73c8c9b8b27d4d2e20db933a72cc..f55c50f6637a4f930b15565d6ac82bb4
                                              for (int l = 0; l < k; ++l) {
                                                  // Paper start
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 988e7255df7f32dff84f1d2abc2ec642095e3d58..cf0842e65e1360d6860f4b519631a71a91c40145 100644
+index 20573f2979277aa53f5377974ad910ec4428c435..f3502992e3c7eaa955c793acce3b8fc07e7c9a93 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1070,6 +1070,12 @@ public class PurpurWorldConfig {

patches/server/0071-Implement-respawn-anchor-explosion-options.patch

@@ -18,7 +18,7 @@ index bcea8af63b9911c36873290e5c34567b1eeaacf4..a81fe948398a4d65929d75c821177f09
  
      public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8adb2b6094da7c1d865b3cf78c2f2dd7f810be5b..f3e0e2096ffbc6d2577bf1ffa34930855cd94102 100644
+index b647527fe6214ca803fad96a8d739811dd2a3a06..482c145bb6d24de52c31bfa44d95f36428cabb7d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -330,6 +330,27 @@ public class PurpurWorldConfig {

patches/server/0073-Allow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 112d830b024bd67297d24c030e7f02450be5eecf..9ec106d3e550eba93ca154094a3b51aa42732d88 100644
+index ca23fe56e7ccc0ee4fcb8bb2c801dd0360b92e8a..f85084bde6f29a8ecd3d660e55916874f8b7d38b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1341,13 +1341,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0074-Entity-lifespan.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9ec106d3e550eba93ca154094a3b51aa42732d88..2cc00ca01f40e1509d82bfb18ddc8c17ab816e2e 100644
+index f85084bde6f29a8ecd3d660e55916874f8b7d38b..4ddd14db772f003f603a4965166a3f939327e330 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2854,6 +2854,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0076-Squid-EAR-immunity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity
 
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2cbab8dc920fff0d1573072b791f39debd61a710..6b2a2b898d8a4b75f7c9d1ec7112e4f748413e95 100644
+index 8a0d0406440a43683641dcd6e43f75da5db9c734..b7e811c786db1a4749acdc9309f841e6f1d615e5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {

patches/server/0077-Phantoms-burn-in-light.patch

@@ -53,7 +53,7 @@ index fd02dfb905c71fa10e0830cf0a02d4b63b81f23f..b601c542e28bc0a588e56aa37c243fe9
                      list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error
                      Iterator iterator = list.iterator();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6b2a2b898d8a4b75f7c9d1ec7112e4f748413e95..99866d1ddf31dd231c2b097716e4f1d7300e0680 100644
+index b7e811c786db1a4749acdc9309f841e6f1d615e5..a33efd04ed2f0dc61d889062221e8138fa9ae0b1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1125,6 +1125,9 @@ public class PurpurWorldConfig {

patches/server/0078-Configurable-villager-breeding.patch

@@ -18,7 +18,7 @@ index 979bbbf4229a9355b31913454cb565fc98049911..aa95cd7e04e25dec63c172d219f1f16c
  
      private boolean hungry() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 99866d1ddf31dd231c2b097716e4f1d7300e0680..992b4fd09aeb6ef23310b1351b8dec38e4527c8d 100644
+index a33efd04ed2f0dc61d889062221e8138fa9ae0b1..c50c47c88bdf1bf1c613172970e346f81e18d142 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1613,6 +1613,7 @@ public class PurpurWorldConfig {

patches/server/0079-Redstone-deactivates-spawners.patch

@@ -17,7 +17,7 @@ index 31ac0e5ca26c7bdfa9b710d0bb78d846ddf6863e..feb65fc9ee04141fe6f77400660442ed
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 992b4fd09aeb6ef23310b1351b8dec38e4527c8d..4be13340ff4de6205b0e35f60e785ad458d7539c 100644
+index c50c47c88bdf1bf1c613172970e346f81e18d142..4e2f77ca0587ea3328e958c5a0583d4abec6221c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -363,6 +363,11 @@ public class PurpurWorldConfig {

patches/server/0080-Totems-work-in-inventory.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e41d27f486c5efa1269822c177bc2f1214d27b58..91d4f504b3f2992c8d98b8d75504229101816139 100644
+index 587a88a0c4954cba28fbdb31228ec81f2ba59b82..f7e95a73f60d06a102f79677bb0e31bf9532894d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1551,6 +1551,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -28,7 +28,7 @@ index e41d27f486c5efa1269822c177bc2f1214d27b58..91d4f504b3f2992c8d98b8d755042291
              EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
              event.setCancelled(itemstack == null);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4be13340ff4de6205b0e35f60e785ad458d7539c..e683f958f1d2afca87b7e337d04151b7aba35efb 100644
+index 4e2f77ca0587ea3328e958c5a0583d4abec6221c..af181872d94ae506bb17589bc7b6d6f511dcefe2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -247,6 +247,7 @@ public class PurpurWorldConfig {

patches/server/0081-Add-vindicator-johnny-spawn-chance.patch

@@ -22,7 +22,7 @@ index 0a4f7125c38d3138ec8eedec4ca72000f25ba6ac..29039b35c60c7c6370c6593a53b8aa2a
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e683f958f1d2afca87b7e337d04151b7aba35efb..5fd70f3cb91fa4f965f829a354155f5d075f485f 100644
+index af181872d94ae506bb17589bc7b6d6f511dcefe2..fc5c24f00639dd5d9bfd05c5ba768b4129598944 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1640,6 +1640,7 @@ public class PurpurWorldConfig {

patches/server/0083-Dispensers-place-anvils-option.patch

@@ -41,7 +41,7 @@ index 9598aa381978194fee859721731196f0e6ee08fc..2db46452d374f9b53db7bd80be5fbd9c
  
      static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5fd70f3cb91fa4f965f829a354155f5d075f485f..994b43f68127ab6f10e86efa079f0f833be352be 100644
+index fc5c24f00639dd5d9bfd05c5ba768b4129598944..9f40c3ec5c3d87f8090c25317148231a22064795 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -321,8 +321,10 @@ public class PurpurWorldConfig {

patches/server/0084-Allow-anvil-colors.patch

@@ -64,7 +64,7 @@ index 8475a8514b39d543cc7cf0dbfef6d2aabb6127d0..2281dba58d32b6314a7abcdb103c03c7
              }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 994b43f68127ab6f10e86efa079f0f833be352be..c336b4df270b324e6ef8a897c8cafcfd7d0c9c7d 100644
+index 9f40c3ec5c3d87f8090c25317148231a22064795..c5c975f4ebc04f12e40f2e1c9a8ca5aa37ec141a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -299,6 +299,13 @@ public class PurpurWorldConfig {

patches/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch

@@ -17,7 +17,7 @@ index 0accc5595461ce92259e3f819a9837aabd442d77..3b65375703732966d0fcbbb68ba0805e
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c336b4df270b324e6ef8a897c8cafcfd7d0c9c7d..d21b1d357cb9a9fd008b86d3c067cc8649ffbdec 100644
+index c5c975f4ebc04f12e40f2e1c9a8ca5aa37ec141a..fa07216c52848c957871a8884e844d6534aa6c66 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -612,6 +612,7 @@ public class PurpurWorldConfig {

patches/server/0087-Stop-squids-floating-on-top-of-water.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7b9f92b3e42146ac33fd72ca943ed91fba4992ad..e157763e945660ca15c4f2371edbf7cda68022c8 100644
+index 2c624a1779ada0c89ce0eb13234a4924bb16b9e4..7f90a35652f543f68773309208bfa8ae727abdd0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4224,6 +4224,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -54,7 +54,7 @@ index ffc76354ead6937daf366c3d87bcb51d3e4c47f5..5b98d42b5d6bc07265fbb017e51a6281
 +    // Purpur
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d21b1d357cb9a9fd008b86d3c067cc8649ffbdec..404300394bf9e4e7ff43cae3c39e8898382e5ac0 100644
+index fa07216c52848c957871a8884e844d6534aa6c66..1d53cf3ff8a7695e609e236e091f5e7259700678 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1480,6 +1480,7 @@ public class PurpurWorldConfig {

patches/server/0089-Entities-can-use-portals-configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ac6d250f143ea0198a823f2c24166bfa891adfe9..d3d920d647168c8c7445f526726736d454ccaffc 100644
+index 7f90a35652f543f68773309208bfa8ae727abdd0..adb5f4fa1f1f4ec3180da4f8ad0a322eaa47f9ac 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2940,7 +2940,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -27,7 +27,7 @@ index ac6d250f143ea0198a823f2c24166bfa891adfe9..d3d920d647168c8c7445f526726736d4
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 404300394bf9e4e7ff43cae3c39e8898382e5ac0..c68801aa022a59155d37bb8a930a5cbef4b91dfa 100644
+index 1d53cf3ff8a7695e609e236e091f5e7259700678..8be52e5cd16bcfae3b714cd8ec865e5036a3e631 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -100,6 +100,7 @@ public class PurpurWorldConfig {

patches/server/0091-Customizable-wither-health-and-healing.patch

@@ -23,7 +23,7 @@ index 864ebffb6c903acb9de5594029838b927eea4318..b22d0af2267581467af9a4d0e8104146
  
              this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c68801aa022a59155d37bb8a930a5cbef4b91dfa..146dfeddb9572eb017e137656c849dcd15162db8 100644
+index 8be52e5cd16bcfae3b714cd8ec865e5036a3e631..307f03cc8af263f851d7d6054337b4de84a9f7d4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1719,6 +1719,8 @@ public class PurpurWorldConfig {

patches/server/0092-Allow-toggling-special-MobSpawners-per-world.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a7c153f957af48cf42ecbb01ada5f8f384c4e5e4..5a6c5972f6044cc4bda46259679d7ca19f2d7704 100644
+index 575be84b580f7d7f4968bc4e2a69e0a067a3a617..9807f610aca29d6882bb5314a30161727dfe7c34 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -543,7 +543,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -59,7 +59,7 @@ index 5d199fe497bd852827d3d18fb7566a09e70331a3..6cd8a50289a6404441e9e5e08d82d2eb
              if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 146dfeddb9572eb017e137656c849dcd15162db8..dd70c75ef196dec6e3c781695240fb74fbbf48c7 100644
+index 307f03cc8af263f851d7d6054337b4de84a9f7d4..ead2c290915b247fa5a430bfff6d2adac9af6119 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -71,6 +71,12 @@ public class PurpurWorldConfig {

patches/server/0093-Raid-cooldown-setting.patch

@@ -49,7 +49,7 @@ index fabce3bc592b1b172b227395a07febdbb66ec3c9..df48bcc8f329e3855bb7426bdfe0e3c7
                      if (!this.raidMap.containsKey(raid.getId())) {
                          this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index dd70c75ef196dec6e3c781695240fb74fbbf48c7..f5e89d6193b4bb032355571320fbc56fd1ef934b 100644
+index ead2c290915b247fa5a430bfff6d2adac9af6119..d62f275ab355b1ff559f7a770b4c5c428b46e008 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -111,6 +111,7 @@ public class PurpurWorldConfig {

patches/server/0094-Despawn-rate-config-options-per-projectile-type.patch

@@ -7,7 +7,7 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim
 The config remains for migration purposes.
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f5e89d6193b4bb032355571320fbc56fd1ef934b..8b7da9f1e1c073b1cf93aa403aadf0b42da9a1e6 100644
+index d62f275ab355b1ff559f7a770b4c5c428b46e008..bc326cb023feae60e1341939550de549ca6365bd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -292,6 +292,39 @@ public class PurpurWorldConfig {

patches/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch

@@ -71,7 +71,7 @@ index fb41431f25081c8ca0cf03dc5128f78f589e4e26..ebeeb8c31d05a0ad2e291599a0b6ebe1
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8b7da9f1e1c073b1cf93aa403aadf0b42da9a1e6..9c0b696ed17ea75831419c9e1102215b2e60ff34 100644
+index bc326cb023feae60e1341939550de549ca6365bd..d5d83c8a79cca8d8216b24c7116c7c475924d104 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1852,6 +1852,7 @@ public class PurpurWorldConfig {

patches/server/0097-Flying-squids-Oh-my.patch

@@ -58,7 +58,7 @@ index de1bf4aea2661763948aba01d93e7685f3ef73cb..c396874d24ae535b4c07649e303e60b7
                  float f1 = Mth.cos(f) * 0.2F;
                  float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9c0b696ed17ea75831419c9e1102215b2e60ff34..e279df79e3ce5a12205c45c611e252bfaa6ffbdb 100644
+index d5d83c8a79cca8d8216b24c7116c7c475924d104..18baed72b56398846a76229bbc46638125cb82f8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -904,10 +904,12 @@ public class PurpurWorldConfig {

patches/server/0098-Infinity-bow-settings.patch

@@ -27,7 +27,7 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c
          } else {
              user.startUsingItem(hand);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e279df79e3ce5a12205c45c611e252bfaa6ffbdb..7853ce4653b379d1510e62bec0d784620e9e5347 100644
+index 18baed72b56398846a76229bbc46638125cb82f8..7b212f784be68e737197a3a16b4cdee1c45e42a6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -142,6 +142,17 @@ public class PurpurWorldConfig {

patches/server/0099-Configurable-daylight-cycle.patch

@@ -18,7 +18,7 @@ index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaae
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 585b5cd7361c01157ba279f21fea05e990738e34..371de53f342e6dba7da54a6d60c1907f06fa9191 100644
+index 65ba915d3644b638ce3b5314c0aed5b2018f67e0..52487bc86a28a2f2c1c677b07c9fec77685f2af0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1522,7 +1522,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -31,7 +31,7 @@ index 585b5cd7361c01157ba279f21fea05e990738e34..371de53f342e6dba7da54a6d60c1907f
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5a6c5972f6044cc4bda46259679d7ca19f2d7704..682faf5ae551b379bf51f01f616a76400eb21f3d 100644
+index 9807f610aca29d6882bb5314a30161727dfe7c34..e113e0e15ec88ac3b72f20ec2c88c3302e77ce20 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -212,6 +212,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -88,7 +88,7 @@ index 5a6c5972f6044cc4bda46259679d7ca19f2d7704..682faf5ae551b379bf51f01f616a7640
      public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
          Iterator iterator = this.customSpawners.iterator();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7853ce4653b379d1510e62bec0d784620e9e5347..1faa69be3acd182d9c7d676b05c820ab1b6eff06 100644
+index 7b212f784be68e737197a3a16b4cdee1c45e42a6..3f0f7264aef8942d82f8d12ccf9bc48c72104ab5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -124,6 +124,13 @@ public class PurpurWorldConfig {

patches/server/0101-Furnace-uses-lava-from-underneath.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Furnace uses lava from underneath
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 2a786c9fd29dc2139cf487fa645cd43345d60167..ffc05b20105227799904b66a7d208ccef04cb876 100644
+index a3f073066f6e2eea8964461ad2b0409ade202f35..4ff472f454b60c3608286b7553926acf74069b73 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -44,6 +44,7 @@ import net.minecraft.world.level.Level;
@@ -47,7 +47,7 @@ index 2a786c9fd29dc2139cf487fa645cd43345d60167..ffc05b20105227799904b66a7d208cce
  
      private static boolean canBurn(RegistryAccess registryManager, @Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1faa69be3acd182d9c7d676b05c820ab1b6eff06..8b80282e3816dacb428ee08acd1a5cb034a75457 100644
+index 3f0f7264aef8942d82f8d12ccf9bc48c72104ab5..f607e8fc2bc998c93f86f01dbb556f960825489e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -415,6 +415,17 @@ public class PurpurWorldConfig {

patches/server/0102-Arrows-should-not-reset-despawn-counter.patch

@@ -20,7 +20,7 @@ index 5d6d26cfe8f0ab68a3145214b3fc126ca7a71a66..1ea5664e1e7dc73cbd2d1cc38c830a19
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8b80282e3816dacb428ee08acd1a5cb034a75457..9569c51ceffe45931211353893c56fe896bac952 100644
+index f607e8fc2bc998c93f86f01dbb556f960825489e..70911b0e8c47d505e43e11e5d29da150afb19272 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -103,6 +103,11 @@ public class PurpurWorldConfig {

patches/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch

@@ -24,7 +24,7 @@ index fce9ebcaaac18ecee24c7091ea77a32ac567762e..8725ca6eec1becc401951a746a90f678
                  return;
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9569c51ceffe45931211353893c56fe896bac952..cc6ba8be24f9ac5c08a17dff9f22ae9c0159a54c 100644
+index 70911b0e8c47d505e43e11e5d29da150afb19272..00e4930d899b547f4a410fae3bc91dfe16259ed6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -416,8 +416,10 @@ public class PurpurWorldConfig {

patches/server/0104-Add-adjustable-breeding-cooldown-to-config.patch

@@ -95,7 +95,7 @@ index d0e0ce953dd0cdd6b54bb00224e82dca62f793cd..52d2fa575a29ec36280bb4dbcab6954a
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cc6ba8be24f9ac5c08a17dff9f22ae9c0159a54c..94e2fe3e094b2519d4a12ff653e5041b4f93b94c 100644
+index 00e4930d899b547f4a410fae3bc91dfe16259ed6..f3e623890c29726d2bfa7713ab5183a788664ed7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -117,6 +117,7 @@ public class PurpurWorldConfig {

patches/server/0105-Make-entity-breeding-times-configurable.patch

@@ -477,7 +477,7 @@ index e818bd705b03aa1fedfd981ec44c9b8267c67a00..b56db8da5002bd18552fbc5a96a74fbd
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 30ff9967aa19a9e77bdf7d32e494276b1b72ab72..f5d2f12c2a95c274823ec37ac1c14a54a48a9cdc 100644
+index f27c71fbcebce21b0cde8375a476a0d19b6c2ae4..a34f41878bffa7bbe01310be95bf4bc6711cc0ef 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -101,6 +101,11 @@ public class Sniffer extends Animal {
@@ -525,7 +525,7 @@ index b855647ebd374e4d01e90b78a5d650ceab85173d..6e8715bf332826c8326c00c5288e2402
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 94e2fe3e094b2519d4a12ff653e5041b4f93b94c..901fc6601b9e0cb25e9641de9e14755b12c6297d 100644
+index f3e623890c29726d2bfa7713ab5183a788664ed7..c2651f1a01a1ae04b937316671bc16a33b6c9b8e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -512,10 +512,12 @@ public class PurpurWorldConfig {

patches/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch

@@ -136,7 +136,7 @@ index b2ad6d230de2c29f371178bccde1111c7532ee70..6667926519a0f1c151e53f59cce36e74
  
              if (((HangingEntity) object).survives()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 901fc6601b9e0cb25e9641de9e14755b12c6297d..09aff91bb1609b4ec91a16a3843839269eb536e0 100644
+index c2651f1a01a1ae04b937316671bc16a33b6c9b8e..dfd60520c7924e4258d1a481fc1f72ff182ed6b9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -99,8 +99,10 @@ public class PurpurWorldConfig {

patches/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch

@@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
                      ((Mob) newEntityLiving).setPersistenceRequired();
                  // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 09aff91bb1609b4ec91a16a3843839269eb536e0..a0f05155f761941de87710d5c7846b878eb86ec7 100644
+index dfd60520c7924e4258d1a481fc1f72ff182ed6b9..c5c02479efbe1531f7b86bfd18e86f6fff7e27fe 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -100,9 +100,11 @@ public class PurpurWorldConfig {

patches/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch

@@ -21,7 +21,7 @@ index d8123aa5585cb4c0cc1210ced04fdf08f731fdb2..757aa2e3fa1c4608f07adbff0f718ad8
  
      private static class EndermanFreezeWhenLookedAt extends Goal {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a0f05155f761941de87710d5c7846b878eb86ec7..8410a3c5f13b94b096d1d544690abe684595df9b 100644
+index c5c02479efbe1531f7b86bfd18e86f6fff7e27fe..2d63b6de58149bd160d8455becbf224757cb3baf 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -835,6 +835,7 @@ public class PurpurWorldConfig {

patches/server/0109-Add-configurable-snowball-damage.patch

@@ -18,7 +18,7 @@ index 6cded52e4627c2b6073fa221fc6d6583f1b2a96d..5827236f351cd0679af764644bb22bb2
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8410a3c5f13b94b096d1d544690abe684595df9b..5e1bfa72f902fb24dd67a973b4ef4b202d803269 100644
+index 2d63b6de58149bd160d8455becbf224757cb3baf..c9559508d8962b891b5aca3a7ee1138b935a078b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -356,6 +356,11 @@ public class PurpurWorldConfig {

patches/server/0110-Changeable-Mob-Left-Handed-Chance.patch

@@ -18,7 +18,7 @@ index 183261a031a2a0b6b95dbb983236cee3cd3a0398..9dae07b1f1e18cbc86d64e5f793a5eb1
          } else {
              this.setLeftHanded(false);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5e1bfa72f902fb24dd67a973b4ef4b202d803269..1b19d4cd80166420a9a7918bd96cf39d5616b439 100644
+index c9559508d8962b891b5aca3a7ee1138b935a078b..a673ae630a0551fb242d920470c9165f4531f5fb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -158,8 +158,10 @@ public class PurpurWorldConfig {

patches/server/0111-Add-boat-fall-damage-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8b113b7ac096e6237577685a4f1961a757a5b7fa..ead34927019224e76063ac1a040dea78022fb36a 100644
+index 81f9b830df5cec8c5748027b09fe97a5a47bb1c7..dc1cffa39659505f44ee81a38066c274fda09a43 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1069,7 +1069,16 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index 8b113b7ac096e6237577685a4f1961a757a5b7fa..ead34927019224e76063ac1a040dea78
  
              if (!flag && isSpawnInvulnerable() && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { // Purpur
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1b19d4cd80166420a9a7918bd96cf39d5616b439..57c460b7fff28dd5e9538e4f96cefee12eb0e2c2 100644
+index a673ae630a0551fb242d920470c9165f4531f5fb..780c094431e8206a7cd42b1f0bdfb098c1af8af2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -114,6 +114,7 @@ public class PurpurWorldConfig {

patches/server/0112-Snow-Golem-rate-of-fire-config.patch

@@ -23,7 +23,7 @@ index 6c6e020522261ca5bbc47a59c25d3e98bf0b4007..30abf3ee1b9d3aef9291076a1f0bf865
          this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a79b5fcfdee45cca589a13c470b9fc83a750980c..96385e4294a990c75d059416f66a6243db103d52 100644
+index 780c094431e8206a7cd42b1f0bdfb098c1af8af2..496b797910b1248662289fab16ed5fa3390d0c4d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1607,6 +1607,10 @@ public class PurpurWorldConfig {

patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch

@@ -181,7 +181,7 @@ index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3
      public static final VillagerProfession FISHERMAN = register("fisherman", PoiTypes.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
      public static final VillagerProfession FLETCHER = register("fletcher", PoiTypes.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 96385e4294a990c75d059416f66a6243db103d52..bb40cbe7be6fa07f8e4e44eed3f3b485b7eea5f1 100644
+index 496b797910b1248662289fab16ed5fa3390d0c4d..1ffdd96306b525f217a630b4f8f05e16c0e8b7cd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1810,6 +1810,8 @@ public class PurpurWorldConfig {

patches/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch

@@ -35,7 +35,7 @@ index f2c690c92dd2bf55f986f629ed79b76fbdfa32a4..6e8f0c9df06e2930084a6d58213f6edf
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bb40cbe7be6fa07f8e4e44eed3f3b485b7eea5f1..8e6a803eaba8a3fb2ed2c37266cb5ea12a212a7f 100644
+index 1ffdd96306b525f217a630b4f8f05e16c0e8b7cd..86d033f990e19c80db0209aacd0a60a506a6e607 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -2054,6 +2054,7 @@ public class PurpurWorldConfig {

patches/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch

@@ -222,7 +222,7 @@ index e43fd3e59fd8c74828ae65965fade27f56beef65..b2f133c8baabba1cffa6e92ea0f85453
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8e6a803eaba8a3fb2ed2c37266cb5ea12a212a7f..8ce6573ab423c955d38ad0ab764d307e5144e8c7 100644
+index 86d033f990e19c80db0209aacd0a60a506a6e607..a6fbccd217af50fa3abfe703de7e9e9894916f40 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1939,6 +1939,8 @@ public class PurpurWorldConfig {

patches/server/0117-Configurable-default-collar-color.patch

@@ -43,7 +43,7 @@ index 079d41636f1420a8755442843f1843e397cdbbf9..214d5d27f8c4f352839c1a45a083c329
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8ce6573ab423c955d38ad0ab764d307e5144e8c7..ec1662fcc6a22f670644a82d16ea5200a2f07205 100644
+index a6fbccd217af50fa3abfe703de7e9e9894916f40..38dbd6ff79fe1e1f5e4abb8ca57548ff6f46e60a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -623,6 +623,7 @@ public class PurpurWorldConfig {

patches/server/0118-Phantom-flames-on-swoop.patch

@@ -17,7 +17,7 @@ index b601c542e28bc0a588e56aa37c243fe92145547e..ed5c75d390babced3dc062428176e968
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ec1662fcc6a22f670644a82d16ea5200a2f07205..39a31ab49d6b8eeac6df8fb86faee4bde1f519f7 100644
+index 38dbd6ff79fe1e1f5e4abb8ca57548ff6f46e60a..b77cc1019396f8fa63baf9aad81227ff7452400d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1301,6 +1301,7 @@ public class PurpurWorldConfig {

patches/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch

@@ -17,7 +17,7 @@ index 5e22d175b1048a58802cdf64ac70a8b56329e915..d81946b400f208c39941128ce823ff77
  
          return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 39a31ab49d6b8eeac6df8fb86faee4bde1f519f7..6d5571112fb8e13291121cd0942230996be58224 100644
+index b77cc1019396f8fa63baf9aad81227ff7452400d..bcb384761d4ad7abb6624d78e501084817c678e0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -425,6 +425,11 @@ public class PurpurWorldConfig {

patches/server/0120-Implement-TPSBar.patch

@@ -156,7 +156,7 @@ index 126eb32d182b78b07add872aad6a821334639662..5b0625955e2a65f689c8a128d73170bc
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7c367d17fa843d4d7562d05780ecffd47400fc13
+index 0000000000000000000000000000000000000000..1ac51b238569bb825f8b3f7696164492c536ff76
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java
 @@ -0,0 +1,43 @@
@@ -180,12 +180,12 @@ index 0000000000000000000000000000000000000000..7c367d17fa843d4d7562d05780ecffd4
 +public class TPSBarCommand {
 +    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
 +        dispatcher.register(Commands.literal("tpsbar")
-+                .requires(listener -> listener.hasPermission(2))
++                .requires(listener -> listener.hasPermission(2, "bukkit.command.tpsbar"))
 +                .executes(context -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
 +                .then(Commands.argument("targets", EntityArgument.players())
 +                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
 +                )
-+        ).setPermission("bukkit.command.tpsbar");
++        );
 +    }
 +
 +    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {

patches/server/0121-Striders-give-saddle-back.patch

@@ -29,7 +29,7 @@ index 1be6dc3608b839b0ed7d2fcd968991ce5bbeb89b..270135cb5a5f50b39683f74da84045ea
              if (!this.level.isClientSide) {
                  player.startRiding(this);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6d5571112fb8e13291121cd0942230996be58224..4f2416691bea7b53166d7d8448f57019147e1629 100644
+index bcb384761d4ad7abb6624d78e501084817c678e0..c877d28640ad083ef4d117b7c2deecbed3bcc12a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1713,6 +1713,7 @@ public class PurpurWorldConfig {