Updated Upstream (Gale)

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "7.1.2" apply false
-    id("io.papermc.paperweight.patcher") version "1.4.1"
+    id("io.papermc.paperweight.patcher") version "1.5.1"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.19.3-R0.1-SNAPSHOT
 
-galeCommit = 0601d22510485c05a6eeb7aed4c84cd7aa644cc0
+galeCommit = e53e77c99216e5cab375091d3788b2e7e76665a9
 
 org.gradle.caching = true
 org.gradle.parallel = true

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 e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb824109af6b8b 100644
+index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..97a482d26bab77fc027f78665bbbedcbb15bae39 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -24,14 +24,14 @@ configurations.api {
@@ -55,7 +55,7 @@ index e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb8241
      compileOnly(annotations)
      testCompileOnly(annotations)
  
-@@ -63,8 +63,8 @@ dependencies {
+@@ -64,8 +64,8 @@ dependencies {
  
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
      testImplementation("junit:junit:4.13.2")
@@ -66,7 +66,7 @@ index e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb8241
  }
  
  configure<PublishingExtension> {
-@@ -110,9 +110,9 @@ tasks.withType<Javadoc> {
+@@ -111,9 +111,9 @@ tasks.withType<Javadoc> {
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
@@ -78,7 +78,7 @@ index e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb8241
          // Paper start
          //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
          "https://jd.adventure.kyori.net/api/$adventureVersion/",
-@@ -152,6 +152,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
+@@ -153,6 +153,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
      jarToScan.set(tasks.jar.flatMap { it.archiveFile })
      classpath.from(configurations.compileClasspath)
  }

patches/api/0009-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 a9f50779740e7fcec98ac8a88742858776a1fe05..ffbdc96d4fad7d603c5510675357ca06e828fb44 100644
+index 6acdd0c9a6ea65b06ad5dad4758efb64884daaf3..49b7960390cef1f2e00105ed07186608376b4ddf 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,9 @@ package org.bukkit.entity;
@@ -20,7 +20,7 @@ index a9f50779740e7fcec98ac8a88742858776a1fe05..ffbdc96d4fad7d603c5510675357ca06
  import com.destroystokyo.paper.ClientOption; // Paper
  import com.destroystokyo.paper.Title; // Paper
  import net.kyori.adventure.text.Component;
-@@ -2956,4 +2959,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3010,4 +3013,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0010-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 ffbdc96d4fad7d603c5510675357ca06e828fb44..989563b2cd8318c7d84ea40a5eacd56a22087289 100644
+index 49b7960390cef1f2e00105ed07186608376b4ddf..04da082de862bef1d345266fc763d480e3bed0bc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2819,6 +2819,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2873,6 +2873,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  

patches/server/0001-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e01986477360b1dbe991af6667e726e8ac656246..ff8e0b3ed28ed0c02e436f19945e1b76d2d5333f 100644
+index f5999d4e9834e19669301612044857d34bd64daa..bb7ecba3612a77191d26a3da2a3609748860b540 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,7 +9,7 @@ plugins {
@@ -17,7 +17,7 @@ index e01986477360b1dbe991af6667e726e8ac656246..ff8e0b3ed28ed0c02e436f19945e1b76
      // Depend on Paper MojangAPI
      implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
-@@ -79,7 +79,7 @@ tasks.jar {
+@@ -80,7 +80,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -62,7 +62,7 @@ index fe702a042cb132987e5135d2ed855484f9cef686..51704170ca171440e198a51b7fba563d
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7bb3275b2da8308696b18fb527514f9c4859d35..7b92f58c01234ef44cfe5d2e0806a7718f0e61d8 100644
+index a618eb60a7f6af1174e9cf1428fdd1cddceaf56d..b4cb8cdacc822d9bf238fcc2029b21c28ea1753b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0002-Leaf-Config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf Config
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ff8e0b3ed28ed0c02e436f19945e1b76d2d5333f..038ea85f4c9c1fcd0c4d3127944dfc81ed831d4f 100644
+index bb7ecba3612a77191d26a3da2a3609748860b540..b19fa7a84f97abb995143de14302658bf22b2904 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -48,6 +48,13 @@ dependencies {
+@@ -49,6 +49,13 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
  
@@ -51,7 +51,7 @@ index 51704170ca171440e198a51b7fba563dca8debb6..108245311279757c17b543b8bb0fcafd
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b49b2fe152b70c8020ba2edc48d46cc4fe8d525e..ed221b12ef4be57477b5915e4c3dcb193a2ce0da 100644
+index 1141b3a88e2eb1baa705b4f781353df0305a7c85..b104a38d2c879b649a3862876c389564c69e83b4 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -247,6 +247,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

patches/server/0003-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 038ea85f4c9c1fcd0c4d3127944dfc81ed831d4f..cc4c8d671a27c5cca17f2881603099e14c86c232 100644
+index b19fa7a84f97abb995143de14302658bf22b2904..d463f9e7613bffa692df966c8d1b6f1d0b63f661 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -17,7 +17,7 @@ dependencies {
@@ -17,7 +17,7 @@ index 038ea85f4c9c1fcd0c4d3127944dfc81ed831d4f..cc4c8d671a27c5cca17f2881603099e1
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
      /*
            Required to add the missing Log4j2Plugins.dat file from log4j-core
-@@ -25,28 +25,28 @@ dependencies {
+@@ -25,29 +25,29 @@ dependencies {
            all its classes to check if they are plugins.
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
@@ -30,8 +30,10 @@ index 038ea85f4c9c1fcd0c4d3127944dfc81ed831d4f..cc4c8d671a27c5cca17f2881603099e1
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
 -    implementation("org.ow2.asm:asm:9.3")
 -    implementation("org.ow2.asm:asm-commons:9.3") // Paper - ASM event executor generation
+-    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
 +    implementation("org.ow2.asm:asm:9.4")
 +    implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation
++    testImplementation("org.mockito:mockito-core:5.1.1") // Paper - switch to mockito
      implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
      implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
@@ -56,7 +58,7 @@ index 038ea85f4c9c1fcd0c4d3127944dfc81ed831d4f..cc4c8d671a27c5cca17f2881603099e1
  
      // Pufferfish start
      implementation("org.yaml:snakeyaml:1.33")
-@@ -55,9 +55,9 @@ dependencies {
+@@ -56,9 +56,9 @@ dependencies {
      }
      // Pufferfish end
  
@@ -68,7 +70,7 @@ index 038ea85f4c9c1fcd0c4d3127944dfc81ed831d4f..cc4c8d671a27c5cca17f2881603099e1
  
      implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
  }
-@@ -214,3 +214,6 @@ tasks.registerRunTask("runDev") {
+@@ -228,3 +228,6 @@ tasks.registerRunTask("runDev") {
      description = "Spin up a non-relocated Mojang-mapped test server"
      classpath(sourceSets.main.map { it.runtimeClasspath })
  }

patches/server/0009-Purpur-Implement-TPSBar.patch

@@ -78,7 +78,7 @@ index 108245311279757c17b543b8bb0fcafd31c5eaf8..590d697eb0b1e61d3b910ac5276598e6
          this.hasLoggedStop = true; // Paper
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ed221b12ef4be57477b5915e4c3dcb193a2ce0da..ae0c0c984c512b68a3e48d39743cd41b35674ce7 100644
+index b104a38d2c879b649a3862876c389564c69e83b4..001738c2553cb73a9ed647302a99b462a609e14a 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -51,6 +51,7 @@ import org.galemc.gale.command.GaleCommands;
@@ -89,7 +89,7 @@ index ed221b12ef4be57477b5915e4c3dcb193a2ce0da..ae0c0c984c512b68a3e48d39743cd41b
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -359,6 +360,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -366,6 +367,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
  
@@ -98,7 +98,7 @@ index ed221b12ef4be57477b5915e4c3dcb193a2ce0da..ae0c0c984c512b68a3e48d39743cd41b
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e6c2eff84ac596825a11574cf89956e70a344562..66082298aea31d17c8e9a85e3cca1951b2d53f87 100644
+index 82dec221441ad4b76af0aebf788af801a275be64..39a0bd651736c80cc558775d94794ee020c574a8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -269,6 +269,7 @@ public class ServerPlayer extends Player {

patches/server/0012-Purpur-Lagging-threshold.patch

@@ -27,10 +27,10 @@ index 590d697eb0b1e61d3b910ac5276598e6428189fe..fe25f51ee708c76bcf66e3280bb23571
                  }
                  // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7b92f58c01234ef44cfe5d2e0806a7718f0e61d8..28962c1d1881db69b7ae83413a73eff141bddde3 100644
+index b4cb8cdacc822d9bf238fcc2029b21c28ea1753b..8e3d8b34816a4c097fa6a001aae6eaa2d416af72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3001,4 +3001,10 @@ public final class CraftServer implements Server {
+@@ -3002,4 +3002,10 @@ public final class CraftServer implements Server {
      }
      // Gale end - YAPFA - last tick time - API
  

patches/server/0025-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/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d274e9373f7507dd38f2e0162c8a683b1ddde04e..7052b1fb5a2bf6099c92eeeab8c83098d97792c7 100644
+index 03430916a8107c1b0f04d84e1dce494e2da06e7a..74874910d339bd8fbec44755f1ab32fafd17d2e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -26,6 +26,9 @@ import java.util.Optional;
@@ -28,7 +28,7 @@ index d274e9373f7507dd38f2e0162c8a683b1ddde04e..7052b1fb5a2bf6099c92eeeab8c83098
  import org.bukkit.map.MapCursor;
  import org.bukkit.map.MapView;
  import org.bukkit.metadata.MetadataValue;
-@@ -3036,4 +3040,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3058,4 +3062,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

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

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2c2262a2babd4fd5ca22b4630c1f0ae5e3a1a9ab..27c3c32b2bbc0ba1420ecae635d42e9df054256a 100644
+index f940f54841455caf5959cb7c9289c5bf4a159f55..f5190797bc4e91f080abe1a01cac03913f3eb276 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -269,6 +269,7 @@ public class ServerPlayer extends Player {
@@ -38,10 +38,10 @@ index 94f3d84a1a89e1f1c720d6e7f19e93b1b0b5a865..e77d9b23ae797cc1b2d04028695bfa27
  
          // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7052b1fb5a2bf6099c92eeeab8c83098d97792c7..581bcd14e6a186bac1389dbbb25eca3625790db4 100644
+index 74874910d339bd8fbec44755f1ab32fafd17d2e9..f968f35aa0665e6ead59a221f30c2cd36da40ac0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1192,6 +1192,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1215,6 +1215,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      }
  

patches/server/0032-Hearse-Paper-chunk-system-changes.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Era4FunMC/Hearse
 
 diff --git a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
-index cef1c544a7fb6897fb7d86f5f4e31f7ba21fd417..0d0f330099baf9f078635432fb327a5118aca148 100644
+index b2e4fb69fd6564484e0ebd120ba87431c5c158e4..4945be5eac77c208d9aae317141414c0d154c4b1 100644
 --- a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
 +++ b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
 @@ -7,9 +7,9 @@ import io.papermc.paper.util.CoordinateUtils;
@@ -82,7 +82,7 @@ index cef1c544a7fb6897fb7d86f5f4e31f7ba21fd417..0d0f330099baf9f078635432fb327a51
  
      protected int getMaxConcurrentChunkSends() {
 @@ -523,17 +523,14 @@ public final class PlayerChunkLoader {
-         if (time < nextChunkSend) {
+         if (nextChunkSend - time > 0) {
              return;
          }
 +        PlayerLoaderData data1;
@@ -90,7 +90,7 @@ index cef1c544a7fb6897fb7d86f5f4e31f7ba21fd417..0d0f330099baf9f078635432fb327a51
 -        while (!this.chunkSendWaitQueue.isEmpty()) {
 -            final PlayerLoaderData data = this.chunkSendWaitQueue.first();
 -
--            if (data.nextChunkSendTarget > time) {
+-            if (data.nextChunkSendTarget - time > 0) {
 +        while ((data1 = this.chunkSendWaitQueue.pollFirst()) != null) {
 +            if (data1.nextChunkSendTarget - time > 0) {
 +                this.chunkSendWaitQueue.add(data1);

patches/server/0040-Hearse-Fix-some-threading-issue-in-bukkit-event-syst.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Era4FunMC/Hearse
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 28962c1d1881db69b7ae83413a73eff141bddde3..92e6393027aefdf3f765b468f3a46ab230160f67 100644
+index 8e3d8b34816a4c097fa6a001aae6eaa2d416af72..a28073845b7b0b0cdb5622f609cafb991ec7f447 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1,5 +1,6 @@
@@ -17,7 +17,7 @@ index 28962c1d1881db69b7ae83413a73eff141bddde3..92e6393027aefdf3f765b468f3a46ab2
  import com.google.common.base.Charsets;
  import com.google.common.base.Function;
  import com.google.common.base.Preconditions;
-@@ -2226,6 +2227,11 @@ public final class CraftServer implements Server {
+@@ -2227,6 +2228,11 @@ public final class CraftServer implements Server {
          return io.papermc.paper.util.TickThread.isTickThread(); // Paper - rewrite chunk system
      }