From 74d071ffe83d0f1006502bc2f790f9231e0f415c Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Mon, 9 May 2022 02:11:27 -0400
Subject: [PATCH] Forego no more quest string if empty, fixes #1956

---
 api/src/main/java/me/blackvein/quests/util/Lang.java   | 10 +++++++++-
 .../me/blackvein/quests/listeners/NpcListener.java     |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/me/blackvein/quests/util/Lang.java b/api/src/main/java/me/blackvein/quests/util/Lang.java
index 059bddece..1a8f08462 100644
--- a/api/src/main/java/me/blackvein/quests/util/Lang.java
+++ b/api/src/main/java/me/blackvein/quests/util/Lang.java
@@ -76,6 +76,7 @@ public class Lang {
 
     /**
      * Get key for lang string
+     *
      * @param value The lang string
      * @return key or "NULL" as String
      */
@@ -90,6 +91,7 @@ public class Lang {
 
     /**
      * Get prefixed key for lang value
+     *
      * @param value The lang string
      * @param keyPrefix String that the key starts with
      * @return full key or "NULL" as String
@@ -118,7 +120,13 @@ public class Lang {
         }
         return orig;
     }
-    
+
+    /**
+     * Send message if not null or empty
+     *
+     * @param player The player to send message to
+     * @param message The message to be sent
+     */
     public static void send(final Player player, final String message) {
         if (message != null && !ChatColor.stripColor(message).equals("")) {
             player.sendMessage(message);
diff --git a/core/src/main/java/me/blackvein/quests/listeners/NpcListener.java b/core/src/main/java/me/blackvein/quests/listeners/NpcListener.java
index 0c4deb876..2ab55f893 100644
--- a/core/src/main/java/me/blackvein/quests/listeners/NpcListener.java
+++ b/core/src/main/java/me/blackvein/quests/listeners/NpcListener.java
@@ -257,7 +257,7 @@ public class NpcListener implements Listener {
                         c.begin();
                     }
                 } else {
-                    evt.getClicker().sendMessage(ChatColor.YELLOW + Lang.get(player, "noMoreQuest"));
+                    Lang.send(player, ChatColor.YELLOW + Lang.get(player, "noMoreQuest"));
                 }
             }
         }