Remove debug message, update version and fix checkv2.14.1

23 files changed, 24 insertions, 26 deletions

diff --git a/build.gradle b/build.gradle
index a430825a..f7139bc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'com.leonardobishop.quests'
-version = '2.14'
+version = '2.14.1'
 
 processResources {
     from(sourceSets.main.resources.srcDirs) {
diff --git a/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java b/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java
index db8281b2..a20663aa 100644
--- a/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java
+++ b/src/main/java/com/leonardobishop/quests/QuestsConfigLoader.java
@@ -74,8 +74,6 @@ public class QuestsConfigLoader {
                 }
             }
 
-            System.out.println(globalTaskConfig);
-
             FileVisitor<Path> fileVisitor = new SimpleFileVisitor<Path>() {
                 final URI questsRoot = Paths.get(plugin.getDataFolder() + File.separator + "quests").toUri();
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BreedingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BreedingTaskType.java
index cb730ac1..2d32f54f 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BreedingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BreedingTaskType.java
@@ -61,7 +61,7 @@ public final class BreedingTaskType extends TaskType {
         // Check if there is a player in the list, otherwise: return.
         for (Entity current : entList) {
 
-            if (current instanceof Player && Bukkit.getOnlinePlayers().contains(current)) {
+            if (current instanceof Player && !current.hasMetadata("NPC")) {
                 Player player = (Player) current;
                 QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(player.getUniqueId(), true);
                 QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingTaskType.java
index 0034cc06..9815686c 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BrewingTaskType.java
@@ -66,7 +66,7 @@ public final class BrewingTaskType extends TaskType {
         if ((uuid = brewingStands.get(event.getBlock().getLocation())) != null) {
             Player player = Bukkit.getPlayer(uuid);
 
-            if (player == null || !Bukkit.getOnlinePlayers().contains(player)) {
+            if (player == null || !player.hasMetadata("NPC")) {
                 return;
             }
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingCertainTaskType.java
index e1131f66..640d1696 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingCertainTaskType.java
@@ -81,7 +81,7 @@ public final class BuildingCertainTaskType extends TaskType {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPlace(BlockPlaceEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
@@ -110,7 +110,7 @@ public final class BuildingCertainTaskType extends TaskType {
     // subtract if enabled
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingTaskType.java
index a85bc036..7b1aaeb7 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/BuildingTaskType.java
@@ -45,7 +45,7 @@ public final class BuildingTaskType extends TaskType {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPlace(BlockPlaceEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/CommandTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/CommandTaskType.java
index 244462bf..ece03574 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/CommandTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/CommandTaskType.java
@@ -47,7 +47,7 @@ public final class CommandTaskType extends TaskType {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onCommand(PlayerCommandPreprocessEvent e) {
-        if (Bukkit.getOnlinePlayers().contains(e.getPlayer())) return;
+        if (e.getPlayer().hasMetadata("NPC")) return;
 
         Player player = e.getPlayer();
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DealDamageTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DealDamageTaskType.java
index 97808fb0..bcf92cac 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DealDamageTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DealDamageTaskType.java
@@ -53,7 +53,7 @@ public final class DealDamageTaskType extends TaskType {
         Player player = (Player) e.getDamager();
         double damage = e.getDamage();
 
-        if (Bukkit.getOnlinePlayers().contains(player)) return;
+        if (player.hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(player.getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java
index 2a6dca00..2db0deb9 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/DistancefromTaskType.java
@@ -76,7 +76,7 @@ public final class DistancefromTaskType extends TaskType {
             return;
         }
 
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
         Player player = event.getPlayer();
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(player.getUniqueId(), true);
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/EnchantingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/EnchantingTaskType.java
index 407dc6c3..0771f598 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/EnchantingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/EnchantingTaskType.java
@@ -46,7 +46,7 @@ public final class EnchantingTaskType extends TaskType {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEnchant(EnchantItemEvent e) {
-        if (Bukkit.getOnlinePlayers().contains(e.getEnchanter())) return;
+        if (e.getEnchanter().hasMetadata("NPC")) return;
 
         Player player = e.getEnchanter();
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ExpEarnTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ExpEarnTaskType.java
index ee7ce113..3d72d3fa 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ExpEarnTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ExpEarnTaskType.java
@@ -45,7 +45,7 @@ public final class ExpEarnTaskType extends TaskType {
     
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onExpEarn(PlayerExpChangeEvent e) {
-        if (Bukkit.getOnlinePlayers().contains(e.getPlayer())) return;
+        if (e.getPlayer().hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(e.getPlayer().getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FishingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FishingTaskType.java
index 161276eb..c15b9bd2 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FishingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/FishingTaskType.java
@@ -46,7 +46,7 @@ public final class FishingTaskType extends TaskType {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onFishCaught(PlayerFishEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         if (event.getState() != PlayerFishEvent.State.CAUGHT_FISH) {
             return;
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/InventoryTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/InventoryTaskType.java
index 8d56108b..40b93d29 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/InventoryTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/InventoryTaskType.java
@@ -86,7 +86,7 @@ public final class InventoryTaskType extends TaskType {
     @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onItemPickup(PlayerPickupItemEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         Bukkit.getScheduler().runTaskLater(Quests.get(), () -> this.checkInventory(event.getPlayer()), 1L);
     }
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MilkingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MilkingTaskType.java
index 8a599c56..1d1e4907 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MilkingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MilkingTaskType.java
@@ -53,7 +53,7 @@ public final class MilkingTaskType extends TaskType {
             return;
         }
 
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         Player player = event.getPlayer();
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningCertainTaskType.java
index fa0bbbb0..3712f751 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningCertainTaskType.java
@@ -82,7 +82,7 @@ public final class MiningCertainTaskType extends TaskType {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
@@ -109,7 +109,7 @@ public final class MiningCertainTaskType extends TaskType {
     // subtract if enabled
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPlace(BlockPlaceEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningTaskType.java
index 30022a75..59a15fc3 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MiningTaskType.java
@@ -48,7 +48,7 @@ public final class MiningTaskType extends TaskType {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;  // citizens also causes these events to fire
+        if (event.getPlayer().hasMetadata("NPC")) return;  // citizens also causes these events to fire
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId(), true); // get the qplayer so you can get their progress
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); // the quest progress file stores progress about all quests and tasks
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
index 6f5b6fd0..95f9df54 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
@@ -70,7 +70,7 @@ public final class MobkillingCertainTaskType extends TaskType {
             return;
         }
 
-        if (Bukkit.getOnlinePlayers().contains(killer)) return;
+        if (killer.hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(killer.getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingTaskType.java
index 380747b7..7263a260 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/MobkillingTaskType.java
@@ -61,7 +61,7 @@ public final class MobkillingTaskType extends TaskType {
             return;
         }
 
-        if (Bukkit.getOnlinePlayers().contains(killer)) return;
+        if (killer.hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(killer.getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlayerkillingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlayerkillingTaskType.java
index 724a737d..1e45702f 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlayerkillingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PlayerkillingTaskType.java
@@ -57,7 +57,7 @@ public final class PlayerkillingTaskType extends TaskType {
             return;
         }
 
-        if (Bukkit.getOnlinePlayers().contains(killer)) return;
+        if (killer.hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(killer.getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java
index 093de9fd..7421a5fe 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/PositionTaskType.java
@@ -61,7 +61,7 @@ public final class PositionTaskType extends TaskType {
             return;
         }
 
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         Player player = event.getPlayer();
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ShearingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ShearingTaskType.java
index d5186910..461fc1ec 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ShearingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/ShearingTaskType.java
@@ -51,7 +51,7 @@ public final class ShearingTaskType extends TaskType {
             return;
         }
 
-        if (Bukkit.getOnlinePlayers().contains(event.getPlayer())) return;
+        if (event.getPlayer().hasMetadata("NPC")) return;
 
         Player player = event.getPlayer();
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/TamingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/TamingTaskType.java
index 28b921c7..af4270f5 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/TamingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/TamingTaskType.java
@@ -52,7 +52,7 @@ public final class TamingTaskType extends TaskType {
 
         Player player = (Player) event.getOwner();
 
-        if (Bukkit.getOnlinePlayers().contains(player)) return;
+        if (player.hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(player.getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/WalkingTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/WalkingTaskType.java
index 88dea0e8..6b23f779 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/WalkingTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/WalkingTaskType.java
@@ -52,7 +52,7 @@ public final class WalkingTaskType extends TaskType {
 
         Player player = event.getPlayer();
 
-        if (Bukkit.getOnlinePlayers().contains(player)) return;
+        if (player.hasMetadata("NPC")) return;
 
         QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(player.getUniqueId(), true);
         QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();