Updated Upstream (Leaf)

Author: Pascalpex

deepslateMC-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/leaf-server/build.gradle.kts
 +++ b/leaf-server/build.gradle.kts
-@@ -35,7 +_,30 @@
+@@ -37,7 +_,30 @@
          }
      }
 
@@ -32,7 +32,7 @@
      // Leaf end - project setup
 
      spigot {
-@@ -125,10 +_,14 @@
+@@ -127,10 +_,14 @@
      main {
          java { srcDir("../paper-server/src/main/java") }
          resources { srcDir("../paper-server/src/main/resources") }
@@ -47,7 +47,7 @@
      }
  }
 
-@@ -157,7 +_,7 @@
+@@ -159,7 +_,7 @@
  }
 
  dependencies {
@@ -56,7 +56,7 @@
 
      // Leaf start - Libraries
      implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
-@@ -272,14 +_,14 @@
+@@ -276,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1208,6 +_,7 @@
+@@ -1207,6 +_,7 @@
              // Paper end
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              org.dreeam.leaf.config.LeafConfig.regSparkExtraConfig(); // Leaf - Leaf config
 +            de.pascalpex.deepslatemc.files.Config.addSparkEntry(); // Deepslate - add deepslate.yml to spark
              Arrays.fill(this.recentTps, 20);
              // Paper start - further improve server tick loop
              long tickSection = Util.getNanos();
-@@ -1666,6 +_,19 @@
+@@ -1665,6 +_,19 @@
      private ServerStatus.Players buildPlayerStatus() {
          List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
          int maxPlayers = this.getMaxPlayers();
@@ -28,7 +28,7 @@
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
          } else {
-@@ -2100,7 +_,18 @@
+@@ -2079,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

gradle.properties

@@ -1,7 +1,7 @@
 group=de.pascalpex.deepslatemc
 version=1.21.6-R0.1-SNAPSHOT
 mcVersion=1.21.6
-leafRef=785c23460bb812ffc32ea3bd06dd7f6befcdd142
+leafRef=66887e3367a65c3e59f669a4033b04e027997862
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true