fix title command subtitle parsing, and title/actionbar targets input

DenizenScript · May 26, 2020 · e4f8687 · e4f8687
1 parent 836cb01
commit e4f8687
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
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
@@ -77,8 +77,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
                 }
                 scriptEntry.addObject("format", new ScriptTag(format));
             }
-            if (arg.matchesPrefix("targets", "target")
-                    && arg.matchesArgumentList(PlayerTag.class)) {
+            if (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")

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TitleCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TitleCommand.java
@@ -82,8 +82,7 @@ else if (arg.matchesPrefix("fade_out")
                 String argStr = TagManager.tag(arg.getValue(), scriptEntry.getContext());
                 scriptEntry.addObject("fade_out", DurationTag.valueOf(argStr, scriptEntry.context));
             }
-            else if (arg.matchesPrefix("targets", "target")
-                    && arg.matchesArgumentList(PlayerTag.class)) {
+            else if (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")
@@ -122,6 +121,7 @@ public void execute(ScriptEntry scriptEntry) {
         BukkitTagContext context = (BukkitTagContext) scriptEntry.getContext();
         if (!perPlayer) {
             title = TagManager.tag(title, context);
+            subtitle = TagManager.tag(subtitle, context);
         }
 
         if (scriptEntry.dbCallShouldDebug()) {