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

Fix gamerule tab complete when legacy alias is enabled

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

@@ -42,7 +42,6 @@ import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 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 @@ class GameruleCommand extends CoreCommand {
     }
 
     @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 @@ class GameruleCommand extends CoreCommand {
         }
     }
 
-    @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 @@ class GameruleCommand extends CoreCommand {
             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) {

src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java

@@ -33,7 +33,9 @@ import org.mvplugins.multiverse.core.MultiverseCore;
 import org.mvplugins.multiverse.core.command.MVCommandManager;
 import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.destination.DestinationsProvider;
+import org.mvplugins.multiverse.core.dynamiclistener.EventRunnable;
 import org.mvplugins.multiverse.core.dynamiclistener.annotations.DefaultEventPriority;
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventClass;
 import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventMethod;
 import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventPriorityKey;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
@@ -195,59 +197,64 @@ final class MVPlayerListener implements CoreListener {
         return Option.of(mvWorld.getSpawnLocation());
     }
 
-    @EventMethod
+    @EventClass("org.spigotmc.event.player.PlayerSpawnLocationEvent")
     @EventPriorityKey("mvcore-player-spawn-location")
-    void playerSpawnLocation(PlayerSpawnLocationEvent event) {
-        Player player = event.getPlayer();
-        MultiverseWorld world = getWorldManager().getLoadedWorld(player.getWorld()).getOrNull();
-        if (world == null) {
-            Logging.finer("Player joined in a world that is not managed by Multiverse.");
-            return;
-        }
-        if (!player.hasPlayedBefore()) {
-            handleFirstSpawn(event);
-        } else {
-            handleJoinLocation(event);
-        }
-        this.handleGameModeAndFlight(player, event.getSpawnLocation().getWorld());
-    }
+    EventRunnable playerSpawnLocation() {
+        return new EventRunnable<PlayerSpawnLocationEvent>() {
+            @Override
+            public void onEvent(PlayerSpawnLocationEvent event) {
+                Player player = event.getPlayer();
+                MultiverseWorld world = getWorldManager().getLoadedWorld(player.getWorld()).getOrNull();
+                if (world == null) {
+                    Logging.finer("Player joined in a world that is not managed by Multiverse.");
+                    return;
+                }
+                if (!player.hasPlayedBefore()) {
+                    handleFirstSpawn(event);
+                } else {
+                    handleJoinLocation(event);
+                }
+                handleGameModeAndFlight(player, event.getSpawnLocation().getWorld());
+            }
 
-    private void handleFirstSpawn(PlayerSpawnLocationEvent event) {
-        if (!config.getFirstSpawnOverride()) {
-            Logging.finer("FirstSpawnOverride is disabled");
-            // User has disabled the feature in config
-            return;
-        }
-        Logging.fine("Moving NEW player to(firstspawnoverride): %s", config.getFirstSpawnLocation());
-        destinationsProvider.parseDestination(config.getFirstSpawnLocation())
-                .map(destination -> destination.getLocation(event.getPlayer())
-                        .peek(event::setSpawnLocation)
-                        .onEmpty(() -> Logging.warning("The destination in FirstSpawnLocation in config is invalid")))
-                .onFailure(failure -> {
-                    Logging.warning("Invalid destination in FirstSpawnLocation in config: %s");
-                    Logging.warning(failure.getFailureMessage().formatted(getLocales()));
-                });
-    }
+            private void handleFirstSpawn(PlayerSpawnLocationEvent event) {
+                if (!config.getFirstSpawnOverride()) {
+                    Logging.finer("FirstSpawnOverride is disabled");
+                    // User has disabled the feature in config
+                    return;
+                }
+                Logging.fine("Moving NEW player to(firstspawnoverride): %s", config.getFirstSpawnLocation());
+                destinationsProvider.parseDestination(config.getFirstSpawnLocation())
+                        .map(destination -> destination.getLocation(event.getPlayer())
+                                .peek(event::setSpawnLocation)
+                                .onEmpty(() -> Logging.warning("The destination in FirstSpawnLocation in config is invalid")))
+                        .onFailure(failure -> {
+                            Logging.warning("Invalid destination in FirstSpawnLocation in config: %s");
+                            Logging.warning(failure.getFailureMessage().formatted(getLocales()));
+                        });
+            }
 
-    private void handleJoinLocation(PlayerSpawnLocationEvent event) {
-        if (!config.getEnableJoinDestination()) {
-            Logging.finer("JoinDestination is disabled");
-            // User has disabled the feature in config
-            return;
-        }
-        if (config.getJoinDestination().isBlank()) {
-            Logging.warning("Joindestination is enabled but no destination has been specified in config!");
-            return;
-        }
-        Logging.finer("JoinDestination is " + config.getJoinDestination());
-        destinationsProvider.parseDestination(config.getJoinDestination())
-                .map(destination -> destination.getLocation(event.getPlayer())
-                    .peek(event::setSpawnLocation)
-                    .onEmpty(() -> Logging.warning("The destination in JoinDestination in config is invalid")))
-                .onFailure(failure -> {
-                    Logging.warning("Invalid destination in JoinDestination in config: %s");
-                    Logging.warning(failure.getFailureMessage().formatted(getLocales()));
-                });
+            private void handleJoinLocation(PlayerSpawnLocationEvent event) {
+                if (!config.getEnableJoinDestination()) {
+                    Logging.finer("JoinDestination is disabled");
+                    // User has disabled the feature in config
+                    return;
+                }
+                if (config.getJoinDestination().isBlank()) {
+                    Logging.warning("Joindestination is enabled but no destination has been specified in config!");
+                    return;
+                }
+                Logging.finer("JoinDestination is " + config.getJoinDestination());
+                destinationsProvider.parseDestination(config.getJoinDestination())
+                        .map(destination -> destination.getLocation(event.getPlayer())
+                                .peek(event::setSpawnLocation)
+                                .onEmpty(() -> Logging.warning("The destination in JoinDestination in config is invalid")))
+                        .onFailure(failure -> {
+                            Logging.warning("Invalid destination in JoinDestination in config: %s");
+                            Logging.warning(failure.getFailureMessage().formatted(getLocales()));
+                        });
+            }
+        };
     }
 
     /**

src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java

@@ -765,6 +765,7 @@ public final class WorldManager {
         }).andFinally(() -> {
             this.loadTracker.remove(worldCreator.name());
         }).fold(throwable -> Attempt.failure(WorldCreatorFailureReason.BUKKIT_CREATION_FAILED,
+                        Replace.WORLD.with(worldCreator.name()),
                         Replace.ERROR.with(throwable)),
                 Attempt::success);
     }

src/main/resources/multiverse-core_en.properties

@@ -259,12 +259,12 @@ mv-core.destination.shared.failurereason.worldnotfound=&cWorld '&6{world}&c' doe
 mv-core.destination.parse.failurereason.invaliddestinationid=Invalid destination id: {id}. Valid destination ids are: {ids}
 
 # teleport failure reason
-mv-core.teleportfailurereason.null.destination=Destination is invalid!
-mv-core.teleportfailurereason.null.location=Location is invalid!
-mv-core.teleportfailurereason.null.world=&cLocation's world is invalid!
-mv-core.teleportfailurereason.unsafe.location=Location is unsafe! Use `--unsafe` to override.
-mv-core.teleportfailurereason.teleport.failed=Something rejected the teleport.
-mv-core.teleportfailurereason.teleport.failed.exception=An error occurred during the teleport. See console for more details.
+mv-core.teleportfailurereason.null.destination=The destination is invalid!
+mv-core.teleportfailurereason.null.location=The location is invalid!
+mv-core.teleportfailurereason.null.world=&cThe target world is unloaded or does not exist!
+mv-core.teleportfailurereason.unsafe.location=The location is deemed unsafe! If this is intentional, use the `--unsafe` flag to override.
+mv-core.teleportfailurereason.teleport.failed=The teleport was rejected. Please ensure another plugin is not preventing the teleport and check server logs for any errors.
+mv-core.teleportfailurereason.teleport.failed.exception=An error occurred during the teleport. Check server logs for more details.
 mv-core.teleportfailurereason.event.cancelled=The teleport was cancelled by another plugin.
 
 # world manager result