event npcvnpc

Author: mcmonkey4eva

README.md

@@ -276,7 +276,7 @@ These are all valid targets and ignores:
     - These all use "ITEM_MATCHER"s, which, at their simplest, are just a regex that matches the material name. So, `helditem:diamond_sword` targets enemies that are holding a diamond sword.
     - However, you can also do `lore:LORE(REGEX)` as a matcher for a line of lore, or `name:NAME(REGEX)` as a matcher for the item display name.
     - For example, `offhand:name:Stick\d+` would target players holding an item in their offhand named like "Stick123".
-- Also, event:`pvp`/`pvnpc`/`pve`/`pvsentinel`/`eve` (pvp is Player-vs-Player, eve is Entity-vs-Entity, etc.)
+- Also, event:`pvp`/`pvnpc`/`pve`/`pvsentinel`/`eve`/`npcvnpc` (pvp is Player-vs-Player, eve is Entity-vs-Entity, etc.)
 - Also, event:`pv:ENTITY`/`ev:ENTITY` (`pv:ENTITY` is used like `event:pv:chicken` for players attacking chickens)
 - Also, `event:guarded_fight` to attack whatever the guarded player attacks.
 - Also, `event:message:SOMETEXT` will match chat messages that contain 'sometext'.

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

@@ -172,7 +172,7 @@ private static List<String> filterForArg(Collection<String> output, String arg1)
         addTargetTabCompletions.addAll(Arrays.asList("player:", "npc:", "entityname:", "group:"));
         addTargetTabCompletions.addAll(Arrays.asList("helditem:", "offhand:", "equipped:", "in_inventory:"));
         addTargetTabCompletions.addAll(Arrays.asList("status:angry", "status:passive"));
-        addTargetTabCompletions.addAll(Arrays.asList("event:", "event:pvp", "event:pve", "event:pvnpc", "event:pvsentinel", "event:eve", "event:pv:", "event:ev:", "event:guarded_fight", "event:message:"));
+        addTargetTabCompletions.addAll(Arrays.asList("event:", "event:pvp", "event:pve", "event:pvnpc", "event:pvsentinel", "event:eve", "event:pv:", "event:ev:", "event:npcvnpc", "event:guarded_fight", "event:message:"));
         addTargetTabCompletions.addAll(SentinelPlugin.targetOptions.keySet().stream().map(String::toLowerCase).collect(Collectors.toList()));
     }
 

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

@@ -436,6 +436,11 @@ else if (evt.equals("pvsentinel")
                     && CitizensAPI.getNPCRegistry().getNPC(event.getEntity()).hasTrait(SentinelTrait.class)) {
                 return true;
             }
+            else if (evt.equals("npcvnpc")
+                    && CitizensAPI.getNPCRegistry().isNPC(damager)
+                    && CitizensAPI.getNPCRegistry().isNPC(event.getEntity())) {
+                return true;
+            }
             if (evt.contains(":")) {
                 int colon = evt.indexOf(':');
                 String prefix = evt.substring(0, colon);