corrections to that pr

README.md

@@ -222,7 +222,7 @@ Sentinel is integrated into by external plugins as well, including:
     - /sentinel avoidreturnpoint - Changes the location the NPC runs to when avoid mode is activated, or removes it if the NPC is already there.
 - **Toggleable NPC configuration commands:**
     - /sentinel invincible \['true'/'false'\] - Toggles whether the NPC is invincible.
-    - /sentinel protectfromignores \['true'/'false'\] - Toggles whether the NPC cannot be harmed by ignored targets.
+    - /sentinel protected \['true'/'false'\] - Toggles whether the NPC is protected from damage by ignore targets.
     - /sentinel fightback \['true'/'false'\] - Toggles whether the NPC will fight back.
     - /sentinel runaway \['true'/'false'\] - Toggles whether the NPC will run away when attacked.
     - /sentinel needammo \['true'/'false'\] - Toggles whether the NPC will need ammo.

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

@@ -161,8 +161,9 @@ public ArrayList<SentinelTrait> cleanCurrentList() {
     public boolean workaroundEntityChasePathfinder;
 
     /**
-     * Configuration option: whether to protect the NPC from being harmed by ignored entities.
+     * Legacy configuration option: whether to protect all NPCs from being harmed by ignored entities.
      */
+    @Deprecated
     public boolean protectFromIgnores;
 
     /**

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

@@ -366,11 +366,11 @@ public void removeAvoid(String target) {
      */
     @Persist("invincible")
     public boolean invincible = false;
-    
+
     /**
-     * Whether the NPC cannot be harmed by ignored targets
+     * Whether the NPC should be protected from damage by ignore targets.
      */
-    @Persist ("protectFromIgnores")
+    @Persist ("protected")
     public boolean protectFromIgnores = false;
 
     /**

src/main/java/org/mcmonkey/sentinel/commands/SentinelTargetCommands.java

@@ -1,6 +1,8 @@
 package org.mcmonkey.sentinel.commands;
 
-import java.util.Collection;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.Requirements;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -10,9 +12,7 @@
 import org.mcmonkey.sentinel.targeting.SentinelTargetLabel;
 import org.mcmonkey.sentinel.targeting.SentinelTargetList;
 
-import net.citizensnpcs.api.command.Command;
-import net.citizensnpcs.api.command.CommandContext;
-import net.citizensnpcs.api.command.Requirements;
+import java.util.Collection;
 
 /**
  * Commands related to targeting.
@@ -265,7 +265,7 @@ public void runaway(CommandContext args, CommandSender sender, SentinelTrait sen
     }
 
     @Command(aliases = {"sentinel"}, usage = "protected ['true'/'false']",
-            desc = "Toggles whether the NPC cannot be harmed by ignored targets.",
+            desc = "Toggles whether the NPC should be protected from damage by ignore targets.",
             modifiers = { "protected" }, permission = "sentinel.protected", min = 1, max = 2)
     @Requirements(livingEntity = true, ownership = true, traits = {SentinelTrait.class})
     public void protectedFromIgnores(CommandContext args, CommandSender sender, SentinelTrait sentinel) {
@@ -278,13 +278,13 @@ public void protectedFromIgnores(CommandContext args, CommandSender sender, Sent
         }
         sentinel.protectFromIgnores = mode;
         if (sentinel.protectFromIgnores) {
-            sender.sendMessage(SentinelCommand.prefixGood + "NPC is now protected from ignored targets!");
+            sender.sendMessage(SentinelCommand.prefixGood + "NPC is now protected from ignore targets!");
         }
         else {
-            sender.sendMessage(SentinelCommand.prefixGood + "NPC no longer protected from ignored targets!");
+            sender.sendMessage(SentinelCommand.prefixGood + "NPC no longer protected from ignore targets!");
         }
     }
-    
+
     @Command(aliases = {"sentinel"}, usage = "fightback ['true'/'false']",
             desc = "Toggles whether the NPC will fight back.",
             modifiers = {"fightback"}, permission = "sentinel.fightback", min = 1, max = 2)

src/main/resources/config.yml

@@ -18,7 +18,7 @@ sentinel defaults:
     attack rate: 30
     # Heal rate, in ticks.
     heal rate: 100
-    # Whether NPCs are protected from damage by ignore targets.
+    # Whether the NPC should be protected from damage by ignore targets.
     protected: true
     # Whether this NPC fights back.
     fightback: true
@@ -86,9 +86,6 @@ random:
     # Whether to force damage through (particularly for ranged attacks).
     # If enabled, this can cause unwanted side effects, like mobs not aggroing or some armor effects not applying.
     enforce damage: false
-    # Whether NPCs are protected from damage by ignore targets.
-    # DEPRECATED - please use the default settings instead
-    protected: false
     # Whether skull attack, evoker fang, or shulker bullets are allowed.
     skull allowed: true
     # How many calculation cycles before an NPC will give up on a good target.