Merge pull request #3366 from Multiverse/fix/coordinate-scale

Fix spigot compatibility with getCoordinateScale

.github/workflows/generic.platform_uploads.yml

@@ -107,7 +107,7 @@ jobs:
         files: '["${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar"]'
         name: ${{ steps.release-info.outputs.tag_name }}
         changelog: ${{ steps.release-artifact.outputs.body }}
-        game_versions: 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2
+        game_versions: 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2
         version_type: ${{ steps.parse-release-type.outputs.release_type }}
         loaders: bukkit, spigot, paper
         dependencies: ${{ inputs.modrinth_dependencies }}
@@ -121,7 +121,7 @@ jobs:
         changelog: ${{ steps.release-artifact.outputs.body }}
         changelog_type: markdown
         display_name: ${{ steps.release-info.outputs.tag_name }}
-        game_versions: 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2
+        game_versions: 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2
         release_type: ${{ steps.parse-release-type.outputs.release_type }}
         project_relations: ${{ inputs.dbo_project_relations }}
         file_path: ${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar
@@ -136,5 +136,5 @@ jobs:
         channel: ${{ steps.parse-release-type.outputs.release_type }}
         files: '[{"path": "${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar", "platforms": ["PAPER"]}]'
         description: ${{ steps.release-artifact.outputs.body }}
-        platform_dependencies: '{"PAPER": ["1.18.2-1.21.8"]}'
+        platform_dependencies: '{"PAPER": ["1.18.2-1.21.10"]}'
         plugin_dependencies: ${{ inputs.hangar_plugin_dependencies }}

build.gradle

@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
-    id 'org.mvplugins.multiverse-plugin' version '1.2.1'
+    id 'org.mvplugins.multiverse-plugin' version '1.2.2'
 }
 
 group = 'org.mvplugins.multiverse.core'
@@ -27,7 +27,7 @@ repositories {
 configure(apiDependencies) {
     serverApiVersion = '1.21.8-R0.1-SNAPSHOT'
     mockBukkitServerApiVersion = '1.21'
-    mockBukkitVersion = '4.69.2'
+    mockBukkitVersion = '4.84.0'
 }
 
 dependencies {

src/main/java/org/mvplugins/multiverse/core/PlaceholderExpansionHook.java

@@ -1,7 +1,6 @@
 package org.mvplugins.multiverse.core;
 
 import com.google.common.collect.Lists;
-import io.vavr.control.Option;
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -20,9 +19,8 @@ import org.mvplugins.multiverse.core.utils.StringFormatter;
 import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 @Service
 final class PlaceholderExpansionHook extends PlaceholderExpansion {
@@ -123,7 +121,7 @@ final class PlaceholderExpansionHook extends PlaceholderExpansion {
                                                       @NotNull List<String> placeholderParams,
                                                       @NotNull LoadedMultiverseWorld world) {
         // Switch to find what specific placeholder we want
-        switch (placeholder.toLowerCase()) {
+        switch (placeholder.toLowerCase(Locale.ENGLISH)) {
             case "alias" -> {
                 return world.getAliasOrName();
             }

src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java

@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -176,7 +177,7 @@ public class MVCommandCompletions extends PaperCommandCompletions {
     public <T extends Enum<T>> Collection<String> suggestEnums(Class<T> enumClass) {
         return EnumSet.allOf(enumClass).stream()
                 .map(Enum::name)
-                .map(String::toLowerCase)
+                .map(name -> name.toLowerCase(Locale.ENGLISH))
                 .toList();
     }
 

src/main/java/org/mvplugins/multiverse/core/command/flag/CommandValueFlag.java

@@ -3,6 +3,7 @@ package org.mvplugins.multiverse.core.command.flag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.function.Function;
 
 import co.aikar.commands.InvalidCommandArgument;
@@ -220,7 +221,7 @@ public class CommandValueFlag<T> extends CommandFlag {
         private void setEnumContext() {
             this.context = (String value) -> {
                 try {
-                    return Enum.valueOf(type, value.toUpperCase());
+                    return Enum.valueOf(type, value.toUpperCase(Locale.ENGLISH));
                 } catch (IllegalArgumentException e) {
                     throw new InvalidCommandArgument("Invalid value for argument " + key + ": " + value);
                 }
@@ -229,7 +230,7 @@ public class CommandValueFlag<T> extends CommandFlag {
 
         private void setEnumCompletion() {
             List<String> types = Arrays.stream(type.getEnumConstants())
-                    .map(typeClass -> typeClass.name().toLowerCase())
+                    .map(typeClass -> typeClass.name().toLowerCase(Locale.ENGLISH))
                     .toList();
 
             this.completion = (input) -> types;

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

@@ -113,9 +113,9 @@ final class EntitySpawnConfigCommand extends CoreCommand {
                 .getSpawnCategoryConfig(spawnCategory)
                 .getStringPropertyHandle()
                 .modifyPropertyString(property, value, action)
-                .onSuccess(ignore -> issuer.sendMessage("Successfully set " + property + " to " + value
+                .onSuccess(ignore -> issuer.sendInfo("Successfully set " + property + " to " + value
                         + " for " + spawnCategory.name() + " in " + world.getName()))
-                .onFailure(e -> issuer.sendMessage("Unable to set " + property + " to " + value
+                .onFailure(e -> issuer.sendError("Unable to set " + property + " to " + value
                         + " for " + spawnCategory.name() + " in " + world.getName() + ": " + e.getMessage()));
 
         worldManager.saveWorldsConfig();

src/main/java/org/mvplugins/multiverse/core/config/CoreConfigNodes.java

@@ -76,13 +76,10 @@ final class CoreConfigNodes {
             .comment("#                    █░▀░█ █▄█ █▄▄ ░█░ █ ▀▄▀ ██▄ █▀▄ ▄█ ██▄   █▄▄ █▄█ █▀▄ ██▄                      #")
             .comment("#                                                                                                  #")
             .comment("#                                                                                                  #")
-            .comment("#    WIKI:        https://github.com/Multiverse/Multiverse-Core/wiki                               #")
+            .comment("#    WIKI:        https://mvplugins.org/core/                                                      #")
             .comment("#    DISCORD:     https://discord.gg/NZtfKky                                                       #")
             .comment("#    BUG REPORTS: https://github.com/Multiverse/Multiverse-Core/issues                             #")
-            .comment("#                                                                                                  #")
-            .comment("#                                                                                                  #")
-            .comment("#    Each option in this file is documented and explained here:                                    #")
-            .comment("#     ==>  https://github.com/Multiverse/Multiverse-Core/wiki/config.yml                           #")
+            .comment("#    DONATE:      https://github.com/sponsors/Multiverse                                           #")
             .comment("#                                                                                                  #")
             .comment("#                                                                                                  #")
             .comment("#    New options are added to this file automatically. If you manually made changes                #")
@@ -572,6 +569,7 @@ final class CoreConfigNodes {
     final ConfigNode<Boolean> showDonationMessage = node(ConfigNode.builder("misc.show-donation-message", Boolean.class)
             .comment("")
             .comment("If you don't want to donate, you can set this to false and Multiverse will stop nagging you.")
+            .comment("But if you want to donate, here is our Github Sponsors page: https://github.com/sponsors/Multiverse")
             .defaultValue(true)
             .name("show-donation-message")
             .build());

src/main/java/org/mvplugins/multiverse/core/config/node/functions/DefaultStringParserProvider.java

@@ -1,6 +1,7 @@
 package org.mvplugins.multiverse.core.config.node.functions;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import co.aikar.commands.ACFUtil;
@@ -41,13 +42,13 @@ public final class DefaultStringParserProvider {
     }
 
     private static final NodeStringParser<Enum> ENUM_STRING_PARSER = (input, type) -> Try.of(
-            () -> Enum.valueOf(type, input.toUpperCase()));
+            () -> Enum.valueOf(type, input.toUpperCase(Locale.ENGLISH)));
 
     private static final NodeStringParser<String> STRING_STRING_PARSER = (input, type) -> Try.of(
             () -> input);
 
     private static final NodeStringParser<Boolean> BOOLEAN_STRING_PARSER = (input, type) -> Try.of(
-            () -> switch (String.valueOf(input).toLowerCase()) {
+            () -> switch (String.valueOf(input).toLowerCase(Locale.ENGLISH)) {
                 case "t", "true", "on", "y", "yes", "1", "allow" -> true;
                 case "f", "false", "off", "n", "no", "0", "deny" -> false;
                 default -> throw new MultiverseException("Unable to convert '" + input + "' to boolean. Please use 'true' or 'false'");

src/main/java/org/mvplugins/multiverse/core/config/node/functions/DefaultSuggesterProvider.java

@@ -3,6 +3,7 @@ package org.mvplugins.multiverse.core.config.node.functions;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -43,7 +44,7 @@ public final class DefaultSuggesterProvider {
     private static NodeSuggester enumSuggester(Class<?> clazz) {
         return input -> Arrays.stream(clazz.getEnumConstants())
                 .map(Object::toString)
-                .map(String::toLowerCase)
+                .map(name -> name.toLowerCase(Locale.ENGLISH))
                 .collect(Collectors.toList());
     }
 

src/main/java/org/mvplugins/multiverse/core/config/node/serializer/DefaultSerializerProvider.java

@@ -48,12 +48,12 @@ public final class DefaultSerializerProvider {
             if (type.isInstance(object)) {
                 return (Enum<?>) object;
             }
-            return Enum.valueOf(type, String.valueOf(object).toUpperCase());
+            return Enum.valueOf(type, String.valueOf(object).toUpperCase(Locale.ENGLISH));
         }
 
         @Override
         public Object serialize(Enum object, Class<Enum> type) {
-            return object.name().toLowerCase();
+            return object.name().toLowerCase(Locale.ENGLISH);
         }
     };
 
@@ -80,7 +80,7 @@ public final class DefaultSerializerProvider {
             }
             String input = String.valueOf(object);
             //todo: this is a copy from string parser
-            return switch (input.toLowerCase()) {
+            return switch (input.toLowerCase(Locale.ENGLISH)) {
                 case "t", "true", "on", "y", "yes", "1", "allow" -> true;
                 case "f", "false", "off", "n", "no", "0", "deny" -> false;
                 default -> throw new RuntimeException("Unable to convert '" + input + "' to boolean.");

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

@@ -11,7 +11,6 @@ import com.dumptruckman.minecraft.util.Logging;
 import jakarta.inject.Inject;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -43,7 +42,7 @@ final class MVEntityListener implements CoreListener {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void foodLevelChange(FoodLevelChangeEvent event) {
+    void foodLevelChange(FoodLevelChangeEvent event) {
         if (event.isCancelled()) {
             return;
         }
@@ -65,7 +64,7 @@ final class MVEntityListener implements CoreListener {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void entityRegainHealth(EntityRegainHealthEvent event) {
+    void entityRegainHealth(EntityRegainHealthEvent event) {
         if (event.isCancelled() || event.getRegainReason() != RegainReason.REGEN) {
             return;
         }
@@ -84,7 +83,7 @@ final class MVEntityListener implements CoreListener {
      * @param event The event.
      */
     @EventMethod
-    public void creatureSpawn(CreatureSpawnEvent event) {
+    void creatureSpawn(CreatureSpawnEvent event) {
         if (event.isCancelled()) {
             return;
         }
@@ -110,7 +109,7 @@ final class MVEntityListener implements CoreListener {
      * Handle Spawn Category settings for non-creature entities.
      */
     @EventMethod
-    public void entitySpawn(EntitySpawnEvent event) {
+    void entitySpawn(EntitySpawnEvent event) {
         if (event.getEntity() instanceof LivingEntity) {
             // Handled by CreatureSpawnEvent
             return;

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

@@ -23,6 +23,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
@@ -32,16 +33,16 @@ import org.jvnet.hk2.annotations.Service;
 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.DestinationInstance;
 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;
 import org.mvplugins.multiverse.core.event.MVRespawnEvent;
 import org.mvplugins.multiverse.core.locale.PluginLocales;
 import org.mvplugins.multiverse.core.permissions.CorePermissionsChecker;
+import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 import org.mvplugins.multiverse.core.teleportation.BlockSafety;
 import org.mvplugins.multiverse.core.teleportation.TeleportQueue;
 import org.mvplugins.multiverse.core.utils.result.ResultChain;
@@ -52,7 +53,6 @@ import org.mvplugins.multiverse.core.world.entrycheck.EntryFeeResult;
 import org.mvplugins.multiverse.core.world.entrycheck.WorldEntryCheckerProvider;
 import org.mvplugins.multiverse.core.world.helpers.DimensionFinder;
 import org.mvplugins.multiverse.core.world.helpers.EnforcementHandler;
-import org.spigotmc.event.player.PlayerSpawnLocationEvent;
 
 /**
  * Multiverse's Listener for players.
@@ -72,6 +72,7 @@ final class MVPlayerListener implements CoreListener {
     private final EnforcementHandler enforcementHandler;
     private final DimensionFinder dimensionFinder;
     private final CorePermissionsChecker corePermissionsChecker;
+    private final AsyncSafetyTeleporter asyncSafetyTeleporter;
 
     private final Map<String, String> playerWorld = new ConcurrentHashMap<>();
 
@@ -89,7 +90,8 @@ final class MVPlayerListener implements CoreListener {
             DestinationsProvider destinationsProvider,
             EnforcementHandler enforcementHandler,
             DimensionFinder dimensionFinder,
-            CorePermissionsChecker corePermissionsChecker) {
+            CorePermissionsChecker corePermissionsChecker,
+            AsyncSafetyTeleporter asyncSafetyTeleporter) {
         this.plugin = plugin;
         this.config = config;
         this.worldManagerProvider = worldManagerProvider;
@@ -103,6 +105,7 @@ final class MVPlayerListener implements CoreListener {
         this.enforcementHandler = enforcementHandler;
         this.dimensionFinder = dimensionFinder;
         this.corePermissionsChecker = corePermissionsChecker;
+        this.asyncSafetyTeleporter = asyncSafetyTeleporter;
     }
 
     private WorldManager getWorldManager() {
@@ -113,7 +116,7 @@ final class MVPlayerListener implements CoreListener {
         return commandManagerProvider.get();
     }
 
-    public PluginLocales getLocales() {
+    private PluginLocales getLocales() {
         return getCommandManager().getLocales();
     }
 
@@ -122,7 +125,7 @@ final class MVPlayerListener implements CoreListener {
      *
      * @return the playerWorld-map
      */
-    public Map<String, String> getPlayerWorld() {
+    Map<String, String> getPlayerWorld() {
         return playerWorld;
     }
 
@@ -134,7 +137,7 @@ final class MVPlayerListener implements CoreListener {
     @EventMethod
     @EventPriorityKey("mvcore-player-respawn")
     @DefaultEventPriority(EventPriority.LOW)
-    public void playerRespawn(PlayerRespawnEvent event) {
+    void playerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
         LoadedMultiverseWorld mvWorld = getWorldManager().getLoadedWorld(player.getWorld()).getOrNull();
         if (mvWorld == null) {
@@ -201,68 +204,63 @@ final class MVPlayerListener implements CoreListener {
         return Option.of(mvWorld.getSpawnLocation());
     }
 
-    @EventClass("org.spigotmc.event.player.PlayerSpawnLocationEvent")
+    @EventMethod
+    // TODO: Consider if this key is needed anymore, need to remove from config.yml as well
     @EventPriorityKey("mvcore-player-spawn-location")
-    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());
-            }
+    void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        if (player.hasPlayedBefore()) {
+            handleJoinLocation(player);
+        } else {
+            handleFirstSpawn(player);
+        }
+        handleGameModeAndFlight(player, player.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(Player player) {
+        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())
+                .peek(destination -> teleportToDestinationOnJoin(player, destination))
+                .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;
-                }
-                if (corePermissionsChecker.hasJoinLocationBypassPermission(event.getPlayer())) {
-                    Logging.finer("Player %s has bypass permission for JoinDestination", event.getPlayer().getName());
-                    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(Player player) {
+        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;
+        }
+        if (corePermissionsChecker.hasJoinLocationBypassPermission(player)) {
+            Logging.finer("Player %s has bypass permission for JoinDestination", player.getName());
+            return;
+        }
+        Logging.finer("JoinDestination is " + config.getJoinDestination());
+        destinationsProvider.parseDestination(config.getJoinDestination())
+                .peek(destination -> teleportToDestinationOnJoin(player, destination))
+                .onFailure(failure -> {
+                    Logging.warning("Invalid destination in JoinDestination in config: %s");
+                    Logging.warning(failure.getFailureMessage().formatted(getLocales()));
+                });
+    }
+
+    private void teleportToDestinationOnJoin(Player player, DestinationInstance<?, ?> destination) {
+        asyncSafetyTeleporter.to(destination).teleportSingle(player)
+                .onSuccess(result -> Logging.fine("Player %s has been teleported on join",
+                        player.getName()))
+                .onFailure(failure -> Logging.warning("Failed to teleport player %s on join: %s",
+                        player.getName(), failure.getFirst()));
     }
 
     /**
@@ -271,7 +269,7 @@ final class MVPlayerListener implements CoreListener {
      */
     @EventMethod
     @DefaultEventPriority(EventPriority.MONITOR)
-    public void playerChangedWorld(PlayerChangedWorldEvent event) {
+    void playerChangedWorld(PlayerChangedWorldEvent event) {
         // Permissions now determine whether or not to handle a gamemode.
         this.handleGameModeAndFlight(event.getPlayer(), event.getPlayer().getWorld());
         playerWorld.put(event.getPlayer().getName(), event.getPlayer().getWorld().getName());
@@ -284,7 +282,7 @@ final class MVPlayerListener implements CoreListener {
     @EventMethod
     @EventPriorityKey("mvcore-player-teleport")
     @DefaultEventPriority(EventPriority.HIGHEST)
-    public void playerTeleport(PlayerTeleportEvent event) {
+    void playerTeleport(PlayerTeleportEvent event) {
         Logging.finer("Got teleport event for player '"
                 + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
         if (event.isCancelled()) {
@@ -355,7 +353,7 @@ final class MVPlayerListener implements CoreListener {
      */
     @EventMethod
     @DefaultEventPriority(EventPriority.LOWEST)
-    public void playerPortalCheck(PlayerPortalEvent event) {
+    void playerPortalCheck(PlayerPortalEvent event) {
         if (event.isCancelled()) {
             return;
         }
@@ -381,7 +379,7 @@ final class MVPlayerListener implements CoreListener {
     @EventMethod
     @EventPriorityKey("mvcore-player-portal")
     @DefaultEventPriority(EventPriority.HIGH)
-    public void playerPortal(PlayerPortalEvent event) {
+    void playerPortal(PlayerPortalEvent event) {
         if (event.isCancelled()) {
             return;
         }

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

@@ -12,7 +12,6 @@ import jakarta.inject.Inject;
 import org.bukkit.Material;
 import org.bukkit.PortalType;
 import org.bukkit.block.BlockState;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityPortalEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -48,7 +47,7 @@ final class MVPortalListener implements CoreListener {
      */
     @EventMethod
     @IgnoreIfCancelled
-    public void portalCreate(PortalCreateEvent event) {
+    void portalCreate(PortalCreateEvent event) {
         Logging.fine("Attempting to create portal at '%s' with reason: %s",
                 event.getWorld().getName(), event.getReason());
 
@@ -93,7 +92,7 @@ final class MVPortalListener implements CoreListener {
      */
     @EventMethod
     @IgnoreIfCancelled
-    public void playerInteract(PlayerInteractEvent event) {
+    void playerInteract(PlayerInteractEvent event) {
         if (isCreateEndPortalInteraction(event)) {
             return;
         }
@@ -122,7 +121,7 @@ final class MVPortalListener implements CoreListener {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void entityPortal(EntityPortalEvent event) {
+    void entityPortal(EntityPortalEvent event) {
         if (event.isCancelled() || event.getTo() == null) {
             return;
         }

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

@@ -9,7 +9,6 @@ package org.mvplugins.multiverse.core.listeners;
 
 import com.dumptruckman.minecraft.util.Logging;
 import jakarta.inject.Inject;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
 import org.jvnet.hk2.annotations.Service;
@@ -35,7 +34,7 @@ final class MVWeatherListener implements CoreListener {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void weatherChange(WeatherChangeEvent event) {
+    void weatherChange(WeatherChangeEvent event) {
         if (event.isCancelled() || !event.toWeatherState()) {
             return;
         }
@@ -54,7 +53,7 @@ final class MVWeatherListener implements CoreListener {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void thunderChange(ThunderChangeEvent event) {
+    void thunderChange(ThunderChangeEvent event) {
         if (event.isCancelled() || !event.toThunderState()) {
             return;
         }

src/main/java/org/mvplugins/multiverse/core/module/MultiverseModule.java

@@ -10,18 +10,16 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.ApiStatus;
 import org.jvnet.hk2.annotations.Contract;
 import org.mvplugins.multiverse.core.MultiverseCore;
-import org.mvplugins.multiverse.core.MultiverseCoreApi;
 import org.mvplugins.multiverse.core.command.MVCommandManager;
 import org.mvplugins.multiverse.core.command.MultiverseCommand;
-import org.mvplugins.multiverse.core.commands.CoreCommand;
 import org.mvplugins.multiverse.core.dynamiclistener.DynamicListener;
 import org.mvplugins.multiverse.core.dynamiclistener.DynamicListenerRegistration;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocatorFactory;
-import org.mvplugins.multiverse.core.inject.binder.PluginBinder;
-import org.mvplugins.multiverse.core.listeners.CoreListener;
 import org.mvplugins.multiverse.core.utils.REPatterns;
 
+import java.util.Locale;
+
 /**
  * Common plugin class for all Multiverse plugins.
  */
@@ -151,7 +149,7 @@ public abstract class MultiverseModule extends JavaPlugin {
                 .andThen(pluginLocales -> {
                     pluginLocales.addFileResClassLoader(this);
                     pluginLocales.addBundleClassLoader(this.getClassLoader());
-                    pluginLocales.addMessageBundles(this.getDescription().getName().toLowerCase());
+                    pluginLocales.addMessageBundles(this.getName().toLowerCase(Locale.ENGLISH));
                 })
                 .onFailure(e -> {
                     Logging.severe("Failed to register locales");

src/main/java/org/mvplugins/multiverse/core/teleportation/LocationManipulation.java

@@ -228,8 +228,8 @@ public final class LocationManipulation {
         if (orientation == null) {
             return 0;
         }
-        if (ORIENTATION_INTS.containsKey(orientation.toLowerCase())) {
-            return ORIENTATION_INTS.get(orientation.toLowerCase());
+        if (ORIENTATION_INTS.containsKey(orientation.toLowerCase(Locale.ENGLISH))) {
+            return ORIENTATION_INTS.get(orientation.toLowerCase(Locale.ENGLISH));
         }
         return 0;
     }

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

@@ -1,6 +1,7 @@
 package org.mvplugins.multiverse.core.world;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.dumptruckman.minecraft.util.Logging;
@@ -417,7 +418,7 @@ final class WorldConfig {
 
             if (alias.get().isEmpty()) return;
 
-            Try.of(() -> Enum.valueOf(EnglishChatColor.class, color.toUpperCase()))
+            Try.of(() -> Enum.valueOf(EnglishChatColor.class, color.toUpperCase(Locale.ENGLISH)))
                     .map(c -> c.color)
                     .onSuccess(c -> {
                         if (c != ChatColor.WHITE) {
@@ -425,7 +426,7 @@ final class WorldConfig {
                         }
                     });
 
-            Try.of(() -> Enum.valueOf(EnglishChatStyle.class, style.toUpperCase()))
+            Try.of(() -> Enum.valueOf(EnglishChatStyle.class, style.toUpperCase(Locale.ENGLISH)))
                     .map(c -> c.color)
                     .onSuccess(s -> {
                         if (s != null) {

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

@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 
 import com.dumptruckman.minecraft.util.Logging;
 import com.google.common.base.Strings;
+import io.papermc.lib.PaperLib;
 import io.vavr.control.Option;
 import io.vavr.control.Try;
 import jakarta.inject.Inject;
@@ -370,12 +371,20 @@ public final class WorldManager {
     private LoadedMultiverseWorld newLoadedMultiverseWorld(
             @NotNull World world, @Nullable String generator, @Nullable String biome, boolean adjustSpawn) {
         WorldConfig worldConfig = worldsConfigManager.addWorldConfig(world.getName());
+
+        // Properties from multiverse input
         worldConfig.setAdjustSpawn(adjustSpawn);
         worldConfig.setGenerator(generator == null ? "" : generator);
         worldConfig.setBiome(biome == null ? "" : biome);
+
+        // Properties from the bukkit world
+        worldConfig.setDifficulty(world.getDifficulty());
+        worldConfig.setKeepSpawnInMemory(world.getKeepSpawnInMemory());
+        worldConfig.setScale(getCoordinateScale(world));
+
         worldConfig.save();
 
-        MultiverseWorld mvWorld = newMultiverseWorld(world.getName(), worldConfig);
+        newMultiverseWorld(world.getName(), worldConfig);
         LoadedMultiverseWorld loadedWorld = new LoadedMultiverseWorld(
                 world,
                 worldConfig,
@@ -384,20 +393,21 @@ public final class WorldManager {
                 locationManipulation,
                 entityPurger
         );
-        setDefaultEnvironmentScale(mvWorld);
         loadedWorldsMap.put(loadedWorld.getName(), loadedWorld);
         saveWorldsConfig();
         pluginManager.callEvent(new MVWorldLoadedEvent(loadedWorld));
         return loadedWorld;
     }
 
-    private void setDefaultEnvironmentScale(MultiverseWorld world) {
-        double scale = switch (world.getEnvironment()) {
-            case NETHER -> 8.0;
-            case THE_END -> 16.0;
-            default -> 1.0;
+    private double getCoordinateScale(World world) {
+        if (PaperLib.isPaper()) {
+            return world.getCoordinateScale();
+        }
+        return switch (world.getEnvironment()) {
+            case NORMAL -> 1;
+            case NETHER -> 8;
+            default -> 1;
         };
-        world.setScale(scale);
     }
 
     /**

src/main/java/org/mvplugins/multiverse/core/world/biomeprovider/SingleBiomeProviderParser.java

@@ -1,5 +1,7 @@
 package org.mvplugins.multiverse.core.world.biomeprovider;
 
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BiomeProvider;
 import org.jetbrains.annotations.NotNull;
@@ -7,6 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * A parser for {@link SingleBiomeProvider}
@@ -17,13 +20,16 @@ final class SingleBiomeProviderParser implements BiomeProviderParser {
 
     @Override
     public BiomeProvider parseBiomeProvider(@NotNull String worldName, @NotNull String params) {
-        return new SingleBiomeProvider(Biome.valueOf(params.toUpperCase()));
+        NamespacedKey biomeKey = NamespacedKey.fromString(params.toLowerCase(Locale.ENGLISH));
+        return new SingleBiomeProvider(Registry.BIOME.get(biomeKey));
     }
 
     @Override
     public Collection<String> suggestParams(@NotNull String currentInput) {
         if (biomes == null) {
-            biomes = Arrays.stream(Biome.values()).map(biome -> biome.toString().toLowerCase()).toList();
+            biomes = Registry.BIOME.stream()
+                    .map(biome -> biome.getKey().getKey().toLowerCase(Locale.ENGLISH))
+                    .toList();
         }
         return biomes;
     }

src/main/java/org/mvplugins/multiverse/core/world/entity/EntitySpawnConfig.java

@@ -11,6 +11,7 @@ import org.mvplugins.multiverse.core.utils.StringFormatter;
 import org.mvplugins.multiverse.core.world.MultiverseWorld;
 
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public final class EntitySpawnConfig {
@@ -52,7 +53,7 @@ public final class EntitySpawnConfig {
     public ConfigurationSection toSection() {
         MemoryConfiguration section = new MemoryConfiguration();
         spawnCategoriesConfig.forEach((spawnCategory, spawnCategoryConfig) -> {
-            section.set(spawnCategory.toString().toLowerCase(), spawnCategoryConfig.saveSection());
+            section.set(spawnCategory.toString().toLowerCase(Locale.ENGLISH), spawnCategoryConfig.saveSection());
         });
         return section;
     }
@@ -65,7 +66,7 @@ public final class EntitySpawnConfig {
                 Logging.warning("Invalid spawn category config for " + key + ": " + value);
                 return;
             }
-            SpawnCategory spawnCategory = SpawnCategory.valueOf(key.toUpperCase());
+            SpawnCategory spawnCategory = SpawnCategory.valueOf(key.toUpperCase(Locale.ENGLISH));
             spawnCategoriesConfig.put(spawnCategory, new SpawnCategoryConfig(config, spawnCategory, sectionPart));
         });
         return new EntitySpawnConfig(config, spawnCategoriesConfig);

src/main/java/org/mvplugins/multiverse/core/world/generators/GeneratorProvider.java

@@ -95,15 +95,19 @@ public final class GeneratorProvider implements Listener {
     private boolean testIsGeneratorPlugin(Plugin plugin) {
         String worldName = Bukkit.getWorlds().stream().findFirst().map(World::getName).orElse("world");
         try {
-            return plugin.getDefaultWorldGenerator(worldName, null) != null;
+            return plugin.getDefaultWorldGenerator(worldName, "") != null;
         } catch (UnsupportedOperationException e) {
             // Some plugins throw this if they don't support world generation
             return false;
         } catch (Throwable t) {
             Logging.warning("Plugin %s threw an exception when testing if it is a generator plugin! ",
                     plugin.getName());
-            Logging.warning("This is NOT a bug in Multiverse. Do NOT report this to Multiverse support.");
-            t.printStackTrace();
+            Logging.warning("Error by plugin %s: %s", plugin.getName(), t.getMessage());
+            Logging.warning("This is NOT a bug in Multiverse. Do NOT report this to Multiverse support. " +
+                    "Enable debug mode with `/mv debug 1` to see the full stack trace.");
+            if (coreConfig.getGlobalDebug() >= 1) {
+                t.printStackTrace();
+            }
             // Assume it's a generator plugin since it tried to do something, most likely the id is wrong.
             return true;
         }

src/main/java/org/mvplugins/multiverse/core/world/helpers/WorldNameChecker.java

@@ -1,6 +1,7 @@
 package org.mvplugins.multiverse.core.world.helpers;
 
 import java.io.File;
+import java.util.Locale;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -130,7 +131,7 @@ public final class WorldNameChecker {
      * @return True if it looks like a world, else false.
      */
     private boolean folderHasDat(@NotNull File worldFolder) {
-        File[] files = worldFolder.listFiles((file, name) -> name.toLowerCase().endsWith(".dat"));
+        File[] files = worldFolder.listFiles((file, name) -> name.toLowerCase(Locale.ENGLISH).endsWith(".dat"));
         return files != null && files.length > 0;
     }