Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-01 21:21:30 +01:00
Code Issues Projects Releases Wiki Activity

Improve UUID checks, fixes #181. Bump version number

Browse Source
This commit is contained in:
HappyPikachu 2017-12-15 20:33:20 -05:00
parent 33d0fefb70
commit ccd606e55b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId> <groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId> <artifactId>quests</artifactId>
<version>3.1.4</version> <version>3.1.5</version>
<name>quests</name> <name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url> <url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging> <packaging>jar</packaging>

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

@ -448,7 +448,7 @@ public class PlayerListener implements Listener {
* @since 3.1.4 * @since 3.1.4
*/ */
public void killMob(Entity damager, Entity target) { public void killMob(Entity damager, Entity target) {
if (plugin.checkQuester(damager.getUniqueId()) == false) { if (plugin.checkQuester(damager.getUniqueId()) == true) {
return; return;
} }
//Ensure damager is Player AND not an NPC //Ensure damager is Player AND not an NPC
@ -542,7 +542,7 @@ public class PlayerListener implements Listener {
* @since 3.1.4 * @since 3.1.4
*/ */
public void killPlayer(Entity damager, Entity target) { public void killPlayer(Entity damager, Entity target) {
if (plugin.checkQuester(damager.getUniqueId()) == false) { if (plugin.checkQuester(damager.getUniqueId()) == true) {
return; return;
} }
//Ensure damager is player AND not an NPC //Ensure damager is player AND not an NPC

2
src/main/java/me/blackvein/quests/Quests.java
View File

@ -3655,7 +3655,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
public boolean checkQuester(UUID uuid) { public boolean checkQuester(UUID uuid) {
for (String s : questerBlacklist) { for (String s : questerBlacklist) {
try { try {
UUID.fromString(s); uuid.equals(UUID.fromString(s));
return true; return true;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
getLogger().warning(s + " in config.yml is not a valid UUID for quester-blacklist"); getLogger().warning(s + " in config.yml is not a valid UUID for quester-blacklist");