Fixed handling of legacy Command.flags/.anyFlags.

Fixes WORLDEDIT-3137.

src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java

@@ -19,6 +19,7 @@
 
 package com.sk89q.worldedit.util.command.parametric;
 
+import com.google.common.primitives.Chars;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
@@ -55,6 +56,8 @@ class ParametricCallable implements CommandCallable {
     private final Method method;
     private final ParameterData[] parameters;
     private final Set<Character> valueFlags = new HashSet<Character>();
+    private final boolean anyFlags;
+    private final Set<Character> legacyFlags = new HashSet<Character>();
     private final SimpleDescription description = new SimpleDescription();
     private final CommandPermissions commandPermissions;
 
@@ -157,6 +160,10 @@ class ParametricCallable implements CommandCallable {
             }
         }
 
+        // Gather legacy flags
+        anyFlags = definition.anyFlags();
+        legacyFlags.addAll(Chars.asList(definition.flags().toCharArray()));
+
         // Finish description
         description.setDescription(!definition.desc().isEmpty() ? definition.desc() : null);
         description.setHelp(!definition.help().isEmpty() ? definition.help() : null);
@@ -412,10 +419,15 @@ class ParametricCallable implements CommandCallable {
      * @param context the command context
      */
     private String getUnusedFlags(CommandContext context) {
+        if (!anyFlags) {
             Set<Character> unusedFlags = null;
             for (char flag : context.getFlags()) {
                 boolean found = false;
 
+                if (legacyFlags.contains(flag)) {
+                    break;
+                }
+
                 for (ParameterData parameter : parameters) {
                     Character paramFlag = parameter.getFlag();
                     if (paramFlag != null && flag == paramFlag) {
@@ -440,6 +452,7 @@ class ParametricCallable implements CommandCallable {
 
                 return builder.toString().trim();
             }
+        }
 
         return null;
     }