Ignore chattriggerless NPCs in chattriggers

DenizenScript · Oct 27, 2013 · 4b782d0 · 4b782d0
1 parent 74f662e
commit 4b782d0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java
@@ -56,7 +56,7 @@ public void onSpawn() {
      *
      * @param triggerName name of the Trigger, as specified by the Trigger. Case in-sensitive.
      * @param toggle new state of the trigger
-     * @return
+     * @return output debug information.
      */
     public String toggleTrigger(String triggerName, boolean toggle) {
         if (enabled.containsKey(triggerName.toUpperCase())) {
@@ -78,6 +78,10 @@ public String toggleTrigger(String triggerName) {
         else return triggerName + " trigger not found!";
     }
 
+    public boolean hasTrigger(String triggerName) {
+        return enabled.containsKey(triggerName.toUpperCase()) && enabled.get(triggerName.toUpperCase());
+    }
+
     public boolean isEnabled(String triggerName) {
         if (!DenizenAPI.getDenizenNPC(npc).getAssignmentTrait().hasAssignment()) return false;
         if (enabled.containsKey(triggerName.toUpperCase()))

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java
@@ -54,7 +54,7 @@ public void onEnable() {
     public Boolean process(Player player, String message) {
 
         // Check if there is an NPC within range of a player to chat to.
-        dNPC npc = Utilities.getClosestNPC(player.getLocation(), 25);
+        dNPC npc = Utilities.getClosestNPC_ChatTrigger(player.getLocation(), 25);
         dPlayer denizenPlayer = dPlayer.mirrorBukkitPlayer(player);
 
         // No NPC? Nothing else to do here.

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java
@@ -13,6 +13,7 @@
 import java.util.Set;
 
 import net.aufdemrand.denizen.Settings;
+import net.aufdemrand.denizen.npc.traits.TriggerTrait;
 import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.tags.TagManager;
@@ -274,6 +275,32 @@ public static dNPC getClosestNPC (Location location, int range) {
         }
         return closestNPC;
     }
+    /**
+     * Finds the closest NPC to a particular location.
+     *
+     * @param location    The location to find the closest NPC to.
+     * @param range    The maximum range to look for the NPC.
+     *
+     * @return    The closest NPC to the location, or null if no NPC was found
+     *                     within the range specified.
+     */
+
+    public static dNPC getClosestNPC_ChatTrigger (Location location, int range) {
+        dNPC closestNPC = null;
+        double closestDistance = Math.pow(range, 2);
+        Iterator<dNPC> it = DenizenAPI.getSpawnedNPCs().iterator();
+        while (it.hasNext()) {
+            dNPC npc = it.next();
+            Location loc = npc.getLocation();
+            if (npc.getCitizen().hasTrait(TriggerTrait.class) && npc.getTriggerTrait().hasTrigger("CHAT") &&
+            loc.getWorld().equals(location.getWorld())
+                    && loc.distanceSquared(location) < closestDistance) {
+                closestNPC = npc;
+                closestDistance = npc.getLocation().distanceSquared(location);
+            }
+        }
+        return closestNPC;
+    }
 
 
     /**