Updated Upstream (Leaf)

Author: Pascalpex

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -444,6 +_,19 @@
+@@ -451,6 +_,19 @@
          player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
 
          org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, getJoinMsg(mutableComponent, bukkitPlayer)); // Paper - Adventure // Leaf - Configurable connection message - join message
@@ -20,7 +20,7 @@
          this.cserver.getPluginManager().callEvent(playerJoinEvent);
 
          if (!player.connection.isAcceptingMessages()) {
-@@ -849,6 +_,15 @@
+@@ -856,6 +_,15 @@
              }
          }
          this.cserver.getPluginManager().callEvent(event);
@@ -36,7 +36,7 @@
          if (event.getResult() != org.bukkit.event.player.PlayerLoginEvent.Result.ALLOWED) {
              loginlistener.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.kickMessage())); // Paper - Adventure
              return null;
-@@ -896,7 +_,8 @@
+@@ -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)

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/files/Config.java

@@ -18,8 +18,8 @@
 
 public class Config {
 
-    public static File configFile = new File("deepslate", "deepslate.yml");
-    public static FileConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+    public static final File configFile = new File("deepslate", "deepslate.yml");
+    public static final FileConfiguration config = YamlConfiguration.loadConfiguration(configFile);
 
     private static final Logger LOGGER = LogManager.getLogger(Config.class.getSimpleName());
 

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/files/MessagesFile.java

@@ -2,13 +2,11 @@
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.JoinConfiguration;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.ComponentDecoder;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -22,8 +20,8 @@
 
 public class MessagesFile {
 
-    public static File configFile = new File("deepslate", "messages.yml");
-    public static FileConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+    public static final File configFile = new File("deepslate", "messages.yml");
+    public static final FileConfiguration config = YamlConfiguration.loadConfiguration(configFile);
 
     private static final Logger LOGGER = LogManager.getLogger(MessagesFile.class.getSimpleName());
     private static final MiniMessage miniMessage = MiniMessage.miniMessage();

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=8fe6d13765676050ac6deb9a8552558ee228866d
+leafRef=281a81784e9dce52a4d85f8f0a637d2dc697c608
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true