Don't attempt to clear registry that hasn't been loaded yet (#5101)

GeyserMC · Oct 24, 2024 · 29fe033 · 29fe033
1 parent e7ecb55
commit 29fe033
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
@@ -723,7 +723,9 @@ public void disable() {
         runIfNonNull(newsHandler, NewsHandler::shutdown);
         runIfNonNull(erosionUnixListener, UnixSocketClientListener::close);
 
-        Registries.RESOURCE_PACKS.get().clear();
+        if (Registries.RESOURCE_PACKS.loaded()) {
+            Registries.RESOURCE_PACKS.get().clear();
+        }
 
         this.setEnabled(false);
     }

diff --git a/core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java
@@ -112,6 +112,13 @@ public void load() {
         this.loaded = true;
     }
 
+    /**
+     * Whether this registry was loaded.
+     */
+    public boolean loaded() {
+        return this.loaded;
+    }
+
     /**
      * Creates a new deferred registry.
      *