From 85c99bac5a9808321a81c99df454fa354e7ac4de Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Sun, 3 Dec 2023 22:29:56 -0500
Subject: [PATCH] Check NPC registry at startup, fixes #2168

---
 .../java/me/pikamug/quests/BukkitQuestsPlugin.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
index 9be5dda84..965b284d9 100644
--- a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
+++ b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
@@ -633,10 +633,12 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
                     depends.unlinkCitizens();
                 }
             }
-            if (depends.getZnpcsPlusApi() == null) {
-                getLogger().log(Level.SEVERE,
-                        "ZNPCsPlus was enabled but NpcApiProvider was null. Disabling linkage.");
-                depends.unlinkZnpcsPlusApi();
+            if (depends.getZnpcsPlusApi() != null) {
+                if (depends.getZnpcsPlusApi().getNpcRegistry() == null) {
+                    getLogger().log(Level.SEVERE,
+                            "ZNPCsPlus was enabled but NpcApiProvider was null. Disabling linkage.");
+                    depends.unlinkZnpcsPlusApi();
+                }
             }
             customLoader.init();
             questLoader.importQuests();