Attempted fix at race condition

Author: dimaguy

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.16.9
 
 # Mod Properties
-mod_version=1.8.8
+mod_version=1.8.9
 maven_group=cc.reconnected
 archives_base_name=rcc-chatbox
 

src/main/java/cc/reconnected/chatbox/RccChatbox.java

@@ -94,6 +94,7 @@ public void onInitialize() {
                     LOGGER.error("Failed to create rcc-chatbox data directory");
                 }
             }
+            ChatboxEvents.register(server);
         });
 
         ServerLifecycleEvents.SERVER_STARTED.register(server -> {
@@ -108,13 +109,6 @@ public void onInitialize() {
             }
         });
 
-        ChatboxEvents.register();
 
-        if(isSolsticeLoaded()) {
-            SolsticeEvents.register();
-        }
-        if(isRccDiscordLoaded()) {
-            DiscordEvents.register();
-        }
     }
 }

src/main/java/cc/reconnected/chatbox/listeners/ChatboxEvents.java

@@ -37,7 +37,22 @@ public class ChatboxEvents {
 
     private static MinecraftServer mcServer;
 
-    public static void register() {
+    public static void register(MinecraftServer serverStarting) {
+        mcServer = serverStarting;
+        var initWss = new WsServer(new InetSocketAddress(RccChatbox.CONFIG.hostname, RccChatbox.CONFIG.port));
+
+        var wssThread = new Thread(initWss::start);
+        wssThread.start();
+
+        RccChatbox.getInstance().wss(initWss);
+
+        if(RccChatbox.isRccDiscordLoaded()) {
+            DiscordEvents.register();
+        }
+        if(RccChatbox.isSolsticeLoaded()) {
+            SolsticeEvents.register();
+        }
+
         ClientPacketsHandler.register();
         ClientConnectionEvents.CONNECT.register((conn, license, isGuest) -> {
             var playerData = PlayerMeta.getPlayer(license.userId());
@@ -61,18 +76,6 @@ public static void register() {
             conn.send(packetJson);
         });
 
-        ServerLifecycleEvents.SERVER_STARTING.register(server ->
-                mcServer = server);
-
-        ServerLifecycleEvents.SERVER_STARTED.register(server -> {
-            var wss = new WsServer(new InetSocketAddress(RccChatbox.CONFIG.hostname, RccChatbox.CONFIG.port));
-
-            var wssThread = new Thread(wss::start);
-            wssThread.start();
-
-            RccChatbox.getInstance().wss(wss);
-        });
-
         ServerLifecycleEvents.SERVER_STOPPING.register(server -> {
             if (RccChatbox.getInstance().wss() != null) {
                 try {