Updated Upstream (Gale/Purpur/Leaves/Dependencies)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.4-R0.1-SNAPSHOT
 
-galeCommit = 84c93452529ed1ff5e6ef78e01e38c843104bbad
+galeCommit = 377da10d2e1fdd3d1bbba68813dd1996dcdbfd09
 
 org.gradle.caching = true
 org.gradle.parallel = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

patches/api/0001-Leaf-config-files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6b7584082a12903184add379c3b1dddfcff015fc..8a161557cefd962f15f5138ffa1386c4134d557c 100644
+index bb73389fd8ffcc2fb89ece44e7704f87baa3058e..55830a5621b5f1b59dc7285425e1fd949a4aea83 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2267,6 +2267,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2282,6 +2282,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
          // Paper end
  

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 9cd8eb4fcbf703f1098ceb8be29830fd11a7a32f
+Commit: 642956fe6151a87488d861ccb98e4d46d355d599
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -34,10 +34,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
  
          @Override
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 77696b5505e9c05753ec95050ec55878794fcf7c..202cd4918a1a0bb178d32305a3aff4dc64f54a04 100644
+index 12412ffbfa05f91d46509a90fe3af7085349eb63..69e1800274218115877870b43d44cecd77f27c83 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2929,4 +2929,127 @@ public final class Bukkit {
+@@ -2945,4 +2945,127 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -301,10 +301,10 @@ index f9af60356da4668cec8b24e73f5747ab82e35a91..b304ad1307cdd6785653b1eab9781e07
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..98308b759907e03b168f7e06704a91925ffcd3fd 100644
+index 30298a629b39bd43ce14b414fc697b2dfcbea89c..ce00af9121de7a910aaea4e0685a06d4cf31b4e3 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -545,4 +545,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -557,4 +557,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
      public Location getLocation();
@@ -412,10 +412,10 @@ index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..98308b759907e03b168f7e06704a9192
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8a161557cefd962f15f5138ffa1386c4134d557c..c0f2975cf31a32610950968a9420f659d44e16b5 100644
+index 55830a5621b5f1b59dc7285425e1fd949a4aea83..bba0c8d28b0d02bd85d279b74a83aa8bf66c37d4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2267,6 +2267,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2282,6 +2282,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
          // Paper end
  
@@ -434,7 +434,7 @@ index 8a161557cefd962f15f5138ffa1386c4134d557c..c0f2975cf31a32610950968a9420f659
          // Leaf start
          @NotNull
          public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
-@@ -2584,4 +2596,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2599,4 +2611,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
  
@@ -996,10 +996,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ad21ca6e9a2e77da185950a34f114480dddddec0..f42b134854201a94601f2660cb62a8211a8f49f7 100644
+index 019237c2e536a118f7cd3d81fc59b74f21c34609..a9f119ea2a006158429a90d67517ccc74a0027ac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3697,4 +3697,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3721,4 +3721,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0005-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1bbc94b97662aa0367c9b5bac19bec313f158c14..88929400dc1ea29c6924a153492f804c2ed3edf5 100644
+index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..a44f86f4be8db0c65de630d1bb2b1d47e6a8102f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,11 +9,11 @@ java {
@@ -15,11 +15,11 @@ index 1bbc94b97662aa0367c9b5bac19bec313f158c14..88929400dc1ea29c6924a153492f804c
 -val annotationsVersion = "24.0.1"
 +val annotationsVersion = "24.1.0" // Leaf - Bump Dependencies
  val bungeeCordChatVersion = "1.20-R0.2"
- val adventureVersion = "4.15.0"
+ val adventureVersion = "4.16.0"
 -val slf4jVersion = "2.0.9"
 -val log4jVersion = "2.17.1"
 +val slf4jVersion = "2.0.12" // Leaf - Bump Dependencies
-+val log4jVersion = "2.22.1" // Leaf - Bump Dependencies
++val log4jVersion = "2.23.0" // Leaf - Bump Dependencies
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
          attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -46,7 +46,7 @@ index 1bbc94b97662aa0367c9b5bac19bec313f158c14..88929400dc1ea29c6924a153492f804c
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
 -    api("io.sentry:sentry:5.4.0") // Pufferfish
-+    api("io.sentry:sentry:7.3.0") // Pufferfish // Leaf - Bump Dependencies
++    api("io.sentry:sentry:7.5.0") // Pufferfish // Leaf - Bump Dependencies
  
 -    implementation("org.ow2.asm:asm:9.5")
 -    implementation("org.ow2.asm:asm-commons:9.5")
@@ -73,7 +73,7 @@ index 1bbc94b97662aa0367c9b5bac19bec313f158c14..88929400dc1ea29c6924a153492f804c
      testImplementation("org.hamcrest:hamcrest:2.2")
 -    testImplementation("org.mockito:mockito-core:5.5.0")
 -    testImplementation("org.ow2.asm:asm-tree:9.5")
-+    testImplementation("org.mockito:mockito-core:5.10.0")
++    testImplementation("org.mockito:mockito-core:5.11.0")
 +    testImplementation("org.ow2.asm:asm-tree:9.6")
 +    // Leaf end
  }

patches/api/0007-KeYi-Player-Skull-API.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f42b134854201a94601f2660cb62a8211a8f49f7..7d0dbadbc3010c3e348ba408c2e3fda8577d767f 100644
+index a9f119ea2a006158429a90d67517ccc74a0027ac..69ba1660dae4ac69ec4e92f94dd6f95e9f70427d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -9,6 +9,10 @@ import java.util.Date;
@@ -21,7 +21,7 @@ index f42b134854201a94601f2660cb62a8211a8f49f7..7d0dbadbc3010c3e348ba408c2e3fda8
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -3816,4 +3820,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3840,4 +3844,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          sendDeathScreen(message);
      }
      // Purpur end

patches/api/0008-Slice-Smooth-Teleports.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9c6b5799897237ce0095087fdc9eec446420cc1f..83f5565efe1d592a6d1b65000034ae8d695aea34 100644
+index 69ba1660dae4ac69ec4e92f94dd6f95e9f70427d..dbd5e9faaf92d718c20ceaf076f2afd867232116 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3564,6 +3564,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3588,6 +3588,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  

patches/generated-api/0001-Purpur-generated-api-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 9cd8eb4fcbf703f1098ceb8be29830fd11a7a32f
+Commit: 642956fe6151a87488d861ccb98e4d46d355d599
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 069f2668f5229b0368b796e65eef1648fba0a097..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644

patches/server/0001-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 362bbf070aabf5a8ac0233ce64f321c5dc1849fe..a8a720045804cded8f8dffc1bfdd20710b8f0c82 100644
+index c9784da0a87d61e80a41fb0358614053682e942b..960fe37a4cf0100b552401f835900c6d8b6af523 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -15,7 +15,7 @@ val alsoShade: Configuration by configurations.creating
@@ -17,7 +17,7 @@ index 362bbf070aabf5a8ac0233ce64f321c5dc1849fe..a8a720045804cded8f8dffc1bfdd2071
      // Depend on Paper MojangAPI
      implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
          exclude("io.papermc.paper", "paper-api")
-@@ -87,7 +87,7 @@ tasks.jar {
+@@ -88,7 +88,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -86,7 +86,7 @@ index fbdc65a01b04abae4c3770666c6a77e0e85be502..9e7119152664e785e23f08e3a702f0bc
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3eda41407dbd193ccad8f3d47700754f24bb358a..5ea33329ae1fe2fbbba20f25cd2dcfa64190df86 100644
+index 859d009003637ba701cd13031edf491b4420249a..8ecf6ffa93610261d27fafadfff016a2d6047c90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0007-Pufferfish-Dynamic-Activation-of-Brain.patch

@@ -30,7 +30,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1591e201ebca4354d5912d3f803f59759af1ba6e..98e666c69b51f7b4fec040b7abd9667d293c9ccb 100644
+index 8d517617e38edf7b6cd49f32f404f2f80c014f66..1fe45a264032047c67d84ab387e230af2f0eff20 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -880,6 +880,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -42,10 +42,10 @@ index 1591e201ebca4354d5912d3f803f59759af1ba6e..98e666c69b51f7b4fec040b7abd9667d
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 68fe93725a37cb0f52401038c1bda141ba0a4068..68b256e6b3086127ba440f348bcd9d5926e029af 100644
+index 4027ea7cb55dcb70c96cc2ada3b0da09c1dda8ad..1482310673c2c2ac9180ea80a96c24d4094e11c9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -503,6 +503,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -504,6 +504,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
      // Paper end - optimise entity tracking
  
@@ -70,10 +70,10 @@ index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..d86c34111ede6a1454dde5e7223d7caf
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 8f91e97240c50a6bbef6b7c71b5e3002a4ef79a8..b7d2d19f029c6fdc6091c9f60278a528885e17f8 100644
+index a676228a7f4d8d4b7e54a641c1df1f1b0d262f10..43beb25bb42f19832da83f6f7f022cb5c85830c1 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -227,10 +227,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -228,10 +228,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
      @Override
      public void inactiveTick() {
          super.inactiveTick();
@@ -86,7 +86,7 @@ index 8f91e97240c50a6bbef6b7c71b5e3002a4ef79a8..b7d2d19f029c6fdc6091c9f60278a528
              this.targetSelector.tick();
          }
      }
-@@ -905,10 +905,14 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -906,10 +906,14 @@ public abstract class Mob extends LivingEntity implements Targeting {
          int i = this.level().getServer().getTickCount() + this.getId();
  
          if (i % 2 != 0 && this.tickCount > 1) {
@@ -183,10 +183,10 @@ index 81e69ea2858228942177e54c92b50b2b908bc010..d1458cec0313f7317134e7eb8bdabc31
          FrogAi.updateActivity(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 0f3a11203dd0353d74626a273e9003131356f5e1..c83dabddf93249a6477c10725622119c939db4d5 100644
+index 1ee12f16e7013521a288a3160dcc424c4e385204..257687004b03e17cf3f5c0ea4c4cfeb7f34033e4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -77,8 +77,10 @@ public class Tadpole extends AbstractFish {
+@@ -80,8 +80,10 @@ public class Tadpole extends AbstractFish {
          return SoundEvents.TADPOLE_FLOP;
      }
  
@@ -260,10 +260,10 @@ index b73bccfcb1b94936f500926a06a28a6a134bbc33..5cad15c512919ce6b0cae9f45e9011dd
          super.customServerAiStep();
          if ((this.tickCount + this.getId()) % 120 == 0) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 5a9d567fdcaa02cf91dac889949f4428987f6fdd..e6b5b7c58505f021dc042c2c40733addcf286dcd 100644
+index d88cebe9a348ec99bff05c650d101c80cc38c747..34812d4ab115f31a6ad1cf8cbc345dda4339c075 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -144,6 +144,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -145,6 +145,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return holder.is(PoiTypes.MEETING);
      });
  
@@ -272,7 +272,7 @@ index 5a9d567fdcaa02cf91dac889949f4428987f6fdd..e6b5b7c58505f021dc042c2c40733add
      public Villager(EntityType<? extends Villager> entityType, Level world) {
          this(entityType, world, VillagerType.PLAINS);
      }
-@@ -247,6 +249,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -248,6 +250,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      // Spigot End
  
@@ -280,7 +280,7 @@ index 5a9d567fdcaa02cf91dac889949f4428987f6fdd..e6b5b7c58505f021dc042c2c40733add
      @Override
      @Deprecated // Paper
      protected void customServerAiStep() {
-@@ -255,7 +258,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -256,7 +259,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      protected void customServerAiStep(final boolean inactive) {
          // Paper end

patches/server/0008-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch

@@ -7,10 +7,10 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b7d2d19f029c6fdc6091c9f60278a528885e17f8..11b1b96201af3ef4e88150411bcd9b95e75b3bfa 100644
+index 43beb25bb42f19832da83f6f7f022cb5c85830c1..1c729ea3e40b12ddb95294c666f1568bd69ce4c0 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -223,11 +223,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -224,11 +224,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
          return this.lookControl;
      }
  

patches/server/0009-Pufferfish-Entity-TTL.patch

@@ -7,16 +7,16 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 68b256e6b3086127ba440f348bcd9d5926e029af..3f3ae7439bd2796870e7cdffa37b097d9c54cfd2 100644
+index 1482310673c2c2ac9180ea80a96c24d4094e11c9..f146fb4a599d36e0a9492936312e609cbbfed641 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -814,6 +814,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -827,6 +827,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void tick() {
 +        // Pufferfish start - entity TTL
 +        if (type != EntityType.PLAYER && type.ttl >= 0 && this.tickCount >= type.ttl) {
-+            discard();
++            discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD); // Purpur
 +            return;
 +        }
 +        // Pufferfish end - entity TTL

patches/server/0013-Remove-Timings.patch

@@ -829,7 +829,7 @@ index b66a7d4aab887309579154815a0d4abf9de506b0..78cb9d7da9bb025ea362028fdc9d0317
          return executedUnloadTask | canSaveChunk | canSaveEntities | canSavePOI ? new SaveStat(executedUnloadTask || canSaveChunk, canSaveEntities, canSavePOI): null;
      }
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index d840237674c67c739e0f990a89f77a31cb706558..942c2a826f9a4f8c66f2dcd0e7f25432edc4e836 100644
+index 65a51d934a98fd296fd41482c4201b974305dadc..31f200a30cbaa37e6167d3e162cc3f5195af392e 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -1,7 +1,7 @@
@@ -1163,7 +1163,7 @@ index 8749010decf3a7d9490762c7641530bd91f4e19c..4ba34682cf4f8e610d8d456785a0da55
          // Paper start
          if (waitableArray[0] != null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 42869d35abb8d006fb720ca7190a770ce5cbf778..2b9968a8a3d0d66d9db5a83dcf2a44767a9fe412 100644
+index de511a1d43aa78ec79c12d78635175336f77b62c..546028b42544bd62578e415faa245559a373a289 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,6 +1,5 @@
@@ -1346,7 +1346,7 @@ index 6587ce30d88983cb42822e6ff3e012047d3ce16d..93ec0bdece165e5a5058f9a7ed2fd67d
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a6a9a425aecdd58a65a926a22cd44f7a5c711007..a3b9068efc38b3eb05e884bcc3fb13532e49308d 100644
+index 0c376236d0cbc6033865f25db592c42a0d3d30d7..165b9f9ede6eec3e5667a2e653988f0e69ddb09f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -1364,8 +1364,8 @@ index a6a9a425aecdd58a65a926a22cd44f7a5c711007..a3b9068efc38b3eb05e884bcc3fb1353
 -        this.timings.scheduledBlocks.startTiming(); // Paper
          if (!this.isDebug() && flag) {
              j = this.getGameTime();
-             this.blockTicks.tick(j, 65536, this::tickBlock);
+             this.blockTicks.tick(j, paperConfig().environment.maxBlockTicks, this::tickBlock); // Paper - configurable max block ticks
-             this.fluidTicks.tick(j, 65536, this::tickFluid);
+             this.fluidTicks.tick(j, paperConfig().environment.maxFluidTicks, this::tickFluid); // Paper - configurable max fluid ticks
          }
 -        this.timings.scheduledBlocks.stopTiming(); // Paper
  
@@ -1528,7 +1528,7 @@ index a6a9a425aecdd58a65a926a22cd44f7a5c711007..a3b9068efc38b3eb05e884bcc3fb1353
  
          } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a2a086dfd338574324368aa97a4297f899759101..1d0c724137c002801b3dbb239278f2a1c82c1d77 100644
+index fc57aad909a843a7ebd8490f125b424872f71ed5..ac9a2b8ba9f7a858b356296296d7424c451b69fe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2483,7 +2483,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1557,7 +1557,7 @@ index a2a086dfd338574324368aa97a4297f899759101..1d0c724137c002801b3dbb239278f2a1
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5748ada42d5039e8f2999f1ca0a74067a1dad08f..6fe6126dd37272ddeac89087887d9fe688a6bfcc 100644
+index 3c6002e33d1b86b60ccfa11ef615aa8f7adaf81b..7d98ba26ccde1e57378253e03c437650051f7843 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,6 +1,5 @@
@@ -1567,7 +1567,7 @@ index 5748ada42d5039e8f2999f1ca0a74067a1dad08f..6fe6126dd37272ddeac89087887d9fe6
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1337,7 +1336,6 @@ public abstract class PlayerList {
+@@ -1338,7 +1337,6 @@ public abstract class PlayerList {
  
      public void saveAll(int interval) {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -1575,7 +1575,7 @@ index 5748ada42d5039e8f2999f1ca0a74067a1dad08f..6fe6126dd37272ddeac89087887d9fe6
          int numSaved = 0;
          long now = MinecraftServer.currentTick;
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1348,7 +1346,6 @@ public abstract class PlayerList {
+@@ -1349,7 +1347,6 @@ public abstract class PlayerList {
              }
              // Paper end - Incremental chunk and player saving
          }
@@ -1723,7 +1723,7 @@ index fcdb9bde8e1605e30dde3e580491522d4b62cdc0..4de18d00cc464313b777874430da3f55
  
      }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 765f7034d3b1da22dd81c4186649e06fa58e50a5..36a420f8cf463dcabe5717df1af59472db3142fc 100644
+index 7583ce583b06306930cbae49b0386a6630bb916f..ff05efe0b78defe3d25905b6a2984bdb646fcff3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -176,7 +176,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1734,7 +1734,7 @@ index 765f7034d3b1da22dd81c4186649e06fa58e50a5..36a420f8cf463dcabe5717df1af59472
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
      private org.spigotmc.TickLimiter tileLimiter;
-@@ -355,7 +354,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -364,7 +363,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
          });
          // CraftBukkit end
@@ -1742,7 +1742,7 @@ index 765f7034d3b1da22dd81c4186649e06fa58e50a5..36a420f8cf463dcabe5717df1af59472
          this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper - Option to keep spawn chunks loaded
          this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
-@@ -1323,15 +1321,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1332,15 +1330,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      protected void tickBlockEntities() {
@@ -1758,7 +1758,7 @@ index 765f7034d3b1da22dd81c4186649e06fa58e50a5..36a420f8cf463dcabe5717df1af59472
          // Spigot start
          // Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
          boolean flag = this.tickRateManager().runsNormally();
-@@ -1360,9 +1355,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1369,9 +1364,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
          this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
  
@@ -1870,7 +1870,7 @@ index 3d0b8761866046ae7ee6b5777fb098ce786abd94..221a4a3fbeac621ec593c7ba44b83f4b
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 38e80348c9b31847b98fa290a6b03f4060951367..443e227ee762163fa19eefb3c554fa871ad07323 100644
+index f4fb23ebdd35e23b022bdd78421dec6d86342260..3c3b98d13587ce21bffa14a79aed963a7ce1f176 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -470,7 +470,6 @@ public final class CraftServer implements Server {

patches/server/0014-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a850f63770e46293c0efe3ac03583bfcbc0ed946..607d6a73daba955734f651530e4d3db87110eb16 100644
+index 54372661e263807e717e5cfdc395311486bbeaa5..e83c550469dfc70a190c5daf2d4a918fa9048863 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -32,9 +32,9 @@ dependencies {
@@ -16,7 +16,7 @@ index a850f63770e46293c0efe3ac03583bfcbc0ed946..607d6a73daba955734f651530e4d3db8
 +    implementation("org.jline:jline-terminal-jansi:3.25.1") // Leaf - Bump Dependencies
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
 -    implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
-+    implementation("net.kyori:adventure-text-serializer-ansi:4.15.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
++    implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
      implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
      /*
            Required to add the missing Log4j2Plugins.dat file from log4j-core
@@ -27,8 +27,8 @@ index a850f63770e46293c0efe3ac03583bfcbc0ed946..607d6a73daba955734f651530e4d3db8
 -    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
 -    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
 +    // Leaf start - Bump Dependencies
-+    implementation("org.apache.logging.log4j:log4j-core:2.22.1") // Paper - implementation
++    implementation("org.apache.logging.log4j:log4j-core:2.23.0") // Paper - implementation
-+    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.22.1") // Paper - Needed to generate meta for our Log4j plugins
++    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.23.0") // Paper - Needed to generate meta for our Log4j plugins
      runtimeOnly(log4jPlugins.output)
      alsoShade(log4jPlugins.output)
 -    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
@@ -36,7 +36,7 @@ index a850f63770e46293c0efe3ac03583bfcbc0ed946..607d6a73daba955734f651530e4d3db8
      // Paper end
 -    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
 -    implementation("org.ow2.asm:asm-commons:9.5")
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
++    implementation("org.apache.logging.log4j:log4j-iostreams:2.23.0") // Paper - remove exclusion
 +    implementation("org.ow2.asm:asm-commons:9.6")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
@@ -57,18 +57,20 @@ index a850f63770e46293c0efe3ac03583bfcbc0ed946..607d6a73daba955734f651530e4d3db8
      // Paper end - Use Velocity cipher
  
      runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-@@ -72,11 +74,15 @@ dependencies {
+@@ -72,12 +74,16 @@ dependencies {
      implementation("dev.omega24:upnp4j:1.0")
      // Purpur end
  
 -    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
 -    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
 +    // Leaf start - Bump Dependencies
-+    testImplementation("io.github.classgraph:classgraph:4.8.165") // Paper - mob goal test
++    testImplementation("io.github.classgraph:classgraph:4.8.167") // Paper - mob goal test
 +    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
      testImplementation("org.hamcrest:hamcrest:2.2")
 -    testImplementation("org.mockito:mockito-core:5.5.0")
-+    testImplementation("org.mockito:mockito-core:5.10.0")
+-    testImplementation("org.ow2.asm:asm-tree:9.5")
++    testImplementation("org.mockito:mockito-core:5.11.0")
++    testImplementation("org.ow2.asm:asm-tree:9.6")
      testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
 +
 +    implementation("io.netty:netty-all:4.1.107.Final")
@@ -76,7 +78,7 @@ index a850f63770e46293c0efe3ac03583bfcbc0ed946..607d6a73daba955734f651530e4d3db8
  }
  
  val craftbukkitPackageVersion = "1_20_R3" // Paper
-@@ -268,3 +274,7 @@ sourceSets {
+@@ -269,3 +275,7 @@ sourceSets {
      }
  }
  // Gale end - package license into jar

patches/server/0020-KeYi-Disable-arrow-despawn-counter-by-default.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 5fe6f626b63274e33f7c8b46441d17cf4ff9d533..fcc5d94b52036eb7b6c5e5316eef0919e7f6ea08 100644
+index 633bc62a41b2bc34496a507da9fe0e2eec10468d..f1c76f96a845208a11e45988f59abf128df37f0d 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -140,7 +140,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -138,7 +138,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
              public boolean loadPortalDestinationChunkBeforeEntityTeleport = false; // Gale - MultiPaper - load portal destination chunk before entity teleport
          }
  

patches/server/0021-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 2c19d6687e1554373e4c7f43a8fec8e770942f50..fbee057a90fb47f4b31388cdff052fbaf04b33d6 100644
+index 84712ae2d9f6024426fe4700f5539a5a33c2fc46..56f9b0c9277aeff3b2d3d7e44f8af6d8d6d23941 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -349,7 +349,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -350,7 +350,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
          ItemStack itemstack1 = other.getItem();
  
          if (Objects.equals(this.target, other.target) && ItemEntity.areMergable(itemstack, itemstack1)) {

patches/server/0025-Akarin-Save-Json-list-asynchronously.patch

@@ -8,10 +8,10 @@ Original license: GPL v3
 Original project: https://github.com/Akarin-project/Akarin
 
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 219e0059418e6d64f5b859ba253c3cf3e91713cf..ae5a8cd4d5a2d89918699f44b99f7332316553a0 100644
+index c524ca1eab9db011f8203835c43e244ff4101e87..b5a31105ca972f5b6a6b74786904631aa0998ce9 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -23,6 +23,7 @@ import java.util.stream.Stream;
+@@ -22,6 +22,7 @@ import java.util.stream.Stream;
  import javax.annotation.Nullable;
  
  import me.titaniumtown.ArrayConstants;

patches/server/0026-Slice-Smooth-Teleports.patch

@@ -19,10 +19,10 @@ index 0cc07f1df65a86cc4e2c0a254ea2cb782a797901..9950580f3d0387b142576bfdb6a8f743
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6fe6126dd37272ddeac89087887d9fe688a6bfcc..8fd80d1167edea751fec1c14deabc427c221e98b 100644
+index 7d98ba26ccde1e57378253e03c437650051f7843..42e6754ae5432a41f54064961bd5d66891a30612 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -969,10 +969,10 @@ public abstract class PlayerList {
+@@ -970,10 +970,10 @@ public abstract class PlayerList {
          ServerLevel worldserver2 = entityplayer1.serverLevel();
          LevelData worlddata = worldserver2.getLevelData();
  
@@ -36,7 +36,7 @@ index 6fe6126dd37272ddeac89087887d9fe688a6bfcc..8fd80d1167edea751fec1c14deabc427
          entityplayer1.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
          entityplayer1.connection.send(new ClientboundSetExperiencePacket(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ce70f01611181e8f4c7324c7b9f9944a8605c710..a7a4f3eb95786e0a1e70df97d0fcd48b8b39c0fd 100644
+index 19d91e4a94527eea6dda8d9bdf782f14414be512..6fe50b6dcda8d5356fccc7f3d9e30f21e3c1bef3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1266,6 +1266,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0028-Leaves-Server-Utils.patch

@@ -7,10 +7,10 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6c70002119d40a0074319d2ee85862930d6abf0e..3a1b8f57c74124dbb413651a099dbadbc2e28490 100644
+index 679209274fbbf8e10498ecec852b0994af2a39e7..ffb47d13563f0ff1f557dfe2ed53be7f170f12fa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -424,6 +424,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -425,6 +425,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
      public boolean fixedPose = false; // Paper - Expand Pose API
@@ -18,7 +18,7 @@ index 6c70002119d40a0074319d2ee85862930d6abf0e..3a1b8f57c74124dbb413651a099dbadb
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -2532,6 +2533,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2548,6 +2549,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  nbttagcompound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -26,7 +26,7 @@ index 6c70002119d40a0074319d2ee85862930d6abf0e..3a1b8f57c74124dbb413651a099dbadb
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2679,6 +2681,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2695,6 +2697,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end
@@ -38,7 +38,7 @@ index 6c70002119d40a0074319d2ee85862930d6abf0e..3a1b8f57c74124dbb413651a099dbadb
  
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -5110,4 +5117,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -5134,4 +5141,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return false;
      }
      // Purpur end

patches/server/0029-Leaves-Protocol-Core.patch

@@ -58,10 +58,10 @@ index 61cd58a5bb3d228b29b9cc4db11be03d4c833223..1610f21bbfbca0d12ca12373e56d90a5
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8fd80d1167edea751fec1c14deabc427c221e98b..80db3fcf338846770e8c8ee6aa7635a68f2b6753 100644
+index 42e6754ae5432a41f54064961bd5d66891a30612..9a3dbd337728374e3adb1071769f7824c2698fe3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -361,6 +361,7 @@ public abstract class PlayerList {
+@@ -362,6 +362,7 @@ public abstract class PlayerList {
          }
  
          player.didPlayerJoinEvent = true; // Gale - EMC - do not process chat/commands before player has joined
@@ -69,7 +69,7 @@ index 8fd80d1167edea751fec1c14deabc427c221e98b..80db3fcf338846770e8c8ee6aa7635a6
  
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
-@@ -619,6 +620,7 @@ public abstract class PlayerList {
+@@ -620,6 +621,7 @@ public abstract class PlayerList {
          return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(entityplayer.getDisplayName())));
      }
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
@@ -78,7 +78,7 @@ index 8fd80d1167edea751fec1c14deabc427c221e98b..80db3fcf338846770e8c8ee6aa7635a6
          org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
          ServerLevel worldserver = entityplayer.serverLevel();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 443e227ee762163fa19eefb3c554fa871ad07323..a1317e374066d2abe20064bc47e20f4b19db9705 100644
+index 3c3b98d13587ce21bffa14a79aed963a7ce1f176..db96be7e6f30ecab1349c1fe68fcdd2f4e27167d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -482,6 +482,7 @@ public final class CraftServer implements Server {
@@ -117,19 +117,22 @@ index 0000000000000000000000000000000000000000..f884f54f5a1f0665c290e014f088aae8
 +}
 diff --git a/src/main/java/top/leavesmc/leaves/protocol/core/LeavesProtocolManager.java b/src/main/java/top/leavesmc/leaves/protocol/core/LeavesProtocolManager.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..26544936005d167f764a823faebc200f59b2e008
+index 0000000000000000000000000000000000000000..740039a14fe915e7edd30273de628efd92512e4a
 --- /dev/null
 +++ b/src/main/java/top/leavesmc/leaves/protocol/core/LeavesProtocolManager.java
-@@ -0,0 +1,339 @@
+@@ -0,0 +1,361 @@
 +package top.leavesmc.leaves.protocol.core;
 +
 +import net.minecraft.network.FriendlyByteBuf;
++import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 +import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 +import net.minecraft.resources.ResourceLocation;
 +import net.minecraft.server.level.ServerPlayer;
 +import org.apache.commons.lang.ArrayUtils;
 +import org.jetbrains.annotations.NotNull;
 +
++import org.bukkit.event.player.PlayerKickEvent;
++
 +import java.io.File;
 +import java.io.IOException;
 +import java.lang.reflect.Constructor;
@@ -141,6 +144,7 @@ index 0000000000000000000000000000000000000000..26544936005d167f764a823faebc200f
 +import java.net.URLDecoder;
 +import java.nio.charset.StandardCharsets;
 +import java.util.ArrayList;
++import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.Enumeration;
 +import java.util.HashMap;
@@ -265,6 +269,8 @@ index 0000000000000000000000000000000000000000..26544936005d167f764a823faebc200f
 +                        return map.get(receiver).newInstance(id, buf);
 +                    } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
 +                        e.printStackTrace();
++                        buf.readBytes(buf.readableBytes());
++                        return new ErrorPayload(id, protocol.namespace(), receiver.payloadId());
 +                    }
 +                }
 +            }
@@ -273,6 +279,15 @@ index 0000000000000000000000000000000000000000..26544936005d167f764a823faebc200f
 +    }
 +
 +    public static void handlePayload(ServerPlayer player, CustomPacketPayload payload) {
++        if (payload instanceof ServerboundCustomPayloadPacket.UnknownPayload) {
++            return;
++        }
++
++        if (payload instanceof ErrorPayload errorPayload) {
++            player.connection.disconnect("Payload " + Arrays.toString(errorPayload.packetID) + " from " + Arrays.toString(errorPayload.protocolID) + " error", PlayerKickEvent.Cause.INVALID_PAYLOAD);
++            return;
++        }
++
 +        for (LeavesProtocol protocol : KNOW_RECEIVERS.keySet()) {
 +            if (!ArrayUtils.contains(protocol.namespace(), payload.id().getNamespace())) {
 +                continue;
@@ -437,6 +452,13 @@ index 0000000000000000000000000000000000000000..26544936005d167f764a823faebc200f
 +        }
 +    }
 +
++    public record ErrorPayload(ResourceLocation id, String[] protocolID,
++                               String[] packetID) implements CustomPacketPayload {
++        @Override
++        public void write(@NotNull FriendlyByteBuf buf) {
++        }
++    }
++
 +    public record EmptyPayload(ResourceLocation id) implements CustomPacketPayload {
 +
 +        public EmptyPayload(ResourceLocation location, FriendlyByteBuf buf) {

patches/server/0030-Leaves-Jade-Protocol.patch

@@ -9,10 +9,10 @@ Original project: https://github.com/LeavesMC/Leaves
 This patch is Powered by Jade(https://github.com/Snownee/Jade)
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index b2a92648490ac54cd6ecc3bbfb9740db684284ce..1fbd034002fd5761011976510b9f9263ca0f5cac 100644
+index 93e321a0b8fdce12968f03b3cfe6724ae564b823..cd696f6bb7f77338dd289c7c2d6bdf23d79264aa 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -288,7 +288,7 @@ public class Tadpole extends AbstractFish {
+@@ -291,7 +291,7 @@ public class Tadpole extends AbstractFish {
  
      }
  

patches/server/0032-Leaves-Xaero-Map-Protocol.patch

@@ -7,10 +7,10 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 80db3fcf338846770e8c8ee6aa7635a68f2b6753..d9640b2a08101e9bd65323019c1de9c087822dde 100644
+index 9a3dbd337728374e3adb1071769f7824c2698fe3..e960528f7e261552b3936e596d0ff9c285a151ca 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1375,6 +1375,7 @@ public abstract class PlayerList {
+@@ -1376,6 +1376,7 @@ public abstract class PlayerList {
          player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
          player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
          player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));

patches/server/0035-Leaves-Fix-vehicle-teleport-by-end-gateway.patch

@@ -7,10 +7,10 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 72a69569fab9d62c27c3ea4005c4e24816bdc5cd..0c36da54212a7e5ccc2277539daa79e014e0b689 100644
+index f5e9b99459c3e7d28272f0c2499794f9710f57ce..fdfd3cb1d96da85b17139e8030040ce9aa5ae479 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -107,7 +107,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -108,7 +108,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
              if (!list.isEmpty()) {
                  // Paper start - Ensure safe gateway teleport
                  for (Entity entity : list) {

patches/server/0038-Sync-with-Gale-s-Optimize-sun-burn-tick.patch.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sync with Gale's Optimize-sun-burn-tick.patch
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3a1b8f57c74124dbb413651a099dbadbc2e28490..c2cd75fe46adaa59b8f25dbb5f29c66796e1b60e 100644
+index ffb47d13563f0ff1f557dfe2ed53be7f170f12fa..f9b0c49423ec9a66389f9f0e93e57ef7714cbe08 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -567,13 +567,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -568,13 +568,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      // Purpur start - copied from Mob
@@ -42,10 +42,10 @@ index 3a1b8f57c74124dbb413651a099dbadbc2e28490..c2cd75fe46adaa59b8f25dbb5f29c667
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2f06a3226f05797d6e2427e444a568bf06c67e3a..b0f151360a6263192aed9c1ff79c442bfe488483 100644
+index 70b5f3ce8d94765e84215015dd0c268f783990c9..ab442ad33124c75c261752d14d0ee209a673209e 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1740,11 +1740,6 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1741,11 +1741,6 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
      }
  

patches/server/0039-Petal-Async-Pathfinding.patch

@@ -15,10 +15,10 @@ This patch was ported downstream from the Petal fork.
 Makes most pathfinding-related work happen asynchronously
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b0f151360a6263192aed9c1ff79c442bfe488483..6e3617696c50262574dfba2048f18edd1f7d88ef 100644
+index ab442ad33124c75c261752d14d0ee209a673209e..0f21e5d6c81203aff833d02e5cc3a43dadb876e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -294,6 +294,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -295,6 +295,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
      @Nullable
      @Override
      public LivingEntity getTarget() {

patches/server/0040-Petal-Multithreaded-Tracker.patch

@@ -65,10 +65,10 @@ index 0fd814f1d65c111266a2b20f86561839a4cef755..3fbf6eeb3e835269217a381f00b54a7e
      protected final double maxFragFactor;
  
 diff --git a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
-index 66721a27cc9a373a12dffb72c4a403473377eff6..2fbab1b4d20c3ead0ed1a117b29679fae6776f22 100644
+index d8b22d51d28692182cd75affd6cb552971fed42f..63aa94b0004aa2ea5de5dce775453704e0fbc887 100644
 --- a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
 +++ b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
-@@ -36,7 +36,7 @@ public final class ChunkEntitySlices {
+@@ -37,7 +37,7 @@ public final class ChunkEntitySlices {
      protected final EntityCollectionBySection allEntities;
      protected final EntityCollectionBySection hardCollidingEntities;
      protected final Reference2ObjectOpenHashMap<Class<? extends Entity>, EntityCollectionBySection> entitiesByClass;
@@ -78,7 +78,7 @@ index 66721a27cc9a373a12dffb72c4a403473377eff6..2fbab1b4d20c3ead0ed1a117b29679fa
      public FullChunkStatus status;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2b9968a8a3d0d66d9db5a83dcf2a44767a9fe412..e95f6053982f9637c195243ceab37061b31355b5 100644
+index 546028b42544bd62578e415faa245559a373a289..29ea09f27f4b0a7f1ab6075e68c7379898ff2339 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1128,8 +1128,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -262,7 +262,7 @@ index 515e3f444e317de1d82421ad414c1ac10d4668ab..60e8bfc89cfb92e2f7d4860b11c16b3b
  
              set.clear();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a3b9068efc38b3eb05e884bcc3fb13532e49308d..f016b5e323f8167d058f61480095721684fd6e42 100644
+index 165b9f9ede6eec3e5667a2e653988f0e69ddb09f..0526ec7809f4937af85494679317f5fcbb6d8893 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2633,7 +2633,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0044-Reduce-canSee-work.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce canSee work
 Credit by: Martijn Muijsers <martijnmuijsers@live.nl>, MachineBreaker<machinebreaker>
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 36a420f8cf463dcabe5717df1af59472db3142fc..3c5d8275782df8d9b3fb6e8047bfde02e26ca93f 100644
+index ff05efe0b78defe3d25905b6a2984bdb646fcff3..4c40245756cfbe4ba14069c58d615cea7e2fbf38 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -383,17 +383,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -392,17 +392,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          for (int i = 0, len = entities.size(); i < len; ++i) {
              Entity entity = entities.get(i);
  
@@ -35,7 +35,7 @@ index 36a420f8cf463dcabe5717df1af59472db3142fc..3c5d8275782df8d9b3fb6e8047bfde02
              if (net.minecraft.world.phys.shapes.Shapes.joinIsNotEmpty(voxelshape, net.minecraft.world.phys.shapes.Shapes.create(entity.getBoundingBox()), net.minecraft.world.phys.shapes.BooleanOp.AND)) {
                  return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a7a4f3eb95786e0a1e70df97d0fcd48b8b39c0fd..2dc391fed96464ccecbd8adbd0795cdf61095aa2 100644
+index 6fe50b6dcda8d5356fccc7f3d9e30f21e3c1bef3..ad282ad487912c5687916b93be605b21a1ff8f15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -555,6 +555,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0048-Fix-sprint-glitch.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix sprint glitch
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f70f58937eedd69ebb46fefb367ab253293d2d96..8dd11653a39ea94d6a4b307faebcbb3b4f3e33dd 100644
+index dccb8934428b0c29e35f2bf9968fd32443dc11eb..becdbc814361a7823657759087b2ffcbd778b0e4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1431,7 +1431,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1439,7 +1439,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  player.setRealHealth(health);
              }
  

patches/server/0050-Configurable-movement-speed-of-more-entities.patch

@@ -113,10 +113,10 @@ index feba8a264bae656244f60296d0511a8046297f73..2a24928fc4509ac3603f7e5ce574fed8
      @Override
      protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95fe8eceb7 100644
+index cd73f0e40e5010e3069330ae66120dace63cde56..f6338904ca0961cfd67326908e9cf72e37c6e86e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1535,6 +1535,7 @@ public class PurpurWorldConfig {
+@@ -1530,6 +1530,7 @@ public class PurpurWorldConfig {
      public boolean drownedTakeDamageFromWater = false;
      public boolean drownedBreakDoors = false;
      public boolean drownedAlwaysDropExp = false;
@@ -124,7 +124,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      private void drownedSettings() {
          drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
          drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -1552,6 +1553,7 @@ public class PurpurWorldConfig {
+@@ -1547,6 +1548,7 @@ public class PurpurWorldConfig {
          drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
          drownedBreakDoors = getBoolean("mobs.drowned.can-break-doors", drownedBreakDoors);
          drownedAlwaysDropExp = getBoolean("mobs.drowned.always-drop-exp", drownedAlwaysDropExp);
@@ -132,7 +132,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      }
  
      public boolean elderGuardianRidable = false;
-@@ -1898,6 +1900,7 @@ public class PurpurWorldConfig {
+@@ -1893,6 +1895,7 @@ public class PurpurWorldConfig {
      public boolean huskJockeyTryExistingChickens = true;
      public boolean huskTakeDamageFromWater = false;
      public boolean huskAlwaysDropExp = false;
@@ -140,7 +140,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      private void huskSettings() {
          huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
          huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
-@@ -1914,6 +1917,7 @@ public class PurpurWorldConfig {
+@@ -1909,6 +1912,7 @@ public class PurpurWorldConfig {
          huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
          huskTakeDamageFromWater = getBoolean("mobs.husk.takes-damage-from-water", huskTakeDamageFromWater);
          huskAlwaysDropExp = getBoolean("mobs.husk.always-drop-exp", huskAlwaysDropExp);
@@ -148,7 +148,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      }
  
      public boolean illusionerRidable = false;
-@@ -3124,6 +3128,7 @@ public class PurpurWorldConfig {
+@@ -3119,6 +3123,7 @@ public class PurpurWorldConfig {
      public boolean zombieTakeDamageFromWater = false;
      public boolean zombieAlwaysDropExp = false;
      public double zombieHeadVisibilityPercent = 0.5D;
@@ -156,7 +156,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -3143,6 +3148,7 @@ public class PurpurWorldConfig {
+@@ -3138,6 +3143,7 @@ public class PurpurWorldConfig {
          zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
          zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);
          zombieHeadVisibilityPercent = getDouble("mobs.zombie.head-visibility-percent", zombieHeadVisibilityPercent);
@@ -164,7 +164,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      }
  
      public boolean zombieHorseRidable = false;
-@@ -3191,6 +3197,7 @@ public class PurpurWorldConfig {
+@@ -3186,6 +3192,7 @@ public class PurpurWorldConfig {
      public int zombieVillagerCuringTimeMax = 6000;
      public boolean zombieVillagerCureEnabled = true;
      public boolean zombieVillagerAlwaysDropExp = false;
@@ -172,7 +172,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -3210,6 +3217,7 @@ public class PurpurWorldConfig {
+@@ -3205,6 +3212,7 @@ public class PurpurWorldConfig {
          zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
          zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled);
          zombieVillagerAlwaysDropExp = getBoolean("mobs.zombie_villager.always-drop-exp", zombieVillagerAlwaysDropExp);
@@ -180,7 +180,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -3223,6 +3231,7 @@ public class PurpurWorldConfig {
+@@ -3218,6 +3226,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
      public boolean zombifiedPiglinTakeDamageFromWater = false;
      public boolean zombifiedPiglinAlwaysDropExp = false;
@@ -188,7 +188,7 @@ index 8769b5b74ec14ddae8210008b84a9ca82b2aa6f1..a750e4e499a30499538072644c24cf95
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -3240,6 +3249,7 @@ public class PurpurWorldConfig {
+@@ -3235,6 +3244,7 @@ public class PurpurWorldConfig {
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
          zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
          zombifiedPiglinAlwaysDropExp = getBoolean("mobs.zombified_piglin.always-drop-exp", zombifiedPiglinAlwaysDropExp);

patches/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch

@@ -13,7 +13,7 @@ Fixed errors in console has no color,also fixed`Advanced terminal features are n
 or `Unable to create terminal` like issues
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 607d6a73daba955734f651530e4d3db87110eb16..7953623fe9858b9d8996a73a2c0145a9d736337e 100644
+index e83c550469dfc70a190c5daf2d4a918fa9048863..b1fd42d66874f29428a22570059f07696b487d5e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -33,7 +33,7 @@ dependencies {
@@ -22,7 +22,7 @@ index 607d6a73daba955734f651530e4d3db87110eb16..7953623fe9858b9d8996a73a2c0145a9
      implementation("org.jline:jline-terminal-jansi:3.25.1") // Leaf - Bump Dependencies
 -    implementation("net.minecrell:terminalconsoleappender:1.3.0")
 +    implementation("com.github.Dreeam-qwq:TerminalConsoleAppender:360a0759") // Leaf - Use own TerminalConsoleAppender fork to fix some issues under latest version of jline/log4j
-     implementation("net.kyori:adventure-text-serializer-ansi:4.15.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
+     implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
      implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
      /*
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java

patches/server/0053-Reduce-items-finding-hopper-nearby-check.patch

@@ -10,7 +10,7 @@ But still recommend to turn-off `checkForMinecartNearItemWhileActive`
 Since `Reduce-hopper-item-checks.patch` will cause lag under massive dropped items
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index fbee057a90fb47f4b31388cdff052fbaf04b33d6..a68a6649d4ab40de1703ecc188566c9499ed4abc 100644
+index 56f9b0c9277aeff3b2d3d7e44f8af6d8d6d23941..35b15c6e7371b19876e138e033d42f1fcb412541 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -1,7 +1,9 @@
@@ -23,8 +23,8 @@ index fbee057a90fb47f4b31388cdff052fbaf04b33d6..a68a6649d4ab40de1703ecc188566c94
  import java.util.Objects;
  import java.util.UUID;
  import javax.annotation.Nullable;
-@@ -237,7 +239,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -238,7 +240,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
-                 this.discard();
+                 this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
                  return; // Gale - EMC - reduce hopper item checks
              }
 -            this.markNearbyHopperCartsAsImmune(); // Gale - EMC - reduce hopper item checks
@@ -34,7 +34,7 @@ index fbee057a90fb47f4b31388cdff052fbaf04b33d6..a68a6649d4ab40de1703ecc188566c94
  
          }
      }
-@@ -249,17 +253,53 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -250,17 +254,53 @@ public class ItemEntity extends Entity implements TraceableEntity {
          if (config.interval <= 1) {
              return;
          }
@@ -89,7 +89,7 @@ index fbee057a90fb47f4b31388cdff052fbaf04b33d6..a68a6649d4ab40de1703ecc188566c94
      @Override
      public void inactiveTick() {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index fcc5d94b52036eb7b6c5e5316eef0919e7f6ea08..704791c80d42a653c8e02440d46cd96e6adb5fb5 100644
+index f1c76f96a845208a11e45988f59abf128df37f0d..53375e9509a0871f337eefc387d1d9cbb53f5c1a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -76,10 +76,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0054-LinearPurpur-Add-Linear-region-format.patch

@@ -17,7 +17,7 @@ This format saves about 50% of disk space.
 Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7953623fe9858b9d8996a73a2c0145a9d736337e..8fd100c7caa71044fcfad0fe463862fb484327f3 100644
+index b1fd42d66874f29428a22570059f07696b487d5e..9d7cc530187263c6a4ed99df2c79d66d76749cc6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -32,6 +32,8 @@ dependencies {
@@ -28,7 +28,7 @@ index 7953623fe9858b9d8996a73a2c0145a9d736337e..8fd100c7caa71044fcfad0fe463862fb
 +    implementation("org.lz4:lz4-java:1.8.0") // LinearPurpur
      implementation("org.jline:jline-terminal-jansi:3.25.1") // Leaf - Bump Dependencies
      implementation("com.github.Dreeam-qwq:TerminalConsoleAppender:360a0759") // Leaf - Use own TerminalConsoleAppender fork to fix some issues under latest version of jline/log4j
-     implementation("net.kyori:adventure-text-serializer-ansi:4.15.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
+     implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
 diff --git a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java b/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
 index 2934f0cf0ef09c84739312b00186c2ef0019a165..e67543ef424d448096379bef118b8cb24b938964 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
@@ -140,7 +140,7 @@ index 6da8bd049f3a9838383864df03a042b996f8e8a9..754fff2c0305f2bf5ce1d080f0f0d912
  
          return flag3;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index af1cd2916a892b4c20ca26187a801ed713325a73..8fed9395a4c91d25781000478fb83763cae3a50c 100644
+index 80168d2a040c02504af3a4f3f68802afb327046d..fdd72e567a1a59153da2adb35a9605b828698535 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -246,7 +246,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -187,7 +187,7 @@ index af1cd2916a892b4c20ca26187a801ed713325a73..8fed9395a4c91d25781000478fb83763
          regionFile.setStatus(chunkPos.x, chunkPos.z, ChunkSerializer.getStatus(compound));
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f016b5e323f8167d058f61480095721684fd6e42..055d606db6a138754af22d1ffee2117cf47e6606 100644
+index 0526ec7809f4937af85494679317f5fcbb6d8893..005549acdd30c88d14df9051cbb732baf38282e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -419,8 +419,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -663,7 +663,7 @@ index 0c8bcfbe35f9133a32a31163e5bf2f04786c77a0..63b5a0993207c55357ac507c974dea77
      private static void disableGiveCommandDrops() {
          disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a750e4e499a30499538072644c24cf95fe8eceb7..1487074c45dfce7c8b22efee339a2d6060bc6172 100644
+index f6338904ca0961cfd67326908e9cf72e37c6e86e..21c15670c0c9b988472ac8e875a1c0332060fac3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -27,6 +27,7 @@ import java.util.Map;

patches/server/0056-Plazma-Add-missing-purpur-configuration-options.patch

@@ -88,10 +88,10 @@ index 2957a7617acae18e23d8ffb90ed5c790681da9c1..4da22d7e536706f2ce892d15435b56a6
  
      public int getPurpurBreedTime() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 1fbd034002fd5761011976510b9f9263ca0f5cac..a9d75fe602d0f946519582d2eaf2eb55db69e4b8 100644
+index cd696f6bb7f77338dd289c7c2d6bdf23d79264aa..5b333513bd618c9b108bae13299431bc4b66ad35 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -87,6 +87,23 @@ public class Tadpole extends AbstractFish {
+@@ -90,6 +90,23 @@ public class Tadpole extends AbstractFish {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
@@ -167,10 +167,10 @@ index df0d0868c11c26b2cadc1a07196a0191e16838a0..5ebef8ad47b8dc27de23b878eec86f51
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-index bc3fe45d12ffc2069a03d1587b7623d31130565a..fd574aed480b980a231a017bab262acb7c1870b6 100644
+index 58af87b8faf4f8d6bdb111c49a429466acface68..7ae4b748ee6c95feb64d514292e31bea8c52e29d 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-@@ -41,7 +41,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -43,7 +43,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
      public ChestBoat(EntityType<? extends Boat> type, Level world) {
          super(type, world);
@@ -179,7 +179,7 @@ index bc3fe45d12ffc2069a03d1587b7623d31130565a..fd574aed480b980a231a017bab262acb
      }
  
      public ChestBoat(Level world, double d0, double d1, double d2) {
-@@ -161,7 +161,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -170,7 +170,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
      @Override
      public int getContainerSize() {
@@ -209,10 +209,10 @@ index 63b5a0993207c55357ac507c974dea77206e80f4..e45c11bf2c42e6d57f803349d8ca6936
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1487074c45dfce7c8b22efee339a2d6060bc6172..21fcfb68b3026e07bf332c802f23caa44894d583 100644
+index 21c15670c0c9b988472ac8e875a1c0332060fac3..60b8b2c797f842a1ba5053a9e9e5d1bf21ac5c6d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1195,7 +1195,15 @@ public class PurpurWorldConfig {
+@@ -1190,7 +1190,15 @@ public class PurpurWorldConfig {
      public boolean allayRidableInWater = true;
      public boolean allayControllable = true;
      public List<String> allayRespectNBT = new ArrayList<>();
@@ -228,7 +228,7 @@ index 1487074c45dfce7c8b22efee339a2d6060bc6172..21fcfb68b3026e07bf332c802f23caa4
          allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
          allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
          allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
-@@ -1314,7 +1322,15 @@ public class PurpurWorldConfig {
+@@ -1309,7 +1317,15 @@ public class PurpurWorldConfig {
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
      public int camelBreedingTicks = 6000;
@@ -244,7 +244,7 @@ index 1487074c45dfce7c8b22efee339a2d6060bc6172..21fcfb68b3026e07bf332c802f23caa4
          camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
          camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
          camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
-@@ -1744,7 +1760,15 @@ public class PurpurWorldConfig {
+@@ -1739,7 +1755,15 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -260,7 +260,7 @@ index 1487074c45dfce7c8b22efee339a2d6060bc6172..21fcfb68b3026e07bf332c802f23caa4
          frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
          frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
          frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
-@@ -2690,7 +2714,13 @@ public class PurpurWorldConfig {
+@@ -2685,7 +2709,13 @@ public class PurpurWorldConfig {
      public boolean snifferControllable = true;
      public double snifferMaxHealth = 14.0D;
      public int snifferBreedingTicks = 6000;
@@ -274,7 +274,7 @@ index 1487074c45dfce7c8b22efee339a2d6060bc6172..21fcfb68b3026e07bf332c802f23caa4
          snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
          snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
          snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
-@@ -2789,7 +2819,15 @@ public class PurpurWorldConfig {
+@@ -2784,7 +2814,15 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = true;
      public boolean tadpoleControllable = true;
@@ -290,7 +290,7 @@ index 1487074c45dfce7c8b22efee339a2d6060bc6172..21fcfb68b3026e07bf332c802f23caa4
          tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
          tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
          tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
-@@ -3001,7 +3039,15 @@ public class PurpurWorldConfig {
+@@ -2996,7 +3034,15 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = true;
      public boolean wardenControllable = true;

patches/server/0063-Polpot-Make-egg-and-snowball-can-knockback-player.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Polpot: Make egg and snowball can knockback player
 Original project: https://github.com/PolpotMC/Polpot
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-index 440d3d72d8b2dac14f83a83caa5ae9dbf3e979b6..2aaa9458e5cef1a5b8c06e26ae8f61021d4bb4eb 100644
+index bb61e1132c28274175215a679befdcfa2496b099..8cc2c353334f6cfcadb8c12e96ad09f746b41bf8 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
 @@ -3,6 +3,7 @@ package net.minecraft.world.entity.projectile;
@@ -17,10 +17,10 @@ index 440d3d72d8b2dac14f83a83caa5ae9dbf3e979b6..2aaa9458e5cef1a5b8c06e26ae8f6102
  import net.minecraft.world.entity.Entity;
  import net.minecraft.world.entity.EntityType;
  import net.minecraft.world.entity.LivingEntity;
-@@ -55,6 +56,12 @@ public class Snowball extends ThrowableItemProjectile {
+@@ -61,6 +62,12 @@ public class Snowball extends ThrowableItemProjectile {
-         Entity entity = entityHitResult.getEntity();
          int i = entity.level().purpurConfig.snowballDamage >= 0 ? entity.level().purpurConfig.snowballDamage : entity instanceof Blaze ? 3 : 0; // Purpur
-         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float)i);
+ 
+         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
 +        // Leaf start - Polpot - Make snowball can knockback player
 +        if (org.dreeam.leaf.config.modules.gameplay.Knockback.snowballCanKnockback && entity instanceof ServerPlayer) {
 +            entity.hurt(this.damageSources().thrown(this, this.getOwner()), 0.0000001F);
@@ -31,10 +31,10 @@ index 440d3d72d8b2dac14f83a83caa5ae9dbf3e979b6..2aaa9458e5cef1a5b8c06e26ae8f6102
  
      // Purpur start - borrowed and modified code from ThrownPotion#onHitBlock and ThrownPotion#dowseFire
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
-index 785196e6f4677074890ca965e9add85ccfd0e6e3..6c9680bdac576b60124b30712c388626a70b1f0e 100644
+index 82bb8004635865f5202578d5a6f520048e7269d5..f1e2643926a020fd66967e64001f2987cfe334bf 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
-@@ -45,7 +45,14 @@ public class ThrownEgg extends ThrowableItemProjectile {
+@@ -46,7 +46,14 @@ public class ThrownEgg extends ThrowableItemProjectile {
      @Override
      protected void onHitEntity(EntityHitResult entityHitResult) {
          super.onHitEntity(entityHitResult);

patches/server/0065-Configurable-fix-tripwire-dupe.patch

@@ -67,13 +67,13 @@ index 0000000000000000000000000000000000000000..6d4887d9a523086aabb33c6959d3821b
 +    public static boolean enabled = true;
 +}
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 704791c80d42a653c8e02440d46cd96e6adb5fb5..8226f1f9b21e97c882248bc7227861381b1e5a2f 100644
+index 53375e9509a0871f337eefc387d1d9cbb53f5c1a..d0cef36361c579570bb69ba6a7225a533e88be79 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -109,7 +109,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -107,7 +107,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
-         public class Fixes extends ConfigurationPart {
  
-             public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
+         public Fixes fixes;
+         public class Fixes extends ConfigurationPart {
 -            public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
 +            //public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable // Leaf - Move to leaf config
              public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false; // Gale - MultiPaper - broadcast crit animations as the entity being critted

patches/server/0068-Including-5s-in-getTPS.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Including 5s in getTPS()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a1317e374066d2abe20064bc47e20f4b19db9705..9c447419c13c142731b6de0a88870eb2a991ddfb 100644
+index db96be7e6f30ecab1349c1fe68fcdd2f4e27167d..c7faba7ff1101f68fef4a67c502e45a66ec77b93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3137,6 +3137,8 @@ public final class CraftServer implements Server {
+@@ -3152,6 +3152,8 @@ public final class CraftServer implements Server {
  
      @Override
      public double[] getTPS() {

patches/server/0069-Remove-useless-creating-stats-json-bases-on-player-n.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove useless creating stats json bases on player name logic
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d9640b2a08101e9bd65323019c1de9c087822dde..8b855d6c41654e9849dc8fc8f80cf5ea9c6c554e 100644
+index e960528f7e261552b3936e596d0ff9c285a151ca..25c7f47382f8a9949e2785c36f67dcf455d33f5a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1579,6 +1579,8 @@ public abstract class PlayerList {
+@@ -1580,6 +1580,8 @@ public abstract class PlayerList {
              File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, uuid + ".json");
  
@@ -17,7 +17,7 @@ index d9640b2a08101e9bd65323019c1de9c087822dde..8b855d6c41654e9849dc8fc8f80cf5ea
              if (!file1.exists()) {
                  File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
-@@ -1587,6 +1589,8 @@ public abstract class PlayerList {
+@@ -1588,6 +1590,8 @@ public abstract class PlayerList {
                      file2.renameTo(file1);
                  }
              }