Fix MinecraftServer not being available in MinecraftHelpersFabric

CyclopsMC · Sep 4, 2024 · 3694b61 · 3694b61
1 parent ff4f0e9
commit 3694b61
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/loader-fabric/src/main/java/org/cyclops/cyclopscore/helper/MinecraftHelpersFabric.java b/loader-fabric/src/main/java/org/cyclops/cyclopscore/helper/MinecraftHelpersFabric.java
@@ -25,7 +25,7 @@ public class MinecraftHelpersFabric extends MinecraftHelpersCommon {
     private WeakReference<MinecraftServer> server;
 
     public MinecraftHelpersFabric() {
-        ServerLifecycleEvents.SERVER_STARTED.register(server -> {
+        ServerLifecycleEvents.SERVER_STARTING.register(server -> {
            this.server = new WeakReference<>(server);
         });
     }

diff --git a/loader-fabric/src/main/java/org/cyclops/cyclopscore/helper/ModHelpersFabric.java b/loader-fabric/src/main/java/org/cyclops/cyclopscore/helper/ModHelpersFabric.java
@@ -7,11 +7,15 @@ public class ModHelpersFabric extends ModHelpersCommon implements IModHelpersFab
 
     public static final ModHelpersFabric INSTANCE = new ModHelpersFabric();
 
-    private ModHelpersFabric() {}
+    private final IMinecraftHelpers minecraftHelpers;
+
+    private ModHelpersFabric() {
+        this.minecraftHelpers = new MinecraftHelpersFabric();
+    }
 
     @Override
     public IMinecraftHelpers getMinecraftHelpers() {
-        return new MinecraftHelpersFabric();
+        return this.minecraftHelpers;
     }
 
     @Override