Fixing wrong tab-completion for higher arguments

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/MWCommands.java

@@ -101,7 +101,7 @@ public class MWCommands extends BaseCommand {
     }
     
     @Subcommand("move")
-    @CommandCompletion("@game-players @teams")
+    @CommandCompletion("@game-players @teams @nothing")
     @CommandPermission("mw.move")
     public void moveCommand(CommandSender sender, String[] args) {
 
@@ -197,7 +197,7 @@ public class MWCommands extends BaseCommand {
     }
 
     @Subcommand("paste")
-    @CommandCompletion("@missiles")
+    @CommandCompletion("@missiles @nothing")
     @CommandPermission("mw.paste")
     public void pasteCommand(CommandSender sender, String[] args) {
 
@@ -232,7 +232,7 @@ public class MWCommands extends BaseCommand {
     }
 
     @Subcommand("start")
-    @CommandCompletion("@games")
+    @CommandCompletion("@games @nothing")
     @CommandPermission("mw.start")
     public void startCommand(CommandSender sender, String[] args) {
 
@@ -280,7 +280,7 @@ public class MWCommands extends BaseCommand {
     }
 
     @Subcommand("stop")
-    @CommandCompletion("@games")
+    @CommandCompletion("@games @nothing")
     @CommandPermission("mw.stop")
     public void stopCommand(CommandSender sender, String[] args) {
 
@@ -315,7 +315,7 @@ public class MWCommands extends BaseCommand {
     }
 
     @Subcommand("appendrestart")
-    @CommandCompletion("@games")
+    @CommandCompletion("@games @nothing")
     @CommandPermission("mw.appendrestart")
     public void appendrestartCommand(CommandSender sender, String[] args) {
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/SetupCommands.java

@@ -95,7 +95,7 @@ public class SetupCommands extends BaseCommand {
         public class SpectatorspawnSetup extends BaseCommand {
 
             @Subcommand("set")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void set(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -106,7 +106,7 @@ public class SetupCommands extends BaseCommand {
             }
 
             @Subcommand("teleport|tp")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void teleport(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -121,7 +121,7 @@ public class SetupCommands extends BaseCommand {
         public class Team1spawnSetup extends BaseCommand {
 
             @Subcommand("set")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void set(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -132,7 +132,7 @@ public class SetupCommands extends BaseCommand {
             }
 
             @Subcommand("teleport|tp")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void teleport(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -147,7 +147,7 @@ public class SetupCommands extends BaseCommand {
         public class Team2spawnSetup extends BaseCommand {
 
             @Subcommand("set")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void set(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -158,7 +158,7 @@ public class SetupCommands extends BaseCommand {
             }
 
             @Subcommand("teleport|tp")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void teleport(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -176,7 +176,7 @@ public class SetupCommands extends BaseCommand {
             public class Pos1Setup extends BaseCommand {
 
                 @Subcommand("set")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void set(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;
@@ -188,7 +188,7 @@ public class SetupCommands extends BaseCommand {
                 }
 
                 @Subcommand("teleport|tp")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void teleport(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;
@@ -203,7 +203,7 @@ public class SetupCommands extends BaseCommand {
             public class Pos2Setup extends BaseCommand {
 
                 @Subcommand("set")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void set(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;
@@ -215,7 +215,7 @@ public class SetupCommands extends BaseCommand {
                 }
 
                 @Subcommand("teleport|tp")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void teleport(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;
@@ -236,7 +236,7 @@ public class SetupCommands extends BaseCommand {
         public class SpawnpointSetup extends BaseCommand {
 
             @Subcommand("set")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void set(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -247,7 +247,7 @@ public class SetupCommands extends BaseCommand {
             }
 
             @Subcommand("teleport|tp")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void teleport(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -262,7 +262,7 @@ public class SetupCommands extends BaseCommand {
         public class AftergamespawnSetup extends BaseCommand {
 
             @Subcommand("set")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void set(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -273,7 +273,7 @@ public class SetupCommands extends BaseCommand {
             }
 
             @Subcommand("teleport|tp")
-            @CommandCompletion("@games")
+            @CommandCompletion("@games @nothing")
             public void teleport(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
                 if (!isValidGame(args)) return;
@@ -291,7 +291,7 @@ public class SetupCommands extends BaseCommand {
             public class Pos1Setup extends BaseCommand {
 
                 @Subcommand("set")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void set(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;
@@ -303,7 +303,7 @@ public class SetupCommands extends BaseCommand {
                 }
 
                 @Subcommand("teleport|tp")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void teleport(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;
@@ -318,7 +318,7 @@ public class SetupCommands extends BaseCommand {
             public class Pos2Setup extends BaseCommand {
 
                 @Subcommand("set")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void set(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;
@@ -330,7 +330,7 @@ public class SetupCommands extends BaseCommand {
                 }
 
                 @Subcommand("teleport|tp")
-                @CommandCompletion("@games")
+                @CommandCompletion("@games @nothing")
                 public void teleport(CommandSender sender, String[] args) {
                     if (!senderIsPlayer(sender)) return;
                     if (!isValidGame(args)) return;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/UserCommands.java

@@ -38,7 +38,7 @@ import org.bukkit.entity.Player;
 public class UserCommands extends BaseCommand {
     
     @Subcommand("vote")
-    @CommandCompletion("@arenas")
+    @CommandCompletion("@arenas @nothing")
     @CommandPermission("mw.vote")
     public void voteCommand(CommandSender sender, String[] args) {
 
@@ -106,7 +106,7 @@ public class UserCommands extends BaseCommand {
     }
 
     @Subcommand("change|switch|team")
-    @CommandCompletion("@teams")
+    @CommandCompletion("@teams @nothing")
     @CommandPermission("mw.change.use")
     public void changeCommand(CommandSender sender, String[] args) {