Release version 4.3.0.

Merge pull request #2635 from Multiverse/fix/version_cmd_perms
Change default permission for version command. Seriously wth.
2021-06-23 08:56:24 -04:00 · 2021-06-04 13:00:39 -04:00 · 2021-06-04 13:00:04 -04:00 · 2021-05-16 11:29:23 -04:00 · 2021-05-16 11:21:20 -04:00 · 2021-05-16 12:56:14 +08:00
75 changed files with 1003 additions and 610 deletions
@@ -69,7 +69,7 @@
        <module name="TypeName"/>
        <module name="AvoidStarImport">
            <property name="severity" value="warning"/>
-            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commands_old,com.onarandombox.MultiverseCore.destination"/>
+            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commands,com.onarandombox.MultiverseCore.destination"/>
        </module>
        <module name="IllegalImport"/>
        <module name="RedundantImport"/>
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.onarandombox.multiversecore</groupId>
    <artifactId>Multiverse-Core</artifactId>
-    <version>4.2.3-SNAPSHOT</version>
+    <version>4.3.0</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
@@ -27,21 +27,13 @@
            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
        </repository>
        <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
        </repository>
        <repository>
            <id>minebench-repo</id>
            <url>https://repo.minebench.de/</url>
        </repository>
-        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
-        </repository>
-        <repository>
-            <id>aikar</id>
-            <url>https://repo.aikar.co/content/groups/aikar/</url>
-        </repository>
    </repositories>

    <pluginRepositories>
@@ -227,6 +219,7 @@
                            <goal>shade</goal>
                        </goals>
                        <configuration>
+                            <minimizeJar>true</minimizeJar>
                            <relocations>
                                <relocation>
                                    <pattern>me.main__.util</pattern>
@@ -260,14 +253,6 @@
                                    <pattern>de.themoep.idconverter</pattern>
                                    <shadedPattern>com.onarandombox.idconverter</shadedPattern>
                                </relocation>
-                                <relocation>
-                                    <pattern>co.aikar.commands</pattern>
-                                    <shadedPattern>com.onarandombox.acf</shadedPattern> <!-- Replace this -->
-                                </relocation>
-                                <relocation>
-                                    <pattern>co.aikar.locales</pattern>
-                                    <shadedPattern>com.onarandombox.locales</shadedPattern> <!-- Replace this -->
-                                </relocation>
                            </relocations>
                        </configuration>
                    </execution>
@@ -317,18 +302,13 @@
        <!-- End of SerializationConfig Dependency -->
        <!-- Start of Economy Dependency -->
        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
+            <groupId>com.github.MilkBowl</groupId>
            <artifactId>VaultAPI</artifactId>
            <version>1.7</version>
            <scope>provided</scope>
        </dependency>
        <!-- End of Economy Dependency -->
        <!-- Start of CommandHandler Dependency -->
-        <dependency>
-            <groupId>co.aikar</groupId>
-            <artifactId>acf-paper</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
-        </dependency>
        <dependency>
            <groupId>com.pneumaticraft.commandhandler</groupId>
            <artifactId>CommandHandler</artifactId>
@@ -342,13 +322,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.2.1</version>
        </dependency>
        <dependency>
            <groupId>com.dumptruckman.minecraft</groupId>
@@ -7,6 +7,21 @@

 package com.onarandombox.MultiverseCore;

+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+
 import buscript.Buscript;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
@@ -18,7 +33,42 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
+import com.onarandombox.MultiverseCore.commands.AnchorCommand;
+import com.onarandombox.MultiverseCore.commands.CheckCommand;
+import com.onarandombox.MultiverseCore.commands.CloneCommand;
+import com.onarandombox.MultiverseCore.commands.ConfigCommand;
+import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
+import com.onarandombox.MultiverseCore.commands.CoordCommand;
+import com.onarandombox.MultiverseCore.commands.CreateCommand;
+import com.onarandombox.MultiverseCore.commands.DebugCommand;
+import com.onarandombox.MultiverseCore.commands.DeleteCommand;
+import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
+import com.onarandombox.MultiverseCore.commands.GameruleCommand;
+import com.onarandombox.MultiverseCore.commands.GamerulesCommand;
+import com.onarandombox.MultiverseCore.commands.GeneratorCommand;
+import com.onarandombox.MultiverseCore.commands.HelpCommand;
+import com.onarandombox.MultiverseCore.commands.ImportCommand;
+import com.onarandombox.MultiverseCore.commands.InfoCommand;
+import com.onarandombox.MultiverseCore.commands.ListCommand;
+import com.onarandombox.MultiverseCore.commands.LoadCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyAddCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyClearCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyRemoveCommand;
+import com.onarandombox.MultiverseCore.commands.ModifySetCommand;
+import com.onarandombox.MultiverseCore.commands.PurgeCommand;
+import com.onarandombox.MultiverseCore.commands.RegenCommand;
+import com.onarandombox.MultiverseCore.commands.ReloadCommand;
+import com.onarandombox.MultiverseCore.commands.RemoveCommand;
+import com.onarandombox.MultiverseCore.commands.ScriptCommand;
+import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
+import com.onarandombox.MultiverseCore.commands.SilentCommand;
+import com.onarandombox.MultiverseCore.commands.SpawnCommand;
+import com.onarandombox.MultiverseCore.commands.TeleportCommand;
+import com.onarandombox.MultiverseCore.commands.UnloadCommand;
+import com.onarandombox.MultiverseCore.commands.VersionCommand;
+import com.onarandombox.MultiverseCore.commands.WhoCommand;
+import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.AnchorDestination;
 import com.onarandombox.MultiverseCore.destination.BedDestination;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
@@ -45,14 +95,14 @@ import com.onarandombox.MultiverseCore.utils.MVMessaging;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
 import com.onarandombox.MultiverseCore.utils.MaterialConverter;
+import com.onarandombox.MultiverseCore.utils.TestingMode;
+import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
 import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
 import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.TestingMode;
 import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
 import com.onarandombox.MultiverseCore.utils.VaultHandler;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
-import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.SerializationConfig;
@@ -60,6 +110,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.ConfigurationSection;
@@ -72,19 +123,6 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
 /**
 * The implementation of the Multiverse-{@link Core}.
 */
@@ -166,7 +204,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    }

    // Setup our Map for our Commands using the CommandHandler.
-    private MVCommandManager commandManager;
+    private CommandHandler commandHandler;
+    private CommandQueueManager commandQueueManager;

    private static final String LOG_TAG = "[Multiverse-Core]";

@@ -250,7 +289,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        this.ph = new MVPermissions(this);

        // Setup the command manager
-        this.commandManager = new MVCommandManager(this);
+        this.commandHandler = new CommandHandler(this, this.ph);
+        this.commandQueueManager = new CommandQueueManager(this);
+        // Call the Function to assign all the Commands to their Class.
+        this.registerCommands();

        // Initialize the Destination factor AFTER the commands
        this.initializeDestinationFactory();
@@ -325,7 +367,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                // Add global variable "multiverse" to javascript environment
                buscript.setScriptVariable("multiverse", this);
            } catch (NullPointerException e) {
-                Logging.warning("Buscript failed to load! The script command will be disabled!");
+                Logging.warning("Buscript failed to load! The script command will be disabled! " +
+                        "If you would like not to see this message, " +
+                        "use `/mv conf enablebuscript false` to disable Buscript from loading.");
            }
        }
    }
@@ -705,6 +749,51 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.messaging;
    }

+    /**
+     * Register Multiverse-Core commands to Command Manager.
+     */
+    private void registerCommands() {
+        // Intro Commands
+        this.commandHandler.registerCommand(new HelpCommand(this));
+        this.commandHandler.registerCommand(new VersionCommand(this));
+        this.commandHandler.registerCommand(new ListCommand(this));
+        this.commandHandler.registerCommand(new InfoCommand(this));
+        this.commandHandler.registerCommand(new CreateCommand(this));
+        this.commandHandler.registerCommand(new CloneCommand(this));
+        this.commandHandler.registerCommand(new ImportCommand(this));
+        this.commandHandler.registerCommand(new ReloadCommand(this));
+        this.commandHandler.registerCommand(new SetSpawnCommand(this));
+        this.commandHandler.registerCommand(new CoordCommand(this));
+        this.commandHandler.registerCommand(new TeleportCommand(this));
+        this.commandHandler.registerCommand(new WhoCommand(this));
+        this.commandHandler.registerCommand(new SpawnCommand(this));
+        // Dangerous Commands
+        this.commandHandler.registerCommand(new UnloadCommand(this));
+        this.commandHandler.registerCommand(new LoadCommand(this));
+        this.commandHandler.registerCommand(new RemoveCommand(this));
+        this.commandHandler.registerCommand(new DeleteCommand(this));
+        this.commandHandler.registerCommand(new RegenCommand(this));
+        this.commandHandler.registerCommand(new ConfirmCommand(this));
+        // Modification commands
+        this.commandHandler.registerCommand(new ModifyCommand(this));
+        this.commandHandler.registerCommand(new PurgeCommand(this));
+        this.commandHandler.registerCommand(new ModifyAddCommand(this));
+        this.commandHandler.registerCommand(new ModifySetCommand(this));
+        this.commandHandler.registerCommand(new ModifyRemoveCommand(this));
+        this.commandHandler.registerCommand(new ModifyClearCommand(this));
+        this.commandHandler.registerCommand(new ConfigCommand(this));
+        this.commandHandler.registerCommand(new AnchorCommand(this));
+        // Misc Commands
+        this.commandHandler.registerCommand(new EnvironmentCommand(this));
+        this.commandHandler.registerCommand(new DebugCommand(this));
+        this.commandHandler.registerCommand(new SilentCommand(this));
+        this.commandHandler.registerCommand(new GeneratorCommand(this));
+        this.commandHandler.registerCommand(new CheckCommand(this));
+        this.commandHandler.registerCommand(new ScriptCommand(this));
+        this.commandHandler.registerCommand(new GameruleCommand(this));
+        this.commandHandler.registerCommand(new GamerulesCommand(this));
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -735,6 +824,30 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.ph;
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) {
+        if (!this.isEnabled()) {
+            sender.sendMessage("This plugin is Disabled!");
+            return true;
+        }
+        ArrayList<String> allArgs = new ArrayList<String>(Arrays.asList(args));
+        allArgs.add(0, command.getName());
+        try {
+            return this.commandHandler.locateAndRunCommand(sender, allArgs, getMVConfig().getDisplayPermErrors());
+        } catch (Exception e) {
+            e.printStackTrace();
+            sender.sendMessage(ChatColor.RED + "An internal error occurred when attempting to perform this command.");
+            if (sender.isOp())
+                sender.sendMessage(ChatColor.RED + "Details were printed to the server console and logs, please add that to your bug report.");
+            else
+                sender.sendMessage(ChatColor.RED + "Try again and contact the server owner or an admin if this problem persists.");
+            return true;
+        }
+    }
+
    /**
     * {@inheritDoc}
     *
@@ -805,8 +918,17 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     * {@inheritDoc}
     */
    @Override
-    public MVCommandManager getCommandManager() {
-        return this.commandManager;
+    public CommandHandler getCommandHandler() {
+        return this.commandHandler;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @Deprecated
+    public CommandQueueManager getCommandQueueManager() {
+        return commandQueueManager;
    }

    /**
@@ -1009,12 +1131,22 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

    /**
     * {@inheritDoc}
-     * @deprecated This is deprecated!
+     * @deprecated This is deprecated! Do not use!
     */
    @Override
    @Deprecated
    public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed) {
-        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed);
+        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed, false);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @deprecated This is deprecated! Do not use!
+     */
+    @Override
+    @Deprecated
+    public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed, Boolean keepGameRules) {
+        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed, keepGameRules);
    }

    /**
@@ -96,7 +96,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        enforceaccess = false;
        useasyncchat = true;
-        prefixchat = true;
+        prefixchat = false;
        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
@@ -8,7 +8,7 @@
 package com.onarandombox.MultiverseCore.api;

 import buscript.Buscript;
-import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
+import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
@@ -80,12 +80,21 @@ public interface Core {
    MVPermissions getMVPerms();

    /**
-     * Multiverse uses {@link MVCommandManager} to make adding and using commands
+     * Multiverse uses {@link CommandHandler} to make adding and using commands
     * a piece of cake.
     *
-     * @return A non-null {@link MVCommandManager}.
+     * @return A non-null {@link CommandHandler}.
     */
-    MVCommandManager getCommandManager();
+    CommandHandler getCommandHandler();
+
+    /**
+     * Manager for command that requires /mv confirm before execution.
+     *
+     * @return A non-null {@link CommandQueueManager}.
+     * @deprecated To be moved to new command manager in 5.0.0
+     */
+    @Deprecated
+    CommandQueueManager getCommandQueueManager();

    /**
     * Gets the factory class responsible for loading many different destinations
@@ -117,20 +126,38 @@ public interface Core {
    AnchorManager getAnchorManager();

    /**
-     * Used by queued commands to regenerate a world on a delay.
+     * Previously used by queued commands to regenerate a world on a delay.
+     * Do not use api method for any other purpose.
     *
-     * @param name Name of the world to regenerate
-     * @param useNewSeed If a new seed should be used
-     * @param randomSeed IF the new seed should be random
-     * @param seed The seed of the world.
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
     *
     * @return True if success, false if fail.
     *
-     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String)} instead.
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
     */
    @Deprecated
    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);

+    /**
+     * Used by queued commands to regenerate a world on a delay.
+     * Do not use api method for any other purpose.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     * @param keepGameRules If GameRules should be kept on world regen.
+     *
+     * @return True if success, false if fail.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
+     */
+    @Deprecated
+    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed, Boolean keepGameRules);
+
    /**
     * Decrements the number of plugins that have specifically hooked into core.
     */
@@ -313,15 +313,28 @@ public interface MVWorldManager {
    /**
     * Regenerates a world.
     *
-     * @param name Name of the world to regenerate
-     * @param useNewSeed If a new seed should be used
-     * @param randomSeed IF the new seed should be random
-     * @param seed The seed of the world.
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
     *
     * @return True if success, false if fail.
     */
    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);

+    /**
+     * Regenerates a world.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     * @param keepGameRules If GameRules should be kept on world regen.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules);
+
    boolean isKeepingSpawnInMemory(World world);
    
    /**
@@ -96,6 +96,25 @@ public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
     */
    protected abstract void onPluginEnable();

+    /**
+     * You can register commands here.
+     * @param handler The CommandHandler.
+     */
+    protected abstract void registerCommands(CommandHandler handler);
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!this.isEnabled()) {
+            sender.sendMessage("This plugin is Disabled!");
+            return true;
+        }
+
+        ArrayList<String> allArgs = new ArrayList<String>(args.length + 1);
+        allArgs.add(command.getName());
+        allArgs.addAll(Arrays.asList(args));
+        return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
+    }
+
    @Override
    public void log(Level level, String msg) {
        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.api;
-
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-
-public interface PermissionsInterface {
-    public boolean hasPermission(CommandSender sender, String node, boolean isOpRequired);
-
-    public boolean hasAnyPermission(CommandSender sender, List<String> allPermissionStrings, boolean opRequired);
-
-    public boolean hasAllPermission(CommandSender sender, List<String> allPermissionStrings, boolean opRequired);
-}
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import java.util.List;

@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.command.CommandSender;
@@ -33,7 +33,7 @@ public class ConfirmCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        // this.plugin.getCommandHandler().confirmQueuedCommand(sender);
+        this.plugin.getCommandQueueManager().runQueuedCommand(sender);
    }

 }
@@ -5,12 +5,13 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -46,10 +46,15 @@ public class CreateCommand extends MultiverseCommand {
        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
        this.worldManager = this.plugin.getMVWorldManager();
    }
-
+	
+	private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
+    }
+	
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
+        String worldName = trimWorldName(args.get(0));
        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
        String env = args.get(1);
        String seed = CommandHandler.getFlag("-s", args);
@@ -66,7 +71,13 @@ public class CreateCommand extends MultiverseCommand {
                useSpawnAdjust = false;
            }
        }
-
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}
+		
        if (this.worldManager.isMVWorld(worldName)) {
            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
@@ -117,4 +128,4 @@ public class CreateCommand extends MultiverseCommand {
            Command.broadcastCommandMessage(sender, "FAILED.");
        }
    }
-}
+}
@@ -1,58 +1,67 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;

-import co.aikar.commands.CommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.messaging.CoreMessageKeys;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;

-@CommandAlias("mv")
-public class DebugCommand extends MultiverseCoreCommand {
+import java.util.List;
+import java.util.logging.Level;
+
+/**
+ * Enables debug-information.
+ */
+public class DebugCommand extends MultiverseCommand {

    public DebugCommand(MultiverseCore plugin) {
        super(plugin);
+        this.setName("Turn Debug on/off?");
+        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
+        this.setArgRange(0, 1);
+        this.addKey("mv debug");
+        this.addKey("mv d");
+        this.addKey("mvdebug");
+        this.addCommandExample("/mv debug " + ChatColor.GOLD + "2");
+        this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP);
    }

-    @Subcommand("debug")
-    @CommandPermission("multiverse.core.debug")
-    @Description("{@@mv-core.debug_info_description}")
-    public void onShowDebugCommand(@NotNull CommandIssuer issuer) {
-        this.displayDebugMode(issuer);
-    }
-
-    @Subcommand("debug")
-    @CommandPermission("multiverse.core.debug")
-    @Syntax("<{@@mv-core.debug_change_syntax}>")
-    @CommandCompletion("@range:3")
-    @Description("{@@mv-core.debug_change_description}")
-    public void onChangeDebugCommand(@NotNull CommandIssuer issuer,
-
-                                     @Conditions("debuglevel")
-                                     @Syntax("<{@@mv-core.debug_change_syntax}>")
-                                     @Description("{@@mv-core.debug_change_level_description}")
-                                     int level) {
-
-        this.plugin.getMVConfig().setGlobalDebug(level);
-        this.saveMVConfigs(issuer);
-        this.displayDebugMode(issuer);
-    }
-
-    private void displayDebugMode(@NotNull CommandIssuer issuer) {
-        final int debugLevel = this.plugin.getMVConfig().getGlobalDebug();
-        if (debugLevel == 0) {
-            issuer.sendInfo(CoreMessageKeys.DEBUG_INFO_OFF);
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("off")) {
+                plugin.getMVConfig().setGlobalDebug(0);
+            } else {
+                try {
+                    int debugLevel = Integer.parseInt(args.get(0));
+                    if (debugLevel > 3 || debugLevel < 0) {
+                        throw new NumberFormatException();
+                    }
+                    plugin.getMVConfig().setGlobalDebug(debugLevel);
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
+                            + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
+                }
+            }
+            plugin.saveMVConfigs();
+        }
+        this.displayDebugMode(sender);
+    }
+
+    private void displayDebugMode(CommandSender sender) {
+        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
+        if (debugLevel == 0) {
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
+        } else {
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
+            Logging.fine("Multiverse Debug ENABLED");
        }
-        issuer.sendInfo(CoreMessageKeys.DEBUG_INFO_ON, "{level}", String.valueOf(debugLevel));
-        Logging.fine("Multiverse Debug ENABLED.");
    }
 }
@@ -5,12 +5,14 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
 import java.util.List;
@@ -35,11 +37,24 @@ public class DeleteCommand extends MultiverseCommand {
    public void runCommand(CommandSender sender, List<String> args) {
        String worldName = args.get(0);

-        Class<?>[] paramTypes = {String.class};
-        List<Object> objectArgs = new ArrayList<Object>(args);
-//        this.plugin.getCommandHandler()
-//                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
-//                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
-//                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                deleteRunnable(sender, worldName),
+                String.format("Are you sure you want to delete world '%s'? You cannot undo this action.", worldName)
+        ));
+    }
+
+    private Runnable deleteRunnable(@NotNull CommandSender sender,
+                                    @NotNull String worldName) {
+
+        return () -> {
+            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
+            if (this.plugin.getMVWorldManager().deleteWorld(worldName)) {
+                sender.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
+                return;
+            }
+            sender.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.",
+                    ChatColor.RED, worldName));
+        };
    }
 }
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.pneumaticraft.commandhandler.Command;
@@ -74,7 +74,7 @@ public class HelpCommand extends PaginatedCoreCommand<Command> {

        FilterObject filterObject = this.getPageAndFilter(args);

-        List<Command> availableCommands = new ArrayList<Command>(); // this.plugin.getCommandHandler().getCommands(sender));
+        List<Command> availableCommands = new ArrayList<Command>(this.plugin.getCommandHandler().getCommands(sender));
        if (filterObject.getFilter().length() > 0) {
            availableCommands = this.getFilteredItems(availableCommands, filterObject.getFilter());
            if (availableCommands.size() == 0) {
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -81,6 +81,12 @@ public class ImportCommand extends MultiverseCommand {
            this.showHelp(sender);
            return;
        }
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}

        // Make sure we don't already know about this world.
        if (this.worldManager.isMVWorld(worldName)) {
@@ -128,4 +134,4 @@ public class ImportCommand extends MultiverseCommand {
                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
        }
    }
-}
+}
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.FancyText;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.enums.Action;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
@@ -1,26 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.CommandIssuer;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
-import com.onarandombox.MultiverseCore.messaging.CoreMessageKeys;
-
-/**
- * Generic multiverse core command with handy reference to the plugin instance.
- */
-public abstract class MultiverseCoreCommand extends MultiverseCommand {
-
-    protected final MultiverseCore plugin;
-
-    protected MultiverseCoreCommand(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    protected boolean saveMVConfigs(CommandIssuer issuer) {
-        if (this.plugin.saveMVConfigs()) {
-            return true;
-        }
-        issuer.sendError(CoreMessageKeys.CONFIG_SAVE_FAILED);
-        return false;
-    }
-}
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.pneumaticraft.commandhandler.Command;
 import org.bukkit.command.CommandSender;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;

@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -5,14 +5,16 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

-import java.util.ArrayList;
 import java.util.List;

 /**
@@ -23,8 +25,8 @@ public class RegenCommand extends MultiverseCommand {
    public RegenCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Regenerates a World");
-        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]]");
-        this.setArgRange(1, 3);
+        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]] [--keep-gamerules]");
+        this.setArgRange(1, 4);
        this.addKey("mvregen");
        this.addKey("mv regen");
        this.addCommandExample("You can use the -s with no args to get a new seed:");
@@ -37,17 +39,31 @@ public class RegenCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        Boolean useseed = (!(args.size() == 1));
-        Boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
+        String worldName = args.get(0);
+        boolean useseed = (!(args.size() == 1));
+        boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
        String seed = (args.size() == 3) ? args.get(2) : "";
+        boolean keepGamerules = CommandHandler.hasFlag("--keep-gamerules", args);
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                doWorldRegen(sender, worldName, useseed, randomseed, seed, keepGamerules),
+                String.format("Are you sure you want to regen '%s'? You cannot undo this action.", worldName)
+        ));
+    }

-        Class<?>[] paramTypes = {String.class, Boolean.class, Boolean.class, String.class};
-        List<Object> objectArgs = new ArrayList<Object>();
-        objectArgs.add(args.get(0));
-        objectArgs.add(useseed);
-        objectArgs.add(randomseed);
-        objectArgs.add(seed);
-//        this.plugin.getCommandHandler().queueCommand(sender, "mvregen", "regenWorld", objectArgs,
-//                paramTypes, ChatColor.GREEN + "World Regenerated!", ChatColor.RED + "World could NOT be regenerated!");
+    private Runnable doWorldRegen(@NotNull CommandSender sender,
+                                  @NotNull String worldName,
+                                  boolean useSeed,
+                                  boolean randomSeed,
+                                  @NotNull String seed,
+                                  boolean keepGamerules) {
+
+        return () -> {
+            if (this.plugin.getMVWorldManager().regenWorld(worldName, useSeed, randomSeed, seed, keepGamerules)) {
+                sender.sendMessage(ChatColor.GREEN + "World Regenerated!");
+                return;
+            }
+            sender.sendMessage(ChatColor.RED + "World could NOT be regenerated!");
+        };
    }
 }
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.command.CommandSender;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
@@ -5,12 +5,13 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
@@ -152,24 +153,27 @@ public class TeleportCommand extends MultiverseCommand {
        if (result == TeleportResult.FAIL_UNSAFE) {
            Logging.fine("Could not teleport " + teleportee.getName()
                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-            Logging.fine("Queueing Command");
-            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
-            List<Object> items = new ArrayList<Object>();
-            items.add(teleporter);
-            items.add(teleportee);
-            items.add(d.getLocation(teleportee));
+
            String player = "you";
            if (!teleportee.equals(teleporter)) {
                player = teleportee.getName();
            }
-            String message = String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe.",
-                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE);
-//            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items,
-//                    paramTypes, message, "Would you like to try anyway?", "", "", UNSAFE_TELEPORT_EXPIRE_DELAY);
+
+            this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                    sender,
+                    doUnsafeTeleport(teleporter, teleportee, d.getLocation(teleportee)),
+                    String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe. Would you like to try anyway?",
+                            ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE),
+                    UNSAFE_TELEPORT_EXPIRE_DELAY
+            ));
        }
        // else: Player was teleported successfully (or the tp event was fired I should say)
    }

+    private Runnable doUnsafeTeleport(CommandSender teleporter, Player player, Location location) {
+        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, player, location, false);
+    }
+
    private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
        if (teleporter.equals(teleportee)) {
            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -45,8 +45,11 @@ public class VersionCommand extends MultiverseCommand {
        this.addKey("mvver");
        this.addKey("mvv");
        this.addKey("mvversion");
-        this.setPermission("multiverse.core.version",
-                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.", PermissionDefault.TRUE);
+        this.setPermission(
+                "multiverse.core.version",
+                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.",
+                PermissionDefault.OP)
+        ;
    }

    private String getLegacyString() {
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.commands_old;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -0,0 +1,4 @@
+/**
+ * This package contains all Commands.
+ */
+package com.onarandombox.MultiverseCore.commands;
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands_old;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Enables debug-information.
- */
-public class DebugCommand extends MultiverseCommand {
-
-    public DebugCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Turn Debug on/off?");
-        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
-        this.setArgRange(0, 1);
-        this.addKey("mv debug");
-        this.addKey("mv d");
-        this.addKey("mvdebug");
-        this.addCommandExample("/mv debug " + ChatColor.GOLD + "2");
-        this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (args.size() == 1) {
-            if (args.get(0).equalsIgnoreCase("off")) {
-                plugin.getMVConfig().setGlobalDebug(0);
-            } else {
-                try {
-                    int debugLevel = Integer.parseInt(args.get(0));
-                    if (debugLevel > 3 || debugLevel < 0) {
-                        throw new NumberFormatException();
-                    }
-                    plugin.getMVConfig().setGlobalDebug(debugLevel);
-                } catch (NumberFormatException e) {
-                    sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
-                            + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
-                }
-            }
-            plugin.saveMVConfigs();
-        }
-        this.displayDebugMode(sender);
-    }
-
-    private void displayDebugMode(CommandSender sender) {
-        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
-        if (debugLevel == 0) {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
-        } else {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
-            Logging.fine("Multiverse Debug ENABLED");
-        }
-    }
-}
@@ -1,4 +0,0 @@
-/**
- * This package contains all Commands.
- */
-package com.onarandombox.MultiverseCore.commands_old;
@@ -1,104 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BaseCommand;
-import co.aikar.commands.BukkitCommandCompletionContext;
-import co.aikar.commands.BukkitCommandExecutionContext;
-import co.aikar.commands.CommandCompletions;
-import co.aikar.commands.CommandContexts;
-import co.aikar.commands.PaperCommandManager;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commands.DebugCommand;
-
-import java.util.Locale;
-
-/**
- * Main class to manage permissions.
- */
-public class MVCommandManager extends PaperCommandManager {
-
-    private final MultiverseCore plugin;
-
-    public MVCommandManager(MultiverseCore plugin) {
-        super(plugin);
-        this.plugin = plugin;
-
-        // Setup locale
-        this.addSupportedLanguage(Locale.ENGLISH);
-        this.locales.addMessageBundles("multiverse-core");
-        this.locales.loadLanguages();
-
-        // Register commands
-        this.registerCommand(new DebugCommand(plugin));
-    }
-
-    /**
-     * Gets class responsible for parsing string args into objects.
-     *
-     * @return A not-null {@link CommandContexts}.
-     */
-    @Override
-    public synchronized CommandContexts<BukkitCommandExecutionContext> getCommandContexts() {
-        if (this.contexts == null) {
-            this.contexts = new MVCommandParser(this);
-        }
-        return this.contexts;
-    }
-
-    /**
-     * Gets class responsible for tab-completion handling.
-     *
-     * @return A not-null {@link CommandCompletions}.
-     */
-    @Override
-    public synchronized CommandCompletions<BukkitCommandCompletionContext> getCommandCompletions() {
-        if (this.completions == null) {
-            this.completions = new MVCommandSuggestion(this);
-        }
-        return this.completions;
-    }
-
-    /**
-     * Registers an {@link MultiverseCommand}.
-     *
-     * @param command   Command to register. This need to extend {@link MultiverseCommand}.
-     * @param force     Specify of command should be forcefully registered.
-     */
-    @Override
-    public void registerCommand(BaseCommand command, boolean force) {
-        ensureIsMultiverseCommand(command);
-        super.registerCommand(command, force);
-    }
-
-    /**
-     * Registers an {@link MultiverseCommand} without force.
-     *
-     * @param command   Command to register. This need to extend {@link MultiverseCommand}.
-     */
-    @Override
-    public void registerCommand(BaseCommand command) {
-        ensureIsMultiverseCommand(command);
-        super.registerCommand(command);
-    }
-
-    /**
-     * Unregister a command from Multiverse's knowledge.
-     *
-     * @param command   Command to unregister. This need to extend {@link MultiverseCommand}.
-     */
-    @Override
-    public void unregisterCommand(BaseCommand command) {
-        ensureIsMultiverseCommand(command);
-        super.unregisterCommand(command);
-    }
-
-    /**
-     * Validate that the {@link BaseCommand} is an extension of {@link MultiverseCommand}.
-     *
-     * @param command   The command to check on.
-     */
-    private void ensureIsMultiverseCommand(BaseCommand command) {
-        if (!(command instanceof MultiverseCommand)) {
-            throw new IllegalArgumentException(command.getName() + " is not a MultiverseCommand!");
-        }
-    }
-}
@@ -1,34 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BukkitCommandExecutionContext;
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.ConditionContext;
-import co.aikar.commands.ConditionFailedException;
-import co.aikar.commands.PaperCommandContexts;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Class to parse command arguments into its object and validate them.
- */
-public class MVCommandParser extends PaperCommandContexts {
-
-    public MVCommandParser(MVCommandManager manager) {
-        super(manager);
-
-        // Contexts
-
-        // Conditions
-        manager.getCommandConditions().addCondition(int.class, "debuglevel", this::checkDebugLevel);
-    }
-
-    private void checkDebugLevel(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                 @NotNull BukkitCommandExecutionContext executionContext,
-                                 int level) {
-
-        if (level < 0 || level > 3) {
-            throw new ConditionFailedException("Invalid debug mode level. Please use a number 0-3 "
-                + ChatColor.AQUA + "(3 being many many messages!)");
-        }
-    }
-}
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.PaperCommandCompletions;
-
-/**
- * Class to handle tab-complete suggestions.
- */
-public class MVCommandSuggestion extends PaperCommandCompletions {
-
-    public MVCommandSuggestion(MVCommandManager manager) {
-        super(manager);
-    }
-}
@@ -1,10 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BaseCommand;
-
-/**
- * Class that all Multiverse commands extends from.
- */
-public abstract class MultiverseCommand extends BaseCommand {
-    public MultiverseCommand() { }
-}
@@ -0,0 +1,161 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.block.data.type.CommandBlock;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+/**
+ * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
+ *
+ * <p>Each sender can only have one command in queue at any given time. When a queued command is added
+ * for a sender that already has a command in queue, it will replace the old queued command.</p>
+ */
+public class CommandQueueManager {
+
+    private static final long TICKS_PER_SECOND = 20;
+    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
+
+    private final MultiverseCore plugin;
+    private final Map<CommandSender, QueuedCommand> queuedCommandMap;
+
+    public CommandQueueManager(@NotNull MultiverseCore plugin) {
+        this.plugin = plugin;
+        this.queuedCommandMap = new WeakHashMap<>();
+    }
+
+    /**
+     * Adds a {@link QueuedCommand} into queue.
+     *
+     * @param queuedCommand The queued command to add.
+     */
+    public void addToQueue(QueuedCommand queuedCommand) {
+        CommandSender targetSender = parseSender(queuedCommand.getSender());
+
+        // Since only one command is stored in queue per sender, we remove the old one.
+        this.removeFromQueue(targetSender);
+
+        Logging.finer("Add new command to queue for sender %s.", targetSender);
+        this.queuedCommandMap.put(targetSender, queuedCommand);
+        queuedCommand.setExpireTask(runExpireLater(queuedCommand));
+
+        queuedCommand.getSender().sendMessage(queuedCommand.getPrompt());
+        queuedCommand.getSender().sendMessage(String.format("Run %s/mv confirm %sto continue. This will expire in %s seconds.",
+                ChatColor.GREEN, ChatColor.WHITE, queuedCommand.getValidDuration()));
+    }
+
+    /**
+     * Expire task that removes a {@link QueuedCommand} from queue after valid duration defined.
+     *
+     * @param queuedCommand Command to run the expire task on.
+     * @return The expire {@link BukkitTask}.
+     */
+    @NotNull
+    private BukkitTask runExpireLater(@NotNull QueuedCommand queuedCommand) {
+        return Bukkit.getScheduler().runTaskLater(
+                this.plugin,
+                expireRunnable(queuedCommand),
+                queuedCommand.getValidDuration() * TICKS_PER_SECOND
+        );
+    }
+
+    /**
+     * Runnable responsible for expiring the queued command.
+     *
+     * @param queuedCommand Command to create the expire task on.
+     * @return The expire runnable.
+     */
+    @NotNull
+    private Runnable expireRunnable(@NotNull QueuedCommand queuedCommand) {
+        return () -> {
+            CommandSender targetSender = parseSender(queuedCommand.getSender());
+            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(targetSender);
+            if (!queuedCommand.equals(matchingQueuedCommand) || queuedCommand.getExpireTask().isCancelled()) {
+                // To be safe, but this shouldn't happen since we cancel old commands before add new once.
+                Logging.finer("This is an old queue command already.");
+                return;
+            }
+            queuedCommand.getSender().sendMessage("Your queued command has expired.");
+            this.queuedCommandMap.remove(queuedCommand.getSender());
+        };
+    }
+
+    /**
+     * Runs the command in queue for the given sender, if any.
+     *
+     * @param sender    {@link CommandSender} that confirmed the command.
+     * @return True if queued command ran successfully, else false.
+     */
+    public boolean runQueuedCommand(@NotNull CommandSender sender) {
+        CommandSender targetSender = parseSender(sender);
+        QueuedCommand queuedCommand = this.queuedCommandMap.get(targetSender);
+        if (queuedCommand == null) {
+            sender.sendMessage(ChatColor.RED + "You do not have any commands in queue.");
+            return false;
+        }
+        Logging.finer("Running queued command...");
+        queuedCommand.getAction().run();
+        return removeFromQueue(targetSender);
+    }
+
+    /**
+     * Since only one command is stored in queue per sender, we remove the old one.
+     *
+     * @param sender    The {@link CommandSender} that executed the command.
+     * @return True if queue command is removed from sender successfully, else false.
+     */
+    public boolean removeFromQueue(@NotNull CommandSender sender) {
+        CommandSender targetSender = parseSender(sender);
+        QueuedCommand previousCommand = this.queuedCommandMap.remove(targetSender);
+        if (previousCommand == null) {
+            Logging.finer("No queue command to remove for sender %s.", targetSender.getName());
+            return false;
+        }
+        previousCommand.getExpireTask().cancel();
+        Logging.finer("Removed queue command for sender %s.", targetSender.getName());
+        return true;
+    }
+
+    /**
+     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
+     * So confirm command can be used for a queued command on another command block.
+     *
+     * @param sender    The sender to parse.
+     * @return The sender, or if its a command block, a {@link DummyCommandBlockSender}.
+     */
+    @NotNull
+    private CommandSender parseSender(@NotNull CommandSender sender) {
+        Logging.fine(sender.getClass().getName());
+        if (isCommandBlock(sender)) {
+            Logging.finer("Is command block.");
+            return COMMAND_BLOCK;
+        }
+        return sender;
+    }
+
+    /**
+     * Checks if the sender is a command block.
+     *
+     * @param sender    The sender to check.
+     * @return True if sender is a command block, else false.
+     */
+    private boolean isCommandBlock(@NotNull CommandSender sender) {
+        return sender instanceof BlockCommandSender
+                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
+    }
+}
@@ -0,0 +1,104 @@
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+/**
+ * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
+ */
+class DummyCommandBlockSender implements CommandSender {
+
+    @Override
+    public void sendMessage(@NotNull String message) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void sendMessage(@NotNull String[] messages) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Server getServer() {
+        return Bukkit.getServer();
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return "DummyCommandBlockSender";
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void removeAttachment(@NotNull PermissionAttachment attachment) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void recalculatePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Set<PermissionAttachmentInfo> getEffectivePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isOp() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setOp(boolean value) {
+        throw new UnsupportedOperationException();
+    }
+}
@@ -0,0 +1,86 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
+ * dangerous action.
+ */
+public class QueuedCommand {
+
+    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
+    private static final int DEFAULT_VALID_TIME = 10;
+
+    private final CommandSender sender;
+    private final Runnable action;
+    private final String prompt;
+    private final int validDuration;
+    private BukkitTask expireTask;
+
+    public QueuedCommand(CommandSender sender, Runnable action) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
+        this(sender, action, prompt, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
+    }
+
+    /**
+     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
+     *
+     * @param sender        The sender that ran the command needed for confirmation.
+     * @param action        The logic to execute upon confirming.
+     * @param prompt        Question to ask sender to confirm.
+     * @param validDuration Duration in which the command is valid for confirm in seconds.
+     */
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
+        this.sender = sender;
+        this.action = action;
+        this.prompt = prompt;
+        this.validDuration = validDuration;
+    }
+
+    @NotNull
+    CommandSender getSender() {
+        return sender;
+    }
+
+    @NotNull
+    String getPrompt() {
+        return prompt;
+    }
+
+    int getValidDuration() {
+        return validDuration;
+    }
+
+    @NotNull
+    Runnable getAction() {
+        return action;
+    }
+
+    @NotNull
+    BukkitTask getExpireTask() {
+        return expireTask;
+    }
+
+    void setExpireTask(@NotNull BukkitTask expireTask) {
+        if (this.expireTask != null) {
+            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
+        }
+        this.expireTask = expireTask;
+    }
+}
@@ -0,0 +1,4 @@
+/**
+ * Manager queuing of dangerous commands in need of confirmation.
+ */
+package com.onarandombox.MultiverseCore.commandtools.queue;
@@ -7,39 +7,46 @@

 package com.onarandombox.MultiverseCore.destination;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.commands.TeleportCommand;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
 import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import com.pneumaticraft.commandhandler.Command;
 import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;

-/** A factory class that will create destinations from specific strings. */
+/**
+ * A factory class that will create destinations from specific strings.
+ */
 public class DestinationFactory {

    private static final Pattern CANNON_PATTERN = Pattern.compile("(?i)cannon-[\\d]+(\\.[\\d]+)?");

-    private final MultiverseCore plugin;
-    private final Map<String, Class<? extends MVDestination>> destList;
-    private final Set<String> destPermissions;
-    private final PermissionTools permTools;
+    private MultiverseCore plugin;
+    private Map<String, Class<? extends MVDestination>> destList;
+    private Command teleportCommand;

    public DestinationFactory(MultiverseCore plugin) {
        this.plugin = plugin;
        this.destList = new HashMap<String, Class<? extends MVDestination>>();
-        this.destPermissions = new HashSet<>();
-        this.permTools = new PermissionTools(plugin);
+        List<Command> cmds = this.plugin.getCommandHandler().getAllCommands();
+        for (Command c : cmds) {
+            if (c instanceof TeleportCommand) {
+                this.teleportCommand = c;
+            }
+        }
    }

    /**
@@ -141,40 +148,32 @@ public class DestinationFactory {
        if (identifier.equals("")) {
            identifier = "w";
        }
-        addDestPerm("multiverse.teleport.self." + identifier,
-                "Permission to teleport yourself for the " + identifier + " destination.");
-        addDestPerm("multiverse.teleport.other." + identifier,
-                "Permission to teleport other for the " + identifier + " destination.");
+        Permission self = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.self." + identifier);
+        Permission other = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.other." + identifier);
+        PermissionTools pt = new PermissionTools(this.plugin);
+        if (self == null) {
+            self = new Permission("multiverse.teleport.self." + identifier,
+                    "Permission to teleport yourself for the " + identifier + " destination.", PermissionDefault.OP);
+            this.plugin.getServer().getPluginManager().addPermission(self);
+            pt.addToParentPerms("multiverse.teleport.self." + identifier);
+        }
+        if (other == null) {
+            other = new Permission("multiverse.teleport.other." + identifier,
+                    "Permission to teleport others for the " + identifier + " destination.", PermissionDefault.OP);
+            this.plugin.getServer().getPluginManager().addPermission(other);
+            pt.addToParentPerms("multiverse.teleport.other." + identifier);
+        }
+        this.teleportCommand.addAdditonalPermission(self);
+        this.teleportCommand.addAdditonalPermission(other);
        return true;
    }

    /**
-     * Registers a single destination permission.
+     * Gets all the {@link MVDestination} identifiers registered.
     *
-     * @param permNode      Permission node to register.
-     * @param description   Info on what the permission node is used for.
+     * @return A collection of destination identifiers.
     */
-    private void addDestPerm(String permNode, String description) {
-        if (this.plugin.getServer().getPluginManager().getPermission(permNode) != null) {
-            Logging.fine("Destination permission node " + permNode + " already added.");
-            return;
-        }
-        Permission perm = new Permission(permNode, description, PermissionDefault.OP);
-        this.plugin.getServer().getPluginManager().addPermission(perm);
-        this.permTools.addToParentPerms(permNode);
-        this.destPermissions.add(permNode);
-    }
-    
    public Collection<String> getRegisteredIdentifiers() {
        return this.destList.keySet();
    }
-
-    /**
-     * Gets all registered permissions relating to usages of {@link MVDestination} on teleport.
-     *
-     * @return A set of permission nodes.
-     */
-    public Set<String> getDestPermissions() {
-        return destPermissions;
-    }
 }
@@ -11,6 +11,7 @@ import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import org.bukkit.World;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -18,6 +19,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.entity.EntityPortalEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
@@ -107,4 +109,17 @@ public class MVEntityListener implements Listener {
        event.setCancelled(this.plugin.getMVWorldManager().getTheWorldPurger().shouldWeKillThisCreature(mvworld, event.getEntity()));
    }

+    /**
+     * Handles portal search radius adjustment.
+     * @param event The Event that was fired.
+     */
+    @EventHandler
+    public void entityPortal(EntityPortalEvent event) {
+        if (event.isCancelled() || event.getTo() == null) {
+            return;
+        }
+        if (!this.plugin.getMVConfig().isUsingDefaultPortalSearch()) {
+            CompatibilityLayer.setPortalSearchRadius(event, this.plugin.getMVConfig().getPortalSearchRadius());
+        }
+    }
 }
@@ -7,10 +7,6 @@

 package com.onarandombox.MultiverseCore.listeners;

-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -35,6 +31,9 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;

+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
 * Multiverse's {@link Listener} for players.
 */
@@ -313,16 +312,8 @@ public class MVPlayerListener implements Listener {
                    + "' was allowed to go to '" + event.getTo().getWorld().getName()
                    + "' because enforceaccess is off.");
        }
-        if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
-            try {
-                Class.forName("org.bukkit.TravelAgent");
-                if (event.getPortalTravelAgent() != null) {
-                    event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
-                }
-            } catch (ClassNotFoundException ignore) {
-                Logging.fine("TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
-            }
-
+        if (!this.plugin.getMVConfig().isUsingDefaultPortalSearch()) {
+            CompatibilityLayer.setPortalSearchRadius(event, this.plugin.getMVConfig().getPortalSearchRadius());
        }
    }

@@ -1,20 +0,0 @@
-package com.onarandombox.MultiverseCore.messaging;
-
-import co.aikar.locales.MessageKey;
-import co.aikar.locales.MessageKeyProvider;
-
-import java.util.Locale;
-
-public enum CoreMessageKeys implements MessageKeyProvider {
-
-    CONFIG_SAVE_FAILED,
-    DEBUG_INFO_OFF,
-    DEBUG_INFO_ON;
-
-    private final MessageKey key = MessageKey.of("mv-core." + this.name().toLowerCase(Locale.ENGLISH));
-
-    @Override
-    public MessageKey getMessageKey() {
-        return this.key;
-    }
-}
@@ -1,32 +1,35 @@
 package com.onarandombox.MultiverseCore.utils;

 import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Bukkit;
+import org.bukkit.event.entity.EntityPortalEvent;
+import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;

 import java.lang.reflect.Method;

 /**
- * A utility class to enable version specific minecraft features.
+ * Utility class to enable version specific minecraft features.
 */
 public class CompatibilityLayer {

    private static Method checkAnchorSpawn;
+    private static boolean useTravelAgent;
+    private static Method playerPortalSearchRadius;
+    private static Method entityPortalSearchRadius;

    /**
-     * Initialise the reflection methods.
+     * Initialise the reflection class, methods and fields.
     */
    public static void init() {
-        try {
-            checkAnchorSpawn = PlayerRespawnEvent.class.getDeclaredMethod("isAnchorSpawn");
-        } catch (NoSuchMethodException e) {
-            Logging.fine("%s does not support respawn anchors.", Bukkit.getVersion());
-        }
+        checkAnchorSpawn = ReflectHelper.getMethod(PlayerRespawnEvent.class, "isAnchorSpawn");
+        useTravelAgent = ReflectHelper.hasClass("org.bukkit.TravelAgent");
+        playerPortalSearchRadius = ReflectHelper.getMethod(PlayerPortalEvent.class, "setSearchRadius", int.class);
+        entityPortalSearchRadius = ReflectHelper.getMethod(EntityPortalEvent.class, "setSearchRadius", int.class);
    }

    /**
-     * Check if the respawn point is of respawn anchor type.
-     * Introduced in minecraft 1.16
+     * <p>Check if the respawn point is of respawn anchor type.</p>
+     * <p>Introduced in minecraft 1.16</p>
     *
     * @param event A player respawn event.
     * @return If the respawn location is an anchor point.
@@ -35,12 +38,69 @@ public class CompatibilityLayer {
        if (checkAnchorSpawn == null) {
            return false;
        }
-        try {
-            return (boolean) checkAnchorSpawn.invoke(event);
-        } catch (Exception e) {
-            Logging.warning("Error checking for: %s", checkAnchorSpawn);
-            e.printStackTrace();
+        Boolean result = ReflectHelper.invokeMethod(event, checkAnchorSpawn);
+        if (result == null) {
+            Logging.warning("Unable to check if spawning at respawn anchor!");
+            return false;
        }
-        return false;
+        return result;
    }
-}
+
+    /**
+     * <p>Gets if Travel Agent is supported on the server's minecraft version.</p>
+     * <p>Removed in minecraft 1.14</p>
+     *
+     * @return True if Travel Agent is supported, else false.
+     */
+    public static boolean isUseTravelAgent() {
+        return useTravelAgent;
+    }
+
+    /**
+     * <p>Sets search radius for a PlayerPortalEvent.</p>
+     *
+     * <p>Use travel agent if available, else using new PlayerPortalEvent.setSearchRadius(int) method
+     * introduced in minecraft 1.15</p>
+     *
+     * @param event         A Player Portal Event.
+     * @param searchRadius  Target search radius to set to.
+     */
+    public static void setPortalSearchRadius(PlayerPortalEvent event, int searchRadius) {
+        if (useTravelAgent) {
+            event.getPortalTravelAgent().setSearchRadius(searchRadius);
+            event.useTravelAgent(true);
+            Logging.finer("Used travel agent to set player portal search radius.");
+            return;
+        }
+        if (playerPortalSearchRadius == null) {
+            Logging.warning("Unable to set player portal search radius!");
+            return;
+        }
+        ReflectHelper.invokeMethod(event, playerPortalSearchRadius, searchRadius);
+        Logging.finer("Used new method to set player portal search radius.");
+    }
+
+    /**
+     * <p>Sets search radius for a EntityPortalEvent.</p>
+     *
+     * <p>Use travel agent if available, else using new EntityPortalEvent.setSearchRadius(int) method
+     * introduced in minecraft 1.15</p>
+     *
+     * @param event         A Entity Portal Event.
+     * @param searchRadius  Target search radius to set to.
+     */
+    public static void setPortalSearchRadius(EntityPortalEvent event, int searchRadius) {
+        if (useTravelAgent) {
+            event.getPortalTravelAgent().setSearchRadius(searchRadius);
+            event.useTravelAgent(true);
+            Logging.finer("Used travel agent to set entity portal search radius.");
+            return;
+        }
+        if (entityPortalSearchRadius == null) {
+            Logging.warning("Unable to set entity portal search radius!");
+            return;
+        }
+        ReflectHelper.invokeMethod(event, entityPortalSearchRadius, searchRadius);
+        Logging.finer("Used new method to set entity portal search radius.");
+    }
+}
@@ -12,7 +12,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.api.PermissionsInterface;
+import com.pneumaticraft.commandhandler.PermissionsInterface;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -21,6 +21,7 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.List;
+import java.util.logging.Level;

 /**
 * Multiverse's {@link PermissionsInterface}.
@@ -135,7 +135,7 @@ public class PlayerFinder {

        List<Player> matchedPlayers = getMultiBySelector(playerSelector, sender);
        if (matchedPlayers == null || matchedPlayers.isEmpty()) {
-            Logging.warning("No player found with selector '%s' for %s.", playerSelector, sender.getName());
+            Logging.fine("No player found with selector '%s' for %s.", playerSelector, sender.getName());
            return null;
        }
        if (matchedPlayers.size() > 1) {
@@ -18,6 +18,7 @@ import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
 import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent;
 import org.bukkit.Bukkit;
+import org.bukkit.GameRule;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
@@ -55,7 +56,6 @@ import java.util.stream.Collectors;
 */
 public class WorldManager implements MVWorldManager {
    private final MultiverseCore plugin;
-    private final Pattern worldNamePattern = Pattern.compile("[a-zA-Z0-9/._-]+");
    private final WorldPurger worldPurger;
    private final Map<String, MultiverseWorld> worlds;
    private Map<String, WorldProperties> worldsFromTheConfig;
@@ -130,7 +130,7 @@ public class WorldManager implements MVWorldManager {
        }

        // Check for valid world name
-        if (!(WorldNameChecker.isValidWorldName(oldName) && WorldNameChecker.isValidWorldName(oldName))) {
+        if (!(WorldNameChecker.isValidWorldName(oldName) && WorldNameChecker.isValidWorldName(newName))) {
            return false;
        }

@@ -387,14 +387,14 @@ public class WorldManager implements MVWorldManager {
            this.worldsFromTheConfig.get(name).cacheVirtualProperties();
            if (unloadBukkit && this.unloadWorldFromBukkit(name, true)) {
                this.worlds.remove(name);
-                Logging.info("World '%s' was unloaded from memory.", name);
+                Logging.info("World '%s' was unloaded from Bukkit.", name);
                return true;
            } else if (!unloadBukkit){
                this.worlds.remove(name);
-                Logging.info("World '%s' was unloaded from memory.", name);
+                Logging.info("World '%s' was unloaded from Multiverse.", name);
                return true;
            } else {
-                Logging.warning("World '%s' could not be unloaded. Is it a default world?", name);
+                Logging.warning("World '%s' could not be unloaded from Bukkit. Is it a default world?", name);
            }
        } else if (this.plugin.getServer().getWorld(name) != null) {
            Logging.warning("Hmm Multiverse does not know about this world but it's loaded in memory.");
@@ -897,12 +897,23 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed) {
+        return regenWorld(name, useNewSeed, randomSeed, seed, false);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules) {
        MultiverseWorld world = this.getMVWorld(name);
-        if (world == null)
+        if (world == null) {
+            Logging.warning("Unable to regen a world that does not exist!");
            return false;
+        }

        List<Player> ps = world.getCBWorld().getPlayers();

+        // Apply new seed if needed.
        if (useNewSeed) {
            long theSeed;

@@ -918,19 +929,64 @@ public class WorldManager implements MVWorldManager {

            world.setSeed(theSeed);
        }
+
        WorldType type = world.getWorldType();

-        if (this.deleteWorld(name, false, false)) {
-            this.doLoad(name, true, type);
-            SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-            Location newSpawn = world.getSpawnLocation();
-            // Send all players that were in the old world, BACK to it!
-            for (Player p : ps) {
-                teleporter.safelyTeleport(null, p, newSpawn, true);
+        // Save current GameRules if needed.
+        Map<GameRule<?>, Object> gameRuleMap = null;
+        if (keepGameRules) {
+            gameRuleMap = new HashMap<>(GameRule.values().length);
+            World CBWorld = world.getCBWorld();
+            for (GameRule<?> gameRule : GameRule.values()) {
+                // Only save if not default value.
+                Object value = CBWorld.getGameRuleValue(gameRule);
+                if (value != CBWorld.getGameRuleDefault(gameRule)) {
+                    gameRuleMap.put(gameRule, value);
+                }
            }
-            return true;
        }
-        return false;
+
+        // Do the regen.
+        if (!this.deleteWorld(name, false, false)) {
+            Logging.severe("Unable to regen world as world cannot be deleted.");
+            return false;
+        }
+        if (!this.doLoad(name, true, type)) {
+            Logging.severe("Unable to regen world as world cannot be loaded.");
+            return false;
+        }
+
+        // Get new MultiverseWorld reference.
+        world = this.getMVWorld(name);
+
+        // Load back GameRules if needed.
+        if (keepGameRules) {
+            Logging.fine("Restoring previous world's GameRules...");
+            World CBWorld = world.getCBWorld();
+            for (Map.Entry<GameRule<?>, Object> gameRuleEntry : gameRuleMap.entrySet()) {
+                if (!setGameRuleValue(CBWorld, gameRuleEntry.getKey(), gameRuleEntry.getValue())) {
+                    Logging.warning("Unable to set GameRule '%s' to '%s' on regen world.",
+                            gameRuleEntry.getKey().getName(), gameRuleEntry.getValue());
+                }
+            }
+        }
+
+        // Send all players that were in the old world, BACK to it!
+        SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
+        Location newSpawn = world.getSpawnLocation();
+        for (Player p : ps) {
+            teleporter.safelyTeleport(null, p, newSpawn, true);
+        }
+
+        return true;
+    }
+
+    private <T> boolean setGameRuleValue(World world, GameRule<T> gameRule, Object value) {
+        try {
+            return world.setGameRule(gameRule, (T) value);
+        } catch (Exception e) {
+            return false;
+        }
    }

    /**
@@ -1,11 +1,12 @@
 package com.onarandombox.MultiverseCore.utils.metrics;

+import org.bstats.charts.AdvancedPie;
+import org.bstats.charts.MultiLineChart;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;

-import org.bstats.bukkit.Metrics;
-
 enum MetricsHelper {
    ;

@@ -17,16 +18,16 @@ enum MetricsHelper {
        map.put(key, count + 1);
    }

-    static Metrics.AdvancedPie createAdvancedPieChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
+    static AdvancedPie createAdvancedPieChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
        Map<String, Integer> map = new HashMap<>();
        metricsFunc.accept(map);
-        return new Metrics.AdvancedPie(chartId, () -> map);
+        return new AdvancedPie(chartId, () -> map);
    }

-    static Metrics.MultiLineChart createMultiLineChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
+    static MultiLineChart createMultiLineChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
        Map<String, Integer> map = new HashMap<>();
        metricsFunc.accept(map);
-        return new Metrics.MultiLineChart(chartId, () -> map);
+        return new MultiLineChart(chartId, () -> map);
    }

 }
@@ -1,7 +0,0 @@
-mv-core.config_save_failed=§cUnable to save Multiverse-Core config.yml. Your changes will be temporary!
-mv-core.debug_info_description=Show the current debug level.
-mv-core.debug_info_off=§fMultiverse Debug mode is §cOFF§f.
-mv-core.debug_info_on=§fMultiverse Debug mode is at §alevel {level}§f.
-mv-core.debug_change_description=Change debug level.
-mv-core.debug_change_syntax=level
-mv-core.debug_change_level_description=Debug level to set to.
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import junit.framework.Assert;
 import org.bukkit.Server;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -27,6 +28,8 @@ import java.io.File;

 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;

@RunWith(PowerMockRunner.class)
@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
@@ -65,11 +68,16 @@ public class TestDebugMode {
        File serverDirectory = new File(creator.getCore().getServerFolder(), "world");
        serverDirectory.mkdirs();

+        // Initialize a fake command
+        Command mockCommand = mock(Command.class);
+        when(mockCommand.getName()).thenReturn("mv");
+
        // Assert debug mode is off
        Assert.assertEquals(0, core.getMVConfig().getGlobalDebug());

        // Send the debug command.
-        this.creator.dispatch(mockCommandSender, "mv debug 3");
+        String[] debugArgs = new String[] { "debug", "3" };
+        plugin.onCommand(mockCommandSender, mockCommand, "", debugArgs);

        Assert.assertEquals(3, core.getMVConfig().getGlobalDebug());
    }
@@ -10,7 +10,6 @@ import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -25,7 +24,6 @@ import static org.mockito.Mockito.when;
@RunWith(PowerMockRunner.class)
@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class })
@PowerMockIgnore("javax.script.*")
-@Ignore
 public class TestModifyCommand {
    TestInstanceCreator creator;
    Server mockServer;
@@ -42,7 +42,6 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.internal.verification.VerificationModeFactory;
@@ -64,7 +63,6 @@ import static org.mockito.Mockito.*;
        PlayerJoinEvent.class, PlayerRespawnEvent.class, EntityRegainHealthEvent.class,
        FoodLevelChangeEvent.class, WorldManager.class, PluginDescriptionFile.class, JavaPluginLoader.class })
@PowerMockIgnore("javax.script.*")
-@Ignore
 public class TestWorldProperties {
    private TestInstanceCreator creator;
    private MultiverseCore core;
@@ -27,7 +27,6 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
@@ -46,7 +45,6 @@ import static org.mockito.Mockito.*;
@PrepareForTest({ PluginManager.class, MultiverseCore.class, Permission.class, Bukkit.class, WorldManager.class,
        PluginDescriptionFile.class, JavaPluginLoader.class })
@PowerMockIgnore("javax.script.*")
-@Ignore
 public class TestWorldStuff {

    private TestInstanceCreator creator;
@@ -1,8 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import org.bukkit.Server;
-import org.bukkit.command.SimpleCommandMap;
-
-public abstract class DummyCraftServer implements Server {
-    public abstract SimpleCommandMap getCommandMap();
-}
@@ -20,8 +20,6 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.SimpleCommandMap;
-import org.bukkit.help.HelpMap;
 import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -60,7 +58,6 @@ public class TestInstanceCreator {
    private MultiverseCore core;
    private Server mockServer;
    private CommandSender commandSender;
-    private SimpleCommandMap simpleCommandMap;

    public static final File pluginDirectory = new File("bin/test/server/plugins/coretest");
    public static final File serverDirectory = new File("bin/test/server");
@@ -75,19 +72,14 @@ public class TestInstanceCreator {
            MockGateway.MOCK_STANDARD_METHODS = false;

            // Initialize the Mock server.
-            mockServer = PowerMockito.mock(DummyCraftServer.class);
+            mockServer = mock(Server.class);
            JavaPluginLoader mockPluginLoader = PowerMock.createMock(JavaPluginLoader.class);
            Whitebox.setInternalState(mockPluginLoader, "server", mockServer);
            when(mockServer.getName()).thenReturn("TestBukkit");
-            when(mockServer.getVersion()).thenReturn("TestBukkit V1");
            Logger.getLogger("Minecraft").setParent(Util.logger);
            when(mockServer.getLogger()).thenReturn(Util.logger);
            when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);

-            // Add an internal command map (needed for ACF)
-            this.simpleCommandMap = new SimpleCommandMap(mockServer);
-            PowerMockito.when(mockServer, "getCommandMap").thenReturn(this.simpleCommandMap);
-
            // Return a fake PDF file.
            PluginDescriptionFile pdf = PowerMockito.spy(new PluginDescriptionFile("Multiverse-Core", "2.2-Test",
                    "com.onarandombox.MultiverseCore.MultiverseCore"));
@@ -216,10 +208,6 @@ public class TestInstanceCreator {
                }});
            when(mockServer.getScheduler()).thenReturn(mockScheduler);

-            // add dummy help map
-            HelpMap helpMap = mock(HelpMap.class);
-            when(mockServer.getHelpMap()).thenReturn(helpMap);
-
            // Set server
            Field serverfield = JavaPlugin.class.getDeclaredField("server");
            serverfield.setAccessible(true);
@@ -336,8 +324,4 @@ public class TestInstanceCreator {
    public CommandSender getCommandSender() {
        return commandSender;
    }
-
-    public boolean dispatch(CommandSender sender, String commandLine) {
-        return this.simpleCommandMap.dispatch(sender, commandLine);
-    }
 }
Author	SHA1	Message	Date
Jeremy Wood	fc6796e20f	Release version 4.3.0.	2021-06-23 08:56:24 -04:00
Jeremy Wood	6040a27126	Merge pull request #2635 from Multiverse/fix/version_cmd_perms Change default permission for version command. Seriously wth.	2021-06-04 13:00:39 -04:00
Jeremy Wood	1c483148dc	Change default permission for version command. Seriously wth.	2021-06-04 13:00:04 -04:00
nicegamer7	128442c062	Merge pull request #2622 from Multiverse/queue-system-cleanup Queue system cleanup	2021-05-16 11:29:23 -04:00
Kermina Awad	141854f076	correct some javadoc typos	2021-05-16 11:21:20 -04:00
xSavior_of_God	f72cc6764b	Fix creation and import Exploit (#2353 ) Through this fix you can avoid deleting of important folders.	2021-05-16 12:56:14 +08:00
benwoo1110	d95ecfaa8e	Update some CommandQueueManager docs to be clearer.	2021-04-28 14:01:30 +08:00
benwoo1110	6c96f4e974	Ensure DummyCommandBlockSender isnt used for Op.	2021-04-28 13:58:43 +08:00
Ben Woo	28cee291c6	Merge pull request #2581 from Multiverse/regen-keep-gamerules Add ability to keep gamerules setting on world regen.	2021-04-28 10:43:09 +08:00
Ben Woo	155f32c00f	Add ability to keep gamerules on world regen.	2021-04-27 23:44:24 +08:00
Ben Woo	071ba05d81	Merge pull request #2585 from Multiverse/Revamp-queue-command- Implement new queue command system.	2021-04-27 23:10:59 +08:00
Ben Woo	2ee5aea06b	Merge pull request #2580 from Multiverse/per-search-and-reflect Improve portal search radius	2021-04-27 10:57:46 +08:00
Ben Woo	3bb8de6d33	Improve portal search radius. * Fix portal search radius not respected after travel agent removed. * Set portal search radius for entity entering portals.	2021-04-26 22:52:24 +08:00
Ben Woo	79ac01da34	Merge pull request #2619 from Multiverse/general_cleanup General Cleanup	2021-04-25 11:55:56 +08:00
Kermina Awad	6e4fbb0ece	correct a copy-paste error introduced in #2588	2021-04-24 14:51:24 -04:00
Kermina Awad	167ed5e0d3	update VaultAPI repo	2021-04-24 14:49:28 -04:00
Kermina Awad	91f3304f78	add to Buscript failed to load message	2021-04-24 14:13:40 -04:00
Kermina Awad	7928e73a32	enable minimizeJar for maven-shade-plugin	2021-04-24 14:08:25 -04:00
Kermina Awad	d61d186544	update bStats Metrics class	2021-04-24 14:08:09 -04:00
nicegamer7	dc356e88d0	Merge pull request #2582 from Multiverse/unload-message Update unload message logging.	2021-04-24 13:49:12 -04:00
Kermina Awad	d0d5574580	update unload message logging another time	2021-04-24 13:48:09 -04:00
Ben Woo	29617059b3	Merge pull request #2611 from Turbotailz/patch-1 Make prefixchat config option default to 'false'	2021-04-06 13:10:02 +08:00
Sam Goodger	bf05fc81dd	Make prefixchat config option default to 'false' This may seem like a really negligible change but having this option default to `true` actually causes a lot of pain for support in other plugins that deal with prefixes (LuckPerms and Essentials being the main victims). Users always come in guns blazing, screaming at us because they don't know how to remove the world name from their chat. It's such a simple solution, yet no one thinks that of all plugins, it would be Multiverse that is tainting their beloved chat format. Please consider updating this default setting. It will save a lot of us trouble in the future 🙏	2021-04-06 14:19:38 +10:00
nicegamer7	a2c5bf70f0	Merge pull request #2597 from Multiverse/cleanup Cleanup	2021-03-18 10:52:28 -04:00
benwoo1110	ea19006465	Fix selector log level.	2021-03-18 16:40:47 +08:00
benwoo1110	89f685ff9a	Add missing javadocs in DestinationFactory.	2021-03-10 17:45:39 +08:00
benwoo1110	ecc76033dc	Remove redundant line that was moved to WorldNameChecker.	2021-03-10 17:41:56 +08:00
benwoo1110	cc3996ca76	Implement new queue command system.	2021-03-09 20:54:42 +08:00
benwoo1110	b23c1ae606	Update unload message logging.	2021-03-04 16:00:53 +08:00