Sentinel ProtectFromRange

Author: mcmonkey4eva

README.md

@@ -221,6 +221,7 @@ Sentinel is integrated into by external plugins as well, including:
     - /sentinel squad SQUAD - Sets the NPC's squad name (null for none). NPCs with the same squad name share aggro (if a player angers one NPC, the rest get angry too).
     - /sentinel reach REACH - Sets the NPC's reach (how far it can punch).
     - /sentinel projectilerange RANGE - Sets the NPC's projectile range (how far it is willing to shoot projectiles).
+    - /sentinel protectfromrange RANGE - Sets the maximum range after which damage should start being ignored. If zero, this does nothing. Set eg 100 to ignore all damage from over 100 blocks away.
     - /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.

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

@@ -372,9 +372,15 @@ public void removeAvoid(String target) {
     /**
      * Whether the NPC should be protected from damage by ignore targets.
      */
-    @Persist ("protected")
+    @Persist("protected")
     public boolean protectFromIgnores = false;
 
+    /**
+     * Maximum distance after which damage starts being ignored.
+     */
+    @Persist("protectFromRange")
+    public double protectFromRange = 0;
+
     /**
      * Whether the NPC "fights back" against attacks (targets anyone that damages it).
      */
@@ -977,6 +983,14 @@ else if (projectileSource != null && targetingHelper.isIgnored(projectileSource)
                 return;
             }
         }
+        if (isMe && protectFromRange > 0) {
+            Location loc1 = damager.getLocation();
+            Location loc2 = getLivingEntity().getLocation();
+            if (loc1.getWorld() != loc2.getWorld() || loc1.distanceSquared(loc2) > protectFromRange * protectFromRange) {
+                event.setCancelled(true);
+                return;
+            }
+        }
         boolean isKilling = event.getEntity() instanceof LivingEntity && event.getFinalDamage() >= ((LivingEntity) event.getEntity()).getHealth();
         boolean isFriend = getGuarding() != null && SentinelUtilities.uuidEquals(event.getEntity().getUniqueId(), getGuarding());
         boolean attackerIsMe = damager.getUniqueId().equals(getLivingEntity().getUniqueId());

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

@@ -64,6 +64,7 @@ else if (sentinel.getGuarding() != null) {
         addLineIfNeeded(paginator, "Guard Selection Range", sentinel.guardSelectionRange);
         addLineIfNeeded(paginator, "Invincibility Enabled", sentinel.invincible);
         addLineIfNeeded(paginator, "Protected Enabled", sentinel.protectFromIgnores);
+        addLineIfNeeded(paginator, "Protect From Range", sentinel.protectFromRange);
         addLineIfNeeded(paginator, "Fightback Enabled", sentinel.fightback);
         addLineIfNeeded(paginator, "Ranged Chasing Enabled", sentinel.rangedChase);
         addLineIfNeeded(paginator, "Close-Quarters Chasing Enabled", sentinel.closeChase);

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

@@ -289,6 +289,30 @@ public void protectedFromIgnores(CommandContext args, CommandSender sender, Sent
         }
     }
 
+    @Command(aliases = {"sentinel"}, usage = "protectfromrange RANGE",
+            desc = "Sets the maximum range after which damage should start being ignored. If zero, this does nothing. Set eg 100 to ignore all damage from over 100 blocks away.",
+            modifiers = { "protectfromrange" }, permission = "sentinel.protectfromrange", min = 1, max = 2)
+    @Requirements(livingEntity = true, ownership = true, traits = {SentinelTrait.class})
+    public void protectFromRange(CommandContext args, CommandSender sender, SentinelTrait sentinel) {
+        if (args.argsLength() <= 1) {
+            sender.sendMessage(SentinelCommand.prefixGood + "Current protect-from-range: " + SentinelCommand.colorEmphasis + sentinel.protectFromRange);
+            return;
+        }
+        try {
+            double d = Double.parseDouble(args.getString(1));
+            if (d >= 0 && d < 500) {
+                sentinel.protectFromRange = d;
+                sender.sendMessage(SentinelCommand.prefixGood + "Protect-from-range set!");
+            }
+            else {
+                throw new NumberFormatException("Number out of range (must be >= 0 and < 500).");
+            }
+        }
+        catch (NumberFormatException ex) {
+            sender.sendMessage(SentinelCommand.prefixBad + "Invalid range number: " + ex.getMessage());
+        }
+    }
+
     @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

@@ -21,6 +21,8 @@ sentinel defaults:
     heal rate: 100
     # Whether the NPC should be protected from damage by ignore targets.
     protected: true
+    # Maximum range after which damage should start being ignored. If zero, this does nothing. Set eg 100 to ignore all damage from over 100 blocks away.
+    protect from range: 0
     # Whether this NPC fights back.
     fightback: true
     # Whether this NPC needs ammo to fight with.

src/main/resources/plugin.yml

@@ -58,6 +58,8 @@ permissions:
       sentinel.invincible: true
       # /sentinel protected
       sentinel.protected: true
+      # /sentinel protectfromrange
+      sentinel.protectfromrange: true
       # /sentinel fightback
       sentinel.fightback: true
       # /sentinel runaway