add config option to allow armor stand targets

Author: mcmonkey4eva

src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java

@@ -211,6 +211,11 @@ public ArrayList<SentinelTrait> cleanCurrentList() {
      */
     public boolean enhanceLosTraces;
 
+    /**
+     * Whether NPCs should be able to target armor stands.
+     */
+    public boolean allowArmorStandTargets;
+
     /**
      * Fills the {@code vaultPerms} object if possible.
      */
@@ -298,6 +303,7 @@ public void loadConfigSettings() {
         preventExplosionBlockDamage = getConfig().getBoolean("random.prevent explosion block damage", true);
         tickRate = getConfig().getInt("update rate", 10);
         autoCorrectpathfinderMode = getConfig().getBoolean("random.auto correct pathfinder mode", true);
+        allowArmorStandTargets = getConfig().getBoolean("random.allow armor stand targets", false);
     }
 
     /**

src/main/java/org/mcmonkey/sentinel/targeting/SentinelTarget.java

@@ -68,7 +68,8 @@ public class SentinelTarget {
             ENDERMEN = new SentinelTarget(new EntityType[]{EntityType.ENDERMAN}, "ENDERMAN", "ENDER_MAN", "ENDERMEN", "ENDER_MEN"),
             ENDERMITES = new SentinelTarget(new EntityType[]{EntityType.ENDERMITE}, "ENDERMITE", "ENDER_MITE"),
             WITHERS = new SentinelTarget(new EntityType[]{EntityType.WITHER}, "WITHER"),
-            ENDERDRAGONS = new SentinelTarget(new EntityType[]{EntityType.ENDER_DRAGON}, "ENDERDRAGON", "ENDER_DRAGON");
+            ENDERDRAGONS = new SentinelTarget(new EntityType[]{EntityType.ENDER_DRAGON}, "ENDERDRAGON", "ENDER_DRAGON"),
+            ARMOR_STAND = new SentinelTarget(new EntityType[]{EntityType.ARMOR_STAND}, "ARMORSTAND", "ARMOR_STAND");
 
     /**
      * Valid target types for 1.9 or higher.

src/main/java/org/mcmonkey/sentinel/targeting/SentinelTargetingHelper.java

@@ -48,7 +48,7 @@ public boolean shouldTarget(LivingEntity entity) {
         if (entity.getUniqueId().equals(getLivingEntity().getUniqueId())) {
             return false;
         }
-        if (entity.getType() == EntityType.ARMOR_STAND) {
+        if (entity.getType() == EntityType.ARMOR_STAND && !SentinelPlugin.instance.allowArmorStandTargets) {
             return false;
         }
         return isTargeted(entity) && !isIgnored(entity);
@@ -61,7 +61,7 @@ public boolean shouldAvoid(LivingEntity entity) {
         if (entity.getUniqueId().equals(getLivingEntity().getUniqueId())) {
             return false;
         }
-        if (entity.getType() == EntityType.ARMOR_STAND) {
+        if (entity.getType() == EntityType.ARMOR_STAND && !SentinelPlugin.instance.allowArmorStandTargets) {
             return false;
         }
         return isAvoided(entity) && !isIgnored(entity);
@@ -195,7 +195,7 @@ public boolean isIgnored(LivingEntity entity) {
         if (entity.getUniqueId().equals(getLivingEntity().getUniqueId())) {
             return true;
         }
-        if (entity.getType() == EntityType.ARMOR_STAND) {
+        if (entity.getType() == EntityType.ARMOR_STAND && !SentinelPlugin.instance.allowArmorStandTargets) {
             return true;
         }
         if (sentinel.getGuarding() != null && SentinelUtilities.uuidEquals(entity.getUniqueId(), sentinel.getGuarding())) {

src/main/resources/config.yml

@@ -115,6 +115,8 @@ random:
     prevent explosion block damage: true
     # (Experimental) If enabled, will automatically change the NPC's pathfinding mode if the NPC appears to be getting stuck.
     auto correct pathfinder mode: true
+    # If true, armor stands can be targeted. Unexpected behavior may result.
+    allow armor stand targets: false
 
 # How fast to recalculate, in ticks.
 update rate: 10