zzZZZZ

patches/server/0001-Rebrand.patch

@@ -215,15 +215,15 @@ index 0b5979723bb30f9011ac64c36d894aa41713ec9b..e220f5601f6b92b7b280ce8ebe64117d
 
          if (stream != null) {
 diff --git a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
-index 3d674eca7d20202d8f811c5c3e3946a12046028a..1c087ae6daaa0cdf23f3930eca0af390469eab3d 100644
+index 3d674eca7d20202d8f811c5c3e3946a12046028a..6fae3dedda0ce742e33040c7b85b5a596d9be76f 100644
 --- a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
 +++ b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
 @@ -5,7 +5,7 @@ package org.galemc.gale.version;
  public class GaleVersionFetcher extends AbstractPaperVersionFetcher {
 
      public GaleVersionFetcher() {
 -        super("ver/1.20.2", "https://github.com/GaleMC/Gale", "Gale", "GaleMC", "GaleMC", "Gale");
-+        super("ver/1.20.6", "https://github.com/Winds-Studio/Leaf", "Leaf", "Winds-Studio", "Winds-Studio", "Leaf"); // Leaf
++        super("ver/1.21", "https://github.com/Winds-Studio/Leaf", "Leaf", "Winds-Studio", "Winds-Studio", "Leaf"); // Leaf
      }
 
  }

patches/server/0032-Leaves-Appleskin-Protocol.patch → patches/server/0031-Leaves-Appleskin-Protocol.patch

@@ -11,13 +11,13 @@ Commit: e234432bd99e1c4b07c24d1dd247977226a7516a
 This patch is Powered by AppleSkin (https://github.com/squeek502/AppleSkin)
 
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-index b63d87d0593d116b0c5ee835dc4372f1b5542453..ef23577faaf7948d7a9b1def4d56506eab19cc80 100644
+index c852b3a8d31bc73d32aef215e4d3a82aa1fd8f19..1181ffae40b86a4212e199814d3e07e641a5a1f2 100644
 --- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 +++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-@@ -18,4 +18,7 @@ public class ProtocolSupport implements IConfigModule {
-
-     @ConfigInfo(baseName = "jade-protocol")
-     public static boolean jadeProtocol = false;
+@@ -15,4 +15,7 @@ public class ProtocolSupport implements IConfigModule {
+     public String getBaseName() {
+         return "protocol_support";
+     }
 +
 +    @ConfigInfo(baseName = "appleskin-protocol")
 +    public static boolean appleskinProtocol = false;

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

@@ -23,7 +23,7 @@ index 44abb103462dc5a2718b3112e94342c39dead554..5075e22ae84191b3d94ce7a8bcbf0ef7
              // CraftBukkit start - handle player weather
              // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-index ef23577faaf7948d7a9b1def4d56506eab19cc80..c9736e79387d785a67d6ebe71df6553eeaf2b41d 100644
+index 1181ffae40b86a4212e199814d3e07e641a5a1f2..be8474a514e7b9bdacd7cc89d8d3e8b3bc3eb709 100644
 --- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 +++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 @@ -4,6 +4,8 @@ import org.dreeam.leaf.config.ConfigInfo;
@@ -35,7 +35,7 @@ index ef23577faaf7948d7a9b1def4d56506eab19cc80..c9736e79387d785a67d6ebe71df6553e
  public class ProtocolSupport implements IConfigModule {
 
      @Override
-@@ -21,4 +23,9 @@ public class ProtocolSupport implements IConfigModule {
+@@ -18,4 +20,9 @@ public class ProtocolSupport implements IConfigModule {
 
      @ConfigInfo(baseName = "appleskin-protocol")
      public static boolean appleskinProtocol = false;

patches/server/0034-Chat-Image-protocol.patch → patches/server/0033-Chat-Image-protocol.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Chat Image protocol
 This patch is Powered by ChatImage (https://github.com/kitUIN/ChatImage)
 
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-index c9736e79387d785a67d6ebe71df6553eeaf2b41d..53ae1ecb7acf8e9d8b9b1c50d5a483008b303a66 100644
+index be8474a514e7b9bdacd7cc89d8d3e8b3bc3eb709..9324ca1f1abd2343b2f1eaec019e84428f01c626 100644
 --- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 +++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-@@ -24,6 +24,9 @@ public class ProtocolSupport implements IConfigModule {
+@@ -21,6 +21,9 @@ public class ProtocolSupport implements IConfigModule {
      @ConfigInfo(baseName = "appleskin-protocol")
      public static boolean appleskinProtocol = false;
 

patches/server/0035-Asteor-Bar-protocol.patch → patches/server/0034-Asteor-Bar-protocol.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Asteor Bar protocol
 This patch is Powered by AsteorBar (https://github.com/afoxxvi/AsteorBarMod)
 
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-index 53ae1ecb7acf8e9d8b9b1c50d5a483008b303a66..b91f0ae28f044ceed0b9db46669a4cca2d47cb2d 100644
+index 9324ca1f1abd2343b2f1eaec019e84428f01c626..45c422b993e254fd892bfd6f47a074f1e9688714 100644
 --- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 +++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-@@ -24,6 +24,9 @@ public class ProtocolSupport implements IConfigModule {
+@@ -21,6 +21,9 @@ public class ProtocolSupport implements IConfigModule {
      @ConfigInfo(baseName = "appleskin-protocol")
      public static boolean appleskinProtocol = false;
 

patches/server/0037-Faster-Random-for-xaeroMapServerID-generation.patch → patches/server/0036-Faster-Random-for-xaeroMapServerID-generation.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Faster Random for xaeroMapServerID generation
 
 
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-index b91f0ae28f044ceed0b9db46669a4cca2d47cb2d..8c71281004649e23adb6609a66ab4951b280c517 100644
+index 45c422b993e254fd892bfd6f47a074f1e9688714..0a9312fd2235ee350df3bf49e846216714ea1120 100644
 --- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 +++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 @@ -4,7 +4,7 @@ import org.dreeam.leaf.config.ConfigInfo;
@@ -17,7 +17,7 @@ index b91f0ae28f044ceed0b9db46669a4cca2d47cb2d..8c71281004649e23adb6609a66ab4951
 
  public class ProtocolSupport implements IConfigModule {
 
-@@ -33,5 +33,5 @@ public class ProtocolSupport implements IConfigModule {
+@@ -30,5 +30,5 @@ public class ProtocolSupport implements IConfigModule {
      @ConfigInfo(baseName = "xaero-map-protocol")
      public static boolean xaeroMapProtocol = false;
      @ConfigInfo(baseName = "xaero-map-server-id")

patches/server/0047-Plazma-Add-some-missing-Pufferfish-configurations.patch → patches/server/0046-Plazma-Add-some-missing-Pufferfish-configurations.patch

@@ -10,7 +10,7 @@ Add Pufferfish DAB support for Camel, Sniffer
 https://github.com/pufferfish-gg/Pufferfish/issues/83
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
-index 0d85300632c6476152e6c1072f84cb75d38dea77..54b9cf002e0b71027449cc2af09a52b11a3bb96d 100644
+index 7c7b063b0b563716757294792653a705fe7436f9..3d47ddcfd68e4499cf01ce766c72726c1d8a0c26 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 @@ -156,8 +156,10 @@ public class Armadillo extends Animal {

patches/server/0048-Plazma-Add-missing-purpur-configuration-options.patch → patches/server/0047-Plazma-Add-missing-purpur-configuration-options.patch

@@ -97,7 +97,7 @@ index da026533b15a1981000e73bba6c5209c13de28dc..96d2077abd0112f2b2b8c4678447afbf
          return this.level().purpurConfig.frogBreedingTicks;
      }
 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 5addd3243dd63041442f2a6bcf92a2128e4242c1..2ebce53c728a67a619255a7e8796dcb1a6f82045 100644
+index c51637514bf671c08dbe4e5ac55566b92b5876f9..736e5dbd1587693d33de72ce6a7f8a745e388114 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 @@ -95,6 +95,23 @@ public class Tadpole extends AbstractFish {

patches/server/0061-Fix-MC-2025.patch → patches/server/0056-Fix-MC-2025.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-2025
 Mojang issues: https://bugs.mojang.com/browse/MC-2025
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fd937544baae6835e1826a686676dcbfa58aca33..add6e68926cda8fc94fb6b37c3da20046b8c7346 100644
+index a8c7a433043ae670a34764ab3947b11b2fbf1671..0a730f1584f0b493b14ccf6c610ffd52f5a826b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2628,6 +2628,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2530,6 +2530,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
              // Purpur end
              nbttagcompound.put("Leaves.Data", leavesData); // Leaves - leaves ex data
@@ -26,7 +26,7 @@ index fd937544baae6835e1826a686676dcbfa58aca33..add6e68926cda8fc94fb6b37c3da2004
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2705,6 +2715,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2607,6 +2617,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          this.reapplyPosition();
                      }
 

patches/server/0062-Fix-MC-65198.patch → patches/server/0057-Fix-MC-65198.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-65198
 Mojang issues: https://bugs.mojang.com/browse/MC-65198
 
 diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
-index 7215af6cc91f48b040c23c54536d4aac8d293497..53002139c8ba4e4886cf73404c3bbd152421053a 100644
+index b3bd9bbd96efc4784b86c2be6bb857da4db919b8..5b65fade746fee7208719b20164bf944d8e8d3a8 100644
 --- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
 @@ -141,6 +141,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
@@ -20,17 +20,17 @@ index 7215af6cc91f48b040c23c54536d4aac8d293497..53002139c8ba4e4886cf73404c3bbd15
 @@ -179,7 +180,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
              }
 
-             this.activeQuickItem = itemstack; // Purpur
+             this.activeQuickItem = itemstack; // Purpur - Anvil API
 -            slot1.onTake(player, itemstack1);
 +            slot1.onTake(player, itemStack2); // Leaf - Fix MC-65198
-             this.activeQuickItem = null; // Purpur
+             this.activeQuickItem = null; // Purpur - Anvil API
          }
 
 diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
-index f17ff5988d826c8fad68f6bf7bac1d06edae01ae..02337174c26d7532c3ab99e269ec7ce8793b7f13 100644
+index 37a89bf79017eb65f82276b054a70ddb5eb5e549..05d0c97966f35a6e8576c975d33990f482d05e12 100644
 --- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java
 +++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
-@@ -45,7 +45,7 @@ public class ResultSlot extends Slot {
+@@ -46,7 +46,7 @@ public class ResultSlot extends Slot {
      @Override
      protected void checkTakeAchievements(ItemStack stack) {
          if (this.removeCount > 0) {
@@ -40,18 +40,18 @@ index f17ff5988d826c8fad68f6bf7bac1d06edae01ae..02337174c26d7532c3ab99e269ec7ce8
 
          if (this.container instanceof RecipeCraftingHolder recipeCraftingHolder) {
 diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index eade15820dd9db38b6af2a5c4314acfb14ca03e9..5fef8a6bc746a34a0b742c51f169a502bc9b6ce6 100644
+index 5ddae1afab0a68465ea60395c84b0997ee994f88..a67da91bbbe6fdfe44c40b13b426e2452dccd71e 100644
 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-@@ -259,6 +259,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+@@ -264,6 +264,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
              Item item = itemstack1.getItem();
 
              itemstack = itemstack1.copy();
 +            ItemStack itemStack2 = itemstack.copy(); // Leaf - Fix MC-65198
              if (slot == 1) {
                  item.onCraftedBy(itemstack1, player.level(), player);
                  if (!this.moveItemStackTo(itemstack1, 2, 38, true)) {
-@@ -291,7 +292,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+@@ -296,7 +297,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
                  return ItemStack.EMPTY;
              }
 

patches/server/0063-Including-5s-in-getTPS.patch → patches/server/0058-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 31b5beb4c3a3712d4f38a4ffef09675050f2eb04..f4b9a74ee268273098e4286354e436bbd3fc07f2 100644
+index 8e1bc7b117ac0766e3eb0f38cb33b71d6a972fb8..86c0965f339a592afba363607fd457a13d8bd6eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3177,6 +3177,8 @@ public final class CraftServer implements Server {
+@@ -3102,6 +3102,8 @@ public final class CraftServer implements Server {
 
      @Override
      public double[] getTPS() {

patches/server/0064-Remove-useless-creating-stats-json-bases-on-player-n.patch → patches/server/0059-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 c410f781371a87ecc2849144c747a6ac3182a65a..b87fa81ccee6792b3a202b2c193299dbd2cce112 100644
+index 5075e22ae84191b3d94ce7a8bcbf0ef7735e7f28..cc1039af787cff402afc54edbd53a3f271f66cd2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1580,6 +1580,8 @@ public abstract class PlayerList {
+@@ -1518,6 +1518,8 @@ public abstract class PlayerList {
              File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, String.valueOf(uuid) + ".json");
 
@@ -17,7 +17,7 @@ index c410f781371a87ecc2849144c747a6ac3182a65a..b87fa81ccee6792b3a202b2c193299db
              if (!file1.exists()) {
                  File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
-@@ -1588,6 +1590,8 @@ public abstract class PlayerList {
+@@ -1526,6 +1528,8 @@ public abstract class PlayerList {
                      file2.renameTo(file1);
                  }
              }