From 379bcec37cc306a92875b5036ae7e6c85c5c0f49 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Sun, 16 Feb 2020 22:53:02 -0500
Subject: [PATCH] Close GUI after taking quest from NPC, fixes #1081. Bump
 version number

---
 dist/pom.xml                                                  | 2 +-
 main/pom.xml                                                  | 2 +-
 main/src/main/java/me/blackvein/quests/Quester.java           | 4 +++-
 .../java/me/blackvein/quests/listeners/PlayerListener.java    | 2 +-
 pom.xml                                                       | 4 ++--
 v1_8_R1/pom.xml                                               | 2 +-
 v1_8_R2/pom.xml                                               | 2 +-
 v1_8_R3/pom.xml                                               | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index 3b8cda53b..f880b1feb 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>me.blackvein.quests</groupId>
         <artifactId>quests-parent</artifactId>
-        <version>3.8.7</version>
+        <version>3.8.8</version>
     </parent>
     <artifactId>quests-dist</artifactId>
     <packaging>pom</packaging>
diff --git a/main/pom.xml b/main/pom.xml
index 34848ac27..de0518442 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>me.blackvein.quests</groupId>
         <artifactId>quests-parent</artifactId>
-        <version>3.8.7</version>
+        <version>3.8.8</version>
     </parent>
     <artifactId>quests-main</artifactId>
     
diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java
index cfa158355..f3493d33b 100644
--- a/main/src/main/java/me/blackvein/quests/Quester.java
+++ b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -3738,7 +3738,9 @@ public class Quester {
                 getPlayer().sendMessage(ChatColor.YELLOW + msg);
             }
             return false;
-        } else if (quest.getNpcStart() != null && plugin.getSettings().canAllowCommandsForNpcQuests() == false) {
+        } else if (quest.getNpcStart() != null && quest.getNpcStart().getEntity() != null 
+                && quest.getNpcStart().getEntity().getLocation().distance(getPlayer().getLocation()) < 5.0
+                && plugin.getSettings().canAllowCommandsForNpcQuests() == false) {
             if (giveReason) {
                 String msg = Lang.get(getPlayer(), "mustSpeakTo");
                 msg = msg.replace("<npc>", ChatColor.DARK_PURPLE + quest.getNpcStart().getName() + ChatColor.YELLOW);
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 c39ed7832..39f338bd8 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -128,8 +128,8 @@ public class PlayerListener implements Listener {
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
-                                evt.getWhoClicked().closeInventory();
                             }
+                            evt.getWhoClicked().closeInventory();
                         }
                     }
                 }
diff --git a/pom.xml b/pom.xml
index da5135414..b010c4136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
     <groupId>me.blackvein.quests</groupId>
 
     <artifactId>quests-parent</artifactId>
-    <version>3.8.7</version>
+    <version>3.8.8</version>
     <name>quests</name>
     <url>https://github.com/PikaMug/Quests/</url>
 
     <properties>
-    	<revision>3.8.7</revision>
+    	<revision>3.8.8</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/v1_8_R1/pom.xml b/v1_8_R1/pom.xml
index cf9196c57..10aa5d268 100644
--- a/v1_8_R1/pom.xml
+++ b/v1_8_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
        <groupId>me.blackvein.quests</groupId>
        <artifactId>quests-parent</artifactId>
-       <version>3.8.7</version>
+       <version>3.8.8</version>
     </parent>
 
     <properties>
diff --git a/v1_8_R2/pom.xml b/v1_8_R2/pom.xml
index 643b94ad1..edfb44e1b 100644
--- a/v1_8_R2/pom.xml
+++ b/v1_8_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
        <groupId>me.blackvein.quests</groupId>
        <artifactId>quests-parent</artifactId>
-       <version>3.8.7</version>
+       <version>3.8.8</version>
     </parent>
 
     <properties>
diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml
index 834594234..feddc997e 100644
--- a/v1_8_R3/pom.xml
+++ b/v1_8_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
        <groupId>me.blackvein.quests</groupId>
        <artifactId>quests-parent</artifactId>
-       <version>3.8.7</version>
+       <version>3.8.8</version>
     </parent>
 
     <properties>