Updated Upstream (Gale)

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 db76574dd624e7edabc0fde717e7788dd66b7845..2f9fdb47acdcaddf1ab229d2219c6e5f715948c6 100644
+index 6253e761c595c8b89d08f9d42fe3e19cadbf4918..66740fa8e37204c3f7f9275b45f398d80f2ff44e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2024,6 +2024,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2021,6 +2021,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
          // Paper end
  

patches/api/0002-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8af9efe2dbc9563a2c327002cf05c5d2fd8fc68b..48ed37437a15a7b9acaa597eef1044beb355fbe8 100644
+index 0719e49dde343c80d18daf82d7fed926150d7d6d..f8610e8337a2d2800ccce4c5462e7e997a22f32c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -24,15 +24,17 @@ configurations.api {
@@ -82,9 +82,8 @@ index 8af9efe2dbc9563a2c327002cf05c5d2fd8fc68b..48ed37437a15a7b9acaa597eef1044be
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
--        "https://guava.dev/releases/31.0.1-jre/api/docs/",
 +        // Leaf - Bump Dependencies
-+        "https://guava.dev/releases/31.1-jre/api/docs/",
+         "https://guava.dev/releases/31.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
 +        "https://javadoc.io/doc/org.jetbrains/annotations/24.0.1/", // Paper - we don't want Java 5 annotations
@@ -92,7 +91,7 @@ index 8af9efe2dbc9563a2c327002cf05c5d2fd8fc68b..48ed37437a15a7b9acaa597eef1044be
          // Paper start
          //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
          "https://jd.advntr.dev/api/$adventureVersion/",
-@@ -154,6 +160,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
+@@ -155,6 +161,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
      jarToScan.set(tasks.jar.flatMap { it.archiveFile })
      classpath.from(configurations.compileClasspath)
  }

patches/api/0003-Purpur-Lagging-threshold.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index daf11e58b0a5f8cc8890af24fa51e3c46a4043b6..f9d2621e2e9972c6762bb3c5736398a0b9186d4a 100644
+index bf33dfa921e0099490e5485ac85a0c84645929e7..845ecdc47fd04ba919ca7891ded31571b1666cf3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2517,4 +2517,15 @@ public final class Bukkit {
+@@ -2514,4 +2514,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -27,10 +27,10 @@ index daf11e58b0a5f8cc8890af24fa51e3c46a4043b6..f9d2621e2e9972c6762bb3c5736398a0
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2f9fdb47acdcaddf1ab229d2219c6e5f715948c6..b8f99cd62439c3e3af62f36e77c4427680c0923c 100644
+index 66740fa8e37204c3f7f9275b45f398d80f2ff44e..abcdfea6203d28aa22c8fb802778d2d80aec461d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2226,4 +2226,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2223,4 +2223,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
  

patches/api/0004-Purpur-ChatColor-conveniences.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index e3f185dc982d1c38195a4e01ddd485c13ffa58c0..98c2f73ee5c921dab506fc933a0acff400201537 100644
+index ea4ceb643239c26851bacbf45fc3f2efef3bb4be..3b8395dcb73e3fb251adf7438cbc7e95c4185a3a 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -3,6 +3,7 @@ package org.bukkit;
@@ -18,7 +18,7 @@ index e3f185dc982d1c38195a4e01ddd485c13ffa58c0..98c2f73ee5c921dab506fc933a0acff4
  import java.util.regex.Pattern;
  import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
-@@ -454,4 +455,77 @@ public enum ChatColor {
+@@ -455,4 +456,77 @@ public enum ChatColor {
              BY_CHAR.put(color.code, color);
          }
      }

patches/api/0006-KTP-Optimize-Spigot-event-bus.patch

@@ -87,10 +87,10 @@ index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..8d3605f25e97a375971705c737bc7bac
              }
          }
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 1758e8a89c85eea8c2161ddcb5b0e745151a1f5e..050c839f06060b16ed7c284bffa3104ac4cd7276 100644
+index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..238384d4ecd3e39ca31bf232384dd4369e40ae20 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -305,4 +305,12 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -304,4 +304,12 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
      }
  
      // Paper 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 15c57f3e4e1c023e0f3168ce03dd770f006cf27b..54e33829b1ece5ba990b38f9fb86d39fbba9d714 100644
+index 2258276b31dda927003367a92e31f05f2c362b1e..840271a830e695e42d97212c174e32d19474e378 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -4,7 +4,10 @@ import java.net.InetSocketAddress;
@@ -22,7 +22,7 @@ index 15c57f3e4e1c023e0f3168ce03dd770f006cf27b..54e33829b1ece5ba990b38f9fb86d39f
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -3012,4 +3015,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3047,4 +3050,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot 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 54e33829b1ece5ba990b38f9fb86d39fbba9d714..3d9fe3723e020ba503d132065c4d164d9ba9c700 100644
+index 840271a830e695e42d97212c174e32d19474e378..7e43c769833b310b9e34afb48215c9b717a5a7fd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2897,6 +2897,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2932,6 +2932,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end