Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-22 02:25:42 +01:00
Code Issues Projects Releases Wiki Activity

Close GUI after taking quest from NPC, fixes #1081. Bump version number

Browse Source
This commit is contained in:
PikaMug 2020-02-16 22:53:02 -05:00
parent 4911939a29
commit 379bcec37c
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/pom.xml vendored
View File

@ -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>

2
main/pom.xml
View File

@ -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>

4
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -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);

2
main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
View File

@ -128,8 +128,8 @@ public class PlayerListener implements Listener {
} catch (Exception e) {
e.printStackTrace();
}
evt.getWhoClicked().closeInventory();
}
evt.getWhoClicked().closeInventory();
}
}
}

4
pom.xml
View File

@ -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>

2
v1_8_R1/pom.xml
View File

@ -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>

2
v1_8_R2/pom.xml
View File

@ -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>

2
v1_8_R3/pom.xml
View File

@ -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>