Improved KeyedWorldArgument suggestions (#334)

Incendo · Feb 28, 2022 · e32ec69 · e32ec69
1 parent e109ecb
commit e32ec69
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...t/cloud-paper/src/main/java/cloud/commandframework/paper/argument/KeyedWorldArgument.java b/...t/cloud-paper/src/main/java/cloud/commandframework/paper/argument/KeyedWorldArgument.java
@@ -219,13 +219,14 @@ public Parser() {
                 return this.parser.suggestions(commandContext, input);
             }
 
-            final List<String> completions = new ArrayList<>();
-            for (final World world : Bukkit.getWorlds()) {
-                if (world.getKey().getNamespace().equals(NamespacedKey.MINECRAFT)) {
-                    completions.add(world.getKey().getKey());
-                } else {
-                    completions.add(world.getKey().toString());
+            final List<World> worlds = Bukkit.getWorlds();
+            final List<String> completions = new ArrayList<>(worlds.size() * 2);
+            for (final World world : worlds) {
+                final NamespacedKey key = world.getKey();
+                if (!input.isEmpty() && key.getNamespace().equals(NamespacedKey.MINECRAFT_NAMESPACE)) {
+                    completions.add(key.getKey());
                 }
+                completions.add(key.getNamespace() + ':' + key.getKey());
             }
             return completions;
         }