diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java index ad8f025877..ef6954eb1c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java @@ -97,7 +97,6 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { event.setServerIcon(icon); } return true; - } if (determination.length() > 0 && !determination.equalsIgnoreCase("none")) { List values = CoreUtilities.split(determination, '|', 2); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java index b2e81d01a0..00841b5d0c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java @@ -68,7 +68,8 @@ public ActionBarCommand() { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { for (Argument arg : ArgumentHelper.interpret(scriptEntry, scriptEntry.getOriginalArguments())) { - if (arg.matchesPrefix("format", "f")) { + if (!scriptEntry.hasObject("format") + && arg.matchesPrefix("format", "f")) { String formatStr = TagManager.tag(arg.getValue(), scriptEntry.getContext()); FormatScriptContainer format = ScriptRegistry.getScriptContainer(formatStr); if (format == null) { @@ -76,7 +77,8 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } scriptEntry.addObject("format", new ScriptTag(format)); } - if (arg.matchesPrefix("targets", "target")) { + else if (!scriptEntry.hasObject("targets") + && arg.matchesPrefix("targets", "target")) { scriptEntry.addObject("targets", ListTag.getListFor(TagManager.tagObject(arg.getValue(), scriptEntry.getContext()), scriptEntry.getContext()).filter(PlayerTag.class, scriptEntry)); } else if (!scriptEntry.hasObject("per_player") @@ -86,6 +88,9 @@ else if (!scriptEntry.hasObject("per_player") else if (!scriptEntry.hasObject("text")) { scriptEntry.addObject("text", new ElementTag(arg.getRawValue())); } + else { + arg.reportUnhandled(); + } } if (!scriptEntry.hasObject("text")) { throw new InvalidArgumentsException("Must specify a message!");