From 422d1055a8c4bb1feb76838d59e2c9d93db3673f Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Wed, 12 Feb 2020 08:21:30 -0500
Subject: [PATCH] Improve GUI Display code

---
 .../java/me/blackvein/quests/Quester.java     | 19 ++++----
 .../quests/listeners/PlayerListener.java      | 46 ++-----------------
 2 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java
index 1afad3fe7..cfa158355 100644
--- a/main/src/main/java/me/blackvein/quests/Quester.java
+++ b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -3683,16 +3683,6 @@ public class Quester {
             return false;
         }
         if (canAcceptOffer(quest, giveReason)) {
-            if (quest.getRegionStart() != null) {
-                if (!quest.isInRegion(this)) {
-                    if (giveReason) {
-                        String msg = Lang.get(getPlayer(), "questInvalidLocation");
-                        msg = msg.replace("<quest>", ChatColor.AQUA + quest.getName() + ChatColor.YELLOW);
-                        getPlayer().sendMessage(ChatColor.YELLOW + msg);
-                    }
-                    return false;
-                }
-            }
             if (getPlayer() instanceof Conversable) {
                 if (getPlayer().isConversing() == false) {
                     setQuestToTake(quest.getName());
@@ -3771,6 +3761,15 @@ public class Quester {
                 getPlayer().sendMessage(ChatColor.YELLOW + msg);
             }
             return false;
+        } else if (quest.getRegionStart() != null) {
+            if (!quest.isInRegion(this)) {
+                if (giveReason) {
+                    String msg = Lang.get(getPlayer(), "questInvalidLocation");
+                    msg = msg.replace("<quest>", ChatColor.AQUA + quest.getName() + ChatColor.YELLOW);
+                    getPlayer().sendMessage(ChatColor.YELLOW + msg);
+                }
+                return false;
+            }
         }
         return true;
     }
diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
index be549c303..c39ed7832 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -122,47 +122,11 @@ public class PlayerListener implements Listener {
                 for (Quest quest : plugin.getQuests()) {
                     if (quest.getGUIDisplay() != null) {
                         if (ItemUtil.compareItems(clicked, quest.getGUIDisplay(), false) == 0) {
-                            if (quester.getCurrentQuests().size() >= plugin.getSettings().getMaxQuests() 
-                                    && plugin.getSettings().getMaxQuests() > 0) {
-                                String msg = Lang.get(player, "questMaxAllowed");
-                                msg = msg.replace("<number>", String.valueOf(plugin.getSettings().getMaxQuests()));
-                                player.sendMessage(ChatColor.YELLOW + msg);
-                            } else if (quester.getCompletedQuests().contains(quest.getName()) 
-                                    && quest.getPlanner().getCooldown() < 0) {
-                                String completed = Lang.get(player, "questAlreadyCompleted");
-                                completed = completed.replace("<quest>", ChatColor.AQUA + quest.getName() 
-                                        + ChatColor.YELLOW);
-                                player.sendMessage(ChatColor.YELLOW + completed);
-                            } else {
-                                boolean takeable = true;
-                                if (quester.getCompletedQuests().contains(quest.getName())) {
-                                    if (quester.getCooldownDifference(quest) > 0) {
-                                        String early = Lang.get(player, "questTooEarly");
-                                        early = early.replace("<quest>", ChatColor.AQUA + quest.getName() 
-                                                + ChatColor.YELLOW);
-                                        early = early.replace("<time>", ChatColor.DARK_PURPLE 
-                                                + MiscUtil.getTime(quester.getCooldownDifference(quest)) 
-                                                + ChatColor.YELLOW);
-                                        player.sendMessage(ChatColor.YELLOW + early);
-                                        takeable = false;
-                                    }
-                                }
-                                if (quest.getRegionStart() != null) {
-                                    if (!quest.isInRegion(quester)) {
-                                        String invalidLoc = Lang.get(player, "questInvalidLocation");
-                                        invalidLoc = invalidLoc.replace("<quest>", ChatColor.AQUA + quest.getName() 
-                                                + ChatColor.YELLOW);
-                                        player.sendMessage(ChatColor.YELLOW + invalidLoc);
-                                        takeable = false;
-                                    }
-                                }
-                                if (takeable == true) {
-                                    try { 
-                                        quester.takeQuest(quest, false);
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                    
+                            if (quester.canAcceptOffer(quest, true)) {
+                                try { 
+                                    quester.takeQuest(quest, false);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
                                 }
                                 evt.getWhoClicked().closeInventory();
                             }