fix attack command unreliable defaulting bork

DenizenScript · Apr 29, 2021 · 4f6c646 · 4f6c646
1 parent 4153285
commit 4f6c646
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java
@@ -82,9 +82,11 @@ else if (!scriptEntry.hasObject("entities")
         if (!scriptEntry.hasObject("target")) {
             scriptEntry.addObject("target", Utilities.entryHasPlayer(scriptEntry) ? Utilities.getEntryPlayer(scriptEntry).getDenizenEntity() : null);
         }
-        scriptEntry.defaultObject("entities", Utilities.entryHasNPC(scriptEntry) ? Collections.singletonList(Utilities.getEntryNPC(scriptEntry).getDenizenEntity()) : null);
         if (!scriptEntry.hasObject("entities")) {
-            throw new InvalidArgumentsException("Must specify entity/entities!");
+            scriptEntry.defaultObject("entities", Utilities.entryHasNPC(scriptEntry) ? Collections.singletonList(Utilities.getEntryNPC(scriptEntry).getDenizenEntity()) : null);
+            if (!scriptEntry.hasObject("entities")) {
+                throw new InvalidArgumentsException("Must specify entity/entities!");
+            }
         }
         if (!scriptEntry.hasObject("target") && !scriptEntry.hasObject("cancel")) {
             throw new InvalidArgumentsException("Must specify a target!");