From bc2ae8192252fd70bdb757f5cfcf3dc8c843e21b Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Wed, 23 Dec 2020 02:11:11 -0500
Subject: [PATCH] Click to register NPC listener if Citizens link failed at
 startup

---
 main/src/main/java/me/blackvein/quests/Dependencies.java | 1 +
 main/src/main/java/me/blackvein/quests/Quests.java       | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/Dependencies.java b/main/src/main/java/me/blackvein/quests/Dependencies.java
index 7ac35689e..4e3261e5b 100644
--- a/main/src/main/java/me/blackvein/quests/Dependencies.java
+++ b/main/src/main/java/me/blackvein/quests/Dependencies.java
@@ -127,6 +127,7 @@ public class Dependencies {
         if (citizens == null && isPluginAvailable("Citizens")) {
             try {
                 citizens = (CitizensPlugin) plugin.getServer().getPluginManager().getPlugin("Citizens");
+                plugin.getServer().getPluginManager().registerEvents(plugin.getNpcListener(), plugin);
                 plugin.getLogger().info("Successfully linked Quests with Citizens " 
                         + citizens.getDescription().getVersion());
             } catch (final Exception e) {
diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java
index ae17b5465..b28b0826f 100644
--- a/main/src/main/java/me/blackvein/quests/Quests.java
+++ b/main/src/main/java/me/blackvein/quests/Quests.java
@@ -215,8 +215,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
         // 10 - Register listeners
         getServer().getPluginManager().registerEvents(blockListener, this);
         getServer().getPluginManager().registerEvents(itemListener, this);
-        if (depends.getCitizens() != null) {
-            getServer().getPluginManager().registerEvents(npcListener, this);
+        if (depends.getCitizens() != null) { // #getCitizens takes care of registering npcListener
             if (settings.canNpcEffects()) {
                 getServer().getScheduler().scheduleSyncRepeatingTask(this, effThread, 20, 20);
             }