Updated Upstream (Leaf)

Author: Pascalpex

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

@@ -20,7 +20,7 @@
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
          } else {
-@@ -2115,7 +_,18 @@
+@@ -2116,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1455,7 +_,7 @@
+@@ -1459,7 +_,7 @@
                                          io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
                                              toX, toY, toZ, toYaw, toPitch, true);
                                          if (!event.isAllowed()) {
@@ -9,7 +9,7 @@
                                                  LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getName().getString(), d3, d4, d5);
                                              }
                                              this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
-@@ -1531,7 +_,7 @@
+@@ -1535,7 +_,7 @@
                                      toX, toY, toZ, toYaw, toPitch, true);
                                  if (!event.isAllowed()) {
                                      movedWrongly = true;

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch

@@ -20,7 +20,7 @@
          this.cserver.getPluginManager().callEvent(playerJoinEvent);
 
          if (!player.connection.isAcceptingMessages()) {
-@@ -856,6 +_,15 @@
+@@ -857,6 +_,15 @@
              }
          }
          this.cserver.getPluginManager().callEvent(event);
@@ -36,13 +36,3 @@
          if (event.getResult() != org.bukkit.event.player.PlayerLoginEvent.Result.ALLOWED) {
              loginlistener.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.kickMessage())); // Paper - Adventure
              return null;
-@@ -903,7 +_,8 @@
-         // Leaf start - SparklyPaper - parallel world ticking mod (make configurable)
-         if (org.dreeam.leaf.config.modules.async.SparklyPaperParallelWorldTicking.enabled) {
-             // SparklyPaper - parallel world ticking (additional concurrency issues logs)
--            System.out.println("respawning player - current player container is " + player.containerMenu + " but their inventory is " + player.inventoryMenu);
-+            if (org.dreeam.leaf.config.modules.async.SparklyPaperParallelWorldTicking.logContainerCreationStacktraces) // Deepslate - Only log player respawns if container logs are on
-+                System.out.println("respawning player - current player container is " + player.containerMenu + " but their inventory is " + player.inventoryMenu);
-             if (location != null) // Leaf - THIS CAN BE NULL; see PlayerList::respawn(ServerPlayer, boolean, Entity.RemovalReason, PlayerRespawnEvent.RespawnReason)
-                 ca.spottedleaf.moonrise.common.util.TickThread.ensureOnlyTickThread("Cannot respawn player off-main, from world " + player.serverLevel().getWorld().getName() + " to world " + location.getWorld().getName());
-             else

gradle.properties

@@ -2,7 +2,7 @@ group=de.pascalpex.deepslatemc
 version=1.21.4-R0.1-SNAPSHOT
 packageVersion = 1_21_R3
 mcVersion=1.21.4
-leafRef=281a81784e9dce52a4d85f8f0a637d2dc697c608
+leafRef=3821c552e547241f4e3c2956d95f815c391e5c2a
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true