Merge pull request #3290 from Multiverse/fix/gamerule-tab-complete

Fix gamerule tab complete when legacy alias is enabled

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java

@@ -42,7 +42,6 @@
 import static org.mvplugins.multiverse.core.locale.message.MessageReplacement.replace;
 
 @Service
-@Subcommand("gamerule|rule")
 class GameruleCommand extends CoreCommand {
 
     private final PageFilterFlags flags;
@@ -52,7 +51,7 @@ class GameruleCommand extends CoreCommand {
         this.flags = flags;
     }
 
-    @Subcommand("set")
+    @Subcommand("gamerule|rule set")
     @CommandPermission("multiverse.core.gamerule.set")
     @CommandCompletion("@gamerules @gamerulesvalues @mvworlds:multiple|*")
     @Syntax("<Gamerule> <Gamerule value> [World or *]")
@@ -103,7 +102,7 @@ void onGameruleSetCommand(
     }
 
     @SuppressWarnings("rawtypes,unchecked")
-    @Subcommand("reset")
+    @Subcommand("gamerule|rule reset")
     @CommandPermission("multiverse.core.gamerule.set")
     @CommandCompletion("@gamerules @mvworlds:multiple|*")
     @Syntax("<Gamerule> [World or *]")
@@ -145,9 +144,9 @@ void onGameruleResetCommand(
         }
     }
 
-    @Subcommand("list")
+    @Subcommand("gamerule|rule list")
     @CommandPermission("multiverse.core.gamerule.list")
-    @CommandCompletion("@mvworlds|@flags:groupName=mvgamerulecommand @flags:groupName=" + PageFilterFlags.NAME)
+    @CommandCompletion("@mvworlds|@flags:groupName=" + PageFilterFlags.NAME + " @flags:groupName=" + PageFilterFlags.NAME)
     @Syntax("[world] [--page <page>] [--filter <filter>]")
     @Description("{@@mv-core.gamerule.list.description}")
     void onGameruleListCommand(
@@ -220,6 +219,11 @@ void onGameruleSetCommand(MVCommandIssuer issuer, GameRule gamerule, GameRuleVal
             super.onGameruleSetCommand(issuer, gamerule, gameRuleValue, worlds);
         }
 
+        @Override
+        void onGameruleResetCommand(MVCommandIssuer issuer, GameRule gamerule, LoadedMultiverseWorld[] worlds) {
+            super.onGameruleResetCommand(issuer, gamerule, worlds);
+        }
+
         @Override
         @CommandAlias("mvrules|mvgamerules")
         void onGameruleListCommand(MVCommandIssuer issuer, LoadedMultiverseWorld world, String[] flags) {