From 3694b61350e1fcad2045bddb2ca37d10aaff8bbf Mon Sep 17 00:00:00 2001
From: Ruben Taelman <rubensworks@gmail.com>
Date: Wed, 4 Sep 2024 17:04:45 +0200
Subject: [PATCH] Fix MinecraftServer not being available in
 MinecraftHelpersFabric

---
 .../cyclopscore/helper/MinecraftHelpersFabric.java        | 2 +-
 .../org/cyclops/cyclopscore/helper/ModHelpersFabric.java  | 8 ++++++--
 2 files changed, 7 insertions(+), 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
index 5993a869fb..2f24cd7343 100644
--- 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
index 4a073aad01..5d1e7fcc94 100644
--- 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