Don't target oneself, able to target NPCs

mcmonkeyprojects · Mar 27, 2016 · 4a9a1ac · 4a9a1ac
1 parent 60bb240
commit 4a9a1ac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -53,8 +53,8 @@ Created by mcmonkey4eva on behalf of the Citizens and Denizen teams.
 - Targets:
 	- Player by name: `player:NAME`
 	- NPC by name: `npc:NAME`
-	- NPCs in general: `npcs`
 	- Items (EG, "Sword" or "Diamond_Sword") being held: `helditem:ITEM_MATERIAL_NAME`
+	- The NPC's owner (For easy ignoring, default ignore status!) `OWNER`
 - Commands:
 	- `/sentinel stats`
 

diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelTarget.java b/src/main/java/org/mcmonkey/sentinel/SentinelTarget.java
@@ -5,6 +5,7 @@
     import java.util.HashSet;
 
     public enum SentinelTarget {
+        NPCS(new EntityType[] {}, "NPC"),
         PASSIVE_MOB(new EntityType[] {
                 EntityType.PIG, EntityType.OCELOT, EntityType.COW, EntityType.RABBIT, EntityType.SHEEP, EntityType.CHICKEN, EntityType.MUSHROOM_COW,
                 EntityType.HORSE, EntityType.IRON_GOLEM, EntityType.SQUID, EntityType.VILLAGER, EntityType.WOLF, EntityType.SNOWMAN},

diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java b/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java
@@ -365,6 +365,12 @@ public boolean usesPotion() {
     }
 
     public boolean shouldTarget(LivingEntity entity) {
+        if (entity.getUniqueId().equals(getLivingEntity().getUniqueId())) {
+            return false;
+        }
+        if (entity.hasMetadata("NPC")) {
+            return targets.contains(SentinelTarget.NPCS);
+        }
         return isTargeted(entity) && !isIgnored(entity);
     }