Implement new queue command system.

Fix cannot remove block currency with mvm set command.

.github/ISSUE_TEMPLATE/help.md

@@ -2,7 +2,7 @@
 name: ❓ Help!
 about: Encountered a problem with Multiverse-Core? Not sure how to fix it?
 title: ''
-labels: 'type: Assistance'
+labels: 'Type: Assistance'
 assignees: ''
 
 ---
@@ -40,7 +40,7 @@ If you're happy to wait (or you were sent here from Discord), read on:
 
 * **Server version:** <!-- Insert output of `/version` command -->
 
-* **Full output of `/mv version -b`:** <!-- Replace this with the command output's https://pastebin.com link -->
+* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
 
 * **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
 

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -2,7 +2,7 @@
 name: 🐛 Report a Bug
 about: Report a Multiverse-Core bug. Only use this if you're 100% sure it's something wrong with Multiverse-Core - otherwise, try "Help!".
 title: ''
-labels: 'type: Bug'
+labels: 'Bug: Unconfirmed'
 assignees: ''
 
 ---
@@ -39,7 +39,7 @@ If you are reporting a bug, please follow the following steps:
 
 * **Server version:** <!-- Insert output of `/version` command -->
 
-* **Full output of `/mv version -b`:** <!-- Replace this with the command output's https://pastebin.com link -->
+* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
 
 * **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
 

.github/ISSUE_TEMPLATE/request-a-feature.md

@@ -2,7 +2,7 @@
 name: 💡 Request a Feature
 about: Suggest a feature you want to see in Multiverse-Core!
 title: ''
-labels: 'type: Suggestion'
+labels: 'Type: Idea'
 assignees: ''
 
 ---

README.md

@@ -13,4 +13,4 @@ Copyright (c) 2011, The Multiverse Team All rights reserved.
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
 Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
+

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>4.2.0</version>
+    <version>4.2.3-SNAPSHOT</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
@@ -215,7 +215,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -264,13 +264,19 @@
             <plugin>
                 <groupId>se.eris</groupId>
                 <artifactId>notnull-instrumenter-maven-plugin</artifactId>
-                <version>0.6.8</version>
+                <version>1.0.0</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>instrument</goal>
                             <goal>tests-instrument</goal>
                         </goals>
+                        <configuration>
+                            <notNull>
+                                <param>org.jetbrains.annotations.NotNull</param>
+                                <param>javax.validation.constraints.NotNull</param>
+                            </notNull>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -319,7 +325,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.7</version>
+            <version>1.8</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -353,21 +359,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.9</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.9</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.9</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>

src/main/java/com/onarandombox/MultiverseCore/MVWorld.java

@@ -214,7 +214,7 @@ public class MVWorld implements MultiverseWorld {
         public Double validateChange(String property, Double newValue, Double oldValue,
                 MVWorld object) throws ChangeDeniedException {
             if (newValue <= 0) {
-                plugin.log(Level.FINE, "Someone tried to set a scale <= 0, aborting!");
+                Logging.fine("Someone tried to set a scale <= 0, aborting!");
                 throw new ChangeDeniedException();
             }
             return super.validateChange(property, newValue, oldValue, object);
@@ -297,7 +297,7 @@ public class MVWorld implements MultiverseWorld {
         public GameMode validateChange(String property, GameMode newValue, GameMode oldValue,
                 MVWorld object) throws ChangeDeniedException {
             for (Player p : plugin.getServer().getWorld(getName()).getPlayers()) {
-                plugin.log(Level.FINER, String.format("Setting %s's GameMode to %s",
+                Logging.finer(String.format("Setting %s's GameMode to %s",
                         p.getName(), newValue.toString()));
                 plugin.getPlayerListener().handleGameModeAndFlight(p, MVWorld.this);
             }
@@ -319,16 +319,16 @@ public class MVWorld implements MultiverseWorld {
                 // verify that the location is safe
                 if (!bs.playerCanSpawnHereSafely(newValue)) {
                     // it's not ==> find a better one!
-                    plugin.log(Level.WARNING, String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
-                    plugin.log(Level.WARNING, "Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
-                    plugin.log(Level.WARNING, "New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    Logging.warning(String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
+                    Logging.warning("Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
+                    Logging.warning("New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                     SafeTTeleporter teleporter = plugin.getSafeTTeleporter();
                     newValue = teleporter.getSafeLocation(newValue, SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
                     if (newValue == null) {
-                        plugin.log(Level.WARNING, "Couldn't fix the location. I have to abort the spawn location-change :/");
+                        Logging.warning("Couldn't fix the location. I have to abort the spawn location-change :/");
                         throw new ChangeDeniedException();
                     }
-                    plugin.log(Level.WARNING, "New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    Logging.warning("New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                 }
             }
             return super.validateChange(property, newValue, oldValue, object);
@@ -411,7 +411,7 @@ public class MVWorld implements MultiverseWorld {
             // Add limit bypass to it's parent
             this.limitbypassperm.addParent("mv.bypass.playerlimit.*", true);
         } catch (IllegalArgumentException e) {
-            this.plugin.log(Level.FINER, "Permissions nodes were already added for " + this.name);
+            Logging.finer("Permissions nodes were already added for " + this.name);
         }
     }
 
@@ -422,16 +422,16 @@ public class MVWorld implements MultiverseWorld {
         // Verify that location was safe
         if (!bs.playerCanSpawnHereSafely(location)) {
             if (!this.getAdjustSpawn()) {
-                this.plugin.log(Level.FINE, "Spawn location from world.dat file was unsafe!!");
-                this.plugin.log(Level.FINE, "NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
-                this.plugin.log(Level.FINE, "To turn on spawn adjustment for this world simply type:");
-                this.plugin.log(Level.FINE, "/mvm set adjustspawn true " + this.getAlias());
+                Logging.fine("Spawn location from world.dat file was unsafe!!");
+                Logging.fine("NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
+                Logging.fine("To turn on spawn adjustment for this world simply type:");
+                Logging.fine("/mvm set adjustspawn true " + this.getAlias());
                 return location;
             }
             // If it's not, find a better one.
             SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-            this.plugin.log(Level.WARNING, "Spawn location from world.dat file was unsafe. Adjusting...");
-            this.plugin.log(Level.WARNING, "Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
+            Logging.warning("Spawn location from world.dat file was unsafe. Adjusting...");
+            Logging.warning("Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
             Location newSpawn = teleporter.getSafeLocation(location,
                     SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
             // I think we could also do this, as I think this is what Notch does.
@@ -450,7 +450,7 @@ public class MVWorld implements MultiverseWorld {
                             this.getName(), plugin.getLocationManipulation().locationToString(newerSpawn));
                     return newerSpawn;
                 } else {
-                    this.plugin.log(Level.SEVERE, "Safe spawn NOT found!!!");
+                    Logging.severe("Safe spawn NOT found!!!");
                 }
             }
         }

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -68,6 +68,7 @@ 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;
@@ -88,11 +89,13 @@ import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
 import com.onarandombox.MultiverseCore.listeners.MVWorldInitListener;
 import com.onarandombox.MultiverseCore.listeners.MVWorldListener;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
+import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
 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;
@@ -202,6 +205,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     // Setup our Map for our Commands using the CommandHandler.
     private CommandHandler commandHandler;
+    private CommandQueueManager commandQueueManager;
 
     private static final String LOG_TAG = "[Multiverse-Core]";
 
@@ -253,6 +257,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         // Setup our SafeTTeleporter
         this.safeTTeleporter = new SimpleSafeTTeleporter(this);
         this.unsafeCallWrapper = new UnsafeCallWrapper(this);
+        // Setup our CompatibilityLayer
+        CompatibilityLayer.init();
     }
 
 
@@ -284,6 +290,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
         // Setup the command manager
         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();
 
@@ -305,7 +312,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.worldManager.loadDefaultWorlds();
             this.worldManager.loadWorlds(true);
         } else {
-            this.log(Level.SEVERE, "Your configs were not loaded. Very little will function in Multiverse.");
+            Logging.severe("Your configs were not loaded. Very little will function in Multiverse.");
         }
         this.anchorManager.loadAnchors();
 
@@ -343,20 +350,25 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     }
 
     private void setupMetrics() {
-        MetricsConfigurator.configureMetrics(this);
+        if (TestingMode.isDisabled()) {
+            MetricsConfigurator.configureMetrics(this);
+        }
     }
 
     /**
      * Initializes the buscript javascript library.
      */
     private void initializeBuscript() {
-        try {
-            buscript = new Buscript(this);
-            // Add global variable "multiverse" to javascript environment
-            buscript.setScriptVariable("multiverse", this);
-        } catch (NullPointerException e) {
-            buscript = null;
-            Logging.warning("Buscript failed to load! The script command will be disabled!");
+        buscript = null;
+
+        if (this.getMVConfig().getEnableBuscript()) {
+            try {
+                buscript = new Buscript(this);
+                // 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!");
+            }
         }
     }
 
@@ -380,7 +392,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         pm.registerEvents(this.entityListener, this);
         pm.registerEvents(this.weatherListener, this);
         pm.registerEvents(this.portalListener, this);
-        log(Level.INFO, "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do. The performance impact is negligible.");
+        Logging.info(ChatColor.GREEN + "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do and performance impact is negligible. It is safe to ignore.");
         pm.registerEvents(this.worldListener, this);
         pm.registerEvents(new MVMapListener(this), this);
     }
@@ -499,13 +511,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         try {
             wconf.load(worldsFile);
         } catch (IOException e) {
-            log(Level.WARNING, "Cannot load worlds.yml");
+            Logging.warning("Cannot load worlds.yml");
         } catch (InvalidConfigurationException e) {
-            log(Level.WARNING, "Your worlds.yml is invalid!");
+            Logging.warning("Your worlds.yml is invalid!");
         }
 
         if (!wconf.isConfigurationSection("worlds")) { // empty config
-            this.log(Level.FINE, "No worlds to migrate!");
+            Logging.fine("No worlds to migrate!");
             return;
         }
 
@@ -518,7 +530,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 // fine
                 newValues.put(entry.getKey(), entry.getValue());
             } else if (entry.getValue() instanceof ConfigurationSection) {
-                this.log(Level.FINE, "Migrating: " + entry.getKey());
+                Logging.fine("Migrating: " + entry.getKey());
                 // we have to migrate this
                 WorldProperties world = new WorldProperties(Collections.EMPTY_MAP);
                 ConfigurationSection section = (ConfigurationSection) entry.getValue();
@@ -684,8 +696,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                     try {
                         difficulty = Difficulty.valueOf(section.getString("difficulty").toUpperCase());
                     } catch (IllegalArgumentException e) {
-                        this.log(Level.WARNING, "Could not parse difficulty: " + section.getString("difficulty"));
-                        this.log(Level.WARNING, "Setting world " + entry.getKey() + " difficulty to NORMAL");
+                        Logging.warning("Could not parse difficulty: " + section.getString("difficulty"));
+                        Logging.warning("Setting world " + entry.getKey() + " difficulty to NORMAL");
                         difficulty = Difficulty.NORMAL;
                     }
                     if (difficulty != null) {
@@ -702,7 +714,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 wasChanged = true;
             } else {
                 // huh?
-                this.log(Level.WARNING, "Removing unknown entry in the config: " + entry);
+                Logging.warning("Removing unknown entry in the config: " + entry);
                 // just don't add to newValues
                 wasChanged = true;
             }
@@ -836,8 +848,12 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     /**
      * {@inheritDoc}
+     *
+     * @deprecated This is now deprecated, nobody needs it any longer.
+     * All logging is now done with {@link Logging}.
      */
     @Override
+    @Deprecated
     public void log(Level level, String msg) {
         Logging.log(level, msg);
     }
@@ -904,6 +920,15 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         return this.commandHandler;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @Deprecated
+    public CommandQueueManager getCommandQueueManager() {
+        return commandQueueManager;
+    }
+
     /**
      * Gets the log-tag.
      *
@@ -1056,7 +1081,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
             return true;
         } catch (IOException e) {
-            this.log(Level.SEVERE, "Could not save Multiverse config.yml config. Please check your file permissions.");
+            Logging.severe("Could not save Multiverse config.yml config. Please check your file permissions.");
             return false;
         }
     }

src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java

@@ -56,6 +56,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Property
     private volatile boolean displaypermerrors;
     @Property
+    private volatile boolean enablebuscript;
+    @Property
     private volatile int globaldebug;
     @Property
     private volatile boolean silentstart;
@@ -99,6 +101,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         teleportintercept = true;
         firstspawnoverride = true;
         displaypermerrors = true;
+        enablebuscript = true;
         globaldebug = 0;
         messagecooldown = 5000;
         teleportcooldown = 1000;
@@ -213,6 +216,22 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         return this.displaypermerrors;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getEnableBuscript() {
+        return this.enablebuscript;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setEnableBuscript(boolean enableBuscript) {
+        this.enablebuscript = enableBuscript;
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/com/onarandombox/MultiverseCore/api/Core.java

@@ -8,6 +8,7 @@
 package com.onarandombox.MultiverseCore.api;
 
 import buscript.Buscript;
+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;
@@ -86,6 +87,15 @@ public interface Core {
      */
     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
      * on demand.

src/main/java/com/onarandombox/MultiverseCore/api/LoggablePlugin.java

@@ -7,11 +7,17 @@
 
 package com.onarandombox.MultiverseCore.api;
 
+import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.Server;
 
 import java.util.logging.Level;
 
-/** A simple API to require plugins to have a log method. */
+/**
+ * A simple API to require plugins to have a log method.
+ *
+ * @deprecated Replaced by {@link Logging}.
+ * */
+@Deprecated
 public interface LoggablePlugin {
     /**
      * Logs a message at the specified level.

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java

@@ -86,6 +86,18 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      */
     boolean getDisplayPermErrors();
 
+    /**
+     * Sets enableBuscript.
+     * @param enableBuscript The new value.
+     */
+    void setEnableBuscript(boolean enableBuscript);
+
+    /**
+     * Gets enableBuscript.
+     * @return enableBuscript.
+     */
+    boolean getEnableBuscript();
+
     /**
      * Sets firstSpawnOverride.
      * @param firstSpawnOverride The new value.

src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java

@@ -37,7 +37,7 @@ public class CheckCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        Player p = this.plugin.getServer().getPlayer(args.get(0));
+        Player p = this.plugin.getServer().getPlayerExact(args.get(0));
         if (p == null) {
             sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
             sender.sendMessage("Are they online?");

src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java

@@ -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);
     }
 
 }

src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.commands;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -60,7 +61,7 @@ public class DebugCommand extends MultiverseCommand {
             sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
         } else {
             sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
-            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
+            Logging.fine("Multiverse Debug ENABLED");
         }
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java

@@ -8,9 +8,11 @@
 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));
+        };
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java

@@ -115,6 +115,7 @@ public class InfoCommand extends MultiverseCommand {
         FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
         message.add(new FancyHeader("General Info", colors));
         message.add(new FancyMessage("World Name: ", world.getName(), colors));
+        message.add(new FancyMessage("World UID: ", world.getCBWorld().getUID().toString(), colors));
         message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
         message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
         message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
@@ -151,6 +152,7 @@ public class InfoCommand extends MultiverseCommand {
         message = new ArrayList<FancyText>();
         message.add(new FancyHeader("More World Settings", colors));
         message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Generator: ", world.getGenerator(), colors));
         message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
         message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
         message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));

src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java

@@ -8,9 +8,11 @@
 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;
@@ -37,17 +39,30 @@ 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) : "";
 
-        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!");
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                doWorldRegen(sender, worldName, useseed, randomseed, seed),
+                String.format("Are you sure you want to regen '%s'? You cannot undo this action.", worldName)
+        ));
+    }
+
+    private Runnable doWorldRegen(@NotNull CommandSender sender,
+                                  @NotNull String worldName,
+                                  boolean useSeed,
+                                  boolean randomSeed,
+                                  @NotNull String seed) {
+
+        return () -> {
+            if (this.plugin.getMVWorldManager().regenWorld(worldName, useSeed, randomSeed, seed)) {
+                sender.sendMessage(ChatColor.GREEN + "World Regenerated!");
+                return;
+            }
+            sender.sendMessage(ChatColor.RED + "World could NOT be regenerated!");
+        };
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java

@@ -50,7 +50,7 @@ public class SpawnCommand extends MultiverseCommand {
                 sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
                 return;
             }
-            Player target = this.plugin.getServer().getPlayer(args.get(0));
+            Player target = this.plugin.getServer().getPlayerExact(args.get(0));
             if (target != null) {
                 target.sendMessage("Teleporting to this world's spawn...");
                 spawnAccurately(target);

src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java

@@ -7,9 +7,11 @@
 
 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;
@@ -58,7 +60,7 @@ public class TeleportCommand extends MultiverseCommand {
         String destinationName;
 
         if (args.size() == 2) {
-            teleportee = this.plugin.getServer().getPlayer(args.get(0));
+            teleportee = this.plugin.getServer().getPlayerExact(args.get(0));
             if (teleportee == null) {
                 this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
                         ChatColor.GOLD, args.get(0)), false);
@@ -94,7 +96,7 @@ public class TeleportCommand extends MultiverseCommand {
         MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
         this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
         if (teleportEvent.isCancelled()) {
-            this.plugin.log(Level.FINE, "Someone else cancelled the MVTeleport Event!!!");
+            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
             return;
         }
 
@@ -162,26 +164,29 @@ public class TeleportCommand extends MultiverseCommand {
                 ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
         TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
         if (result == TeleportResult.FAIL_UNSAFE) {
-            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName()
+            Logging.fine("Could not teleport " + teleportee.getName()
                     + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-            this.plugin.log(Level.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)) {

src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java

@@ -26,12 +26,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,58 +50,59 @@ public class VersionCommand extends MultiverseCommand {
     }
 
     private String getLegacyString() {
-        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + System.lineSeparator()
-                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + System.lineSeparator()
-                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + System.lineSeparator()
-                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + System.lineSeparator()
-                +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + System.lineSeparator()
-                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + System.lineSeparator()
-                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + System.lineSeparator()
-                + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + System.lineSeparator()
-                + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + System.lineSeparator()
-                + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + System.lineSeparator()
-                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + System.lineSeparator()
-                + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + System.lineSeparator()
-                + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + System.lineSeparator()
-                + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + System.lineSeparator()
-                + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + System.lineSeparator()
-                + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + System.lineSeparator()
-                + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + System.lineSeparator()
-                + "[Multiverse-Core]   version: " + plugin.getMVConfig().getVersion() + System.lineSeparator()
-                + "[Multiverse-Core]   firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + System.lineSeparator()
-                + "[Multiverse-Core]   teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + System.lineSeparator()
-                + "[Multiverse-Core]   defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + System.lineSeparator()
-                + "[Multiverse-Core]   portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + System.lineSeparator()
-                + "[Multiverse-Core]   autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + System.lineSeparator()
-                + "[Multiverse-Core] Special Code: FRN002" + System.lineSeparator();
+        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
+                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
+                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
+                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
+                +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
+                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
+                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
+                + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
+                + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
+                + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
+                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
+                + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
+                + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
+                + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
+                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
+                + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
+                + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
+                + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'
+                + "[Multiverse-Core]   version: " + plugin.getMVConfig().getVersion() + '\n'
+                + "[Multiverse-Core]   firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + '\n'
+                + "[Multiverse-Core]   teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + '\n'
+                + "[Multiverse-Core]   defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
+                + "[Multiverse-Core]   portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + '\n'
+                + "[Multiverse-Core]   autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
+                + "[Multiverse-Core] Special Code: FRN002" + '\n';
     }
 
     private String getMarkdownString() {
-        return "# Multiverse-Core" + System.lineSeparator()
-                + "## Overview" + System.lineSeparator()
-                + "| Name | Value |" + System.lineSeparator()
-                + "| --- | --- |" + System.lineSeparator()
-                + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + System.lineSeparator()
-                + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + System.lineSeparator()
-                + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + System.lineSeparator()
-                + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + System.lineSeparator()
-                + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + System.lineSeparator()
-                + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + System.lineSeparator()
-                + "## Parsed Config" + System.lineSeparator()
-                + "These are what Multiverse thought the in-memory values of the config were." + System.lineSeparator() + System.lineSeparator()
-                + "| Config Key  | Value |" + System.lineSeparator()
-                + "| --- | --- |" + System.lineSeparator()
-                + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + System.lineSeparator()
-                + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + System.lineSeparator()
-                + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + System.lineSeparator()
-                + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + System.lineSeparator()
-                + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + System.lineSeparator()
-                + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + System.lineSeparator()
-                + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + System.lineSeparator()
-                + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + System.lineSeparator()
-                + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + System.lineSeparator()
-                + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + System.lineSeparator()
-                + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + System.lineSeparator();
+        return "# Multiverse-Core" + '\n'
+                + "## Overview" + '\n'
+                + "| Name | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + '\n'
+                + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + '\n'
+                + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + '\n'
+                + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + '\n'
+                + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + '\n'
+                + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + '\n'
+                + "## Parsed Config" + '\n'
+                + "These are what Multiverse thought the in-memory values of the config were." + "\n\n"
+                + "| Config Key  | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + '\n'
+                + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + '\n'
+                + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + '\n'
+                + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + '\n'
+                + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + '\n'
+                + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + '\n'
+                + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + '\n'
+                + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + '\n'
+                + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + '\n'
+                + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + '\n'
+                + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + '\n';
     }
 
     private void addVersionInfoToEvent(MVVersionEvent event) {
@@ -114,15 +110,16 @@ public class VersionCommand extends MultiverseCommand {
         event.appendVersionInfo(this.getLegacyString());
 
         // add the legacy file, but as markdown so it's readable
-        event.putDetailedVersionInfo("version.md", this.getMarkdownString());
+        // TODO Readd this in 5.0.0
+        // event.putDetailedVersionInfo("version.md", this.getMarkdownString());
 
         // add config.yml
         File configFile = new File(this.plugin.getDataFolder(), "config.yml");
-        event.putDetailedVersionInfo("version.md", configFile);
+        event.putDetailedVersionInfo("multiverse-core/config.yml", configFile);
 
         // add worlds.yml
         File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
-        event.putDetailedVersionInfo("version.md", worldsFile);
+        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
     }
 
     @Override
@@ -138,18 +135,20 @@ public class VersionCommand extends MultiverseCommand {
         this.plugin.getServer().getPluginManager().callEvent(versionEvent);
 
         if (CommandHandler.hasFlag("--include-plugin-list", args)) {
-            versionEvent.appendVersionInfo(System.lineSeparator() + "Plugins: " + getPluginList());
+            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
             versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
         }
 
         final String versionInfo = versionEvent.getVersionInfo();
+        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
+
         final Map<String, String> files = versionEvent.getDetailedVersionInfo();
 
         // log to console
-        String[] lines = versionInfo.split(System.lineSeparator());
+        String[] lines = versionInfo.split("\\r?\\n");
         for (String line : lines) {
             if (!line.isEmpty()) {
-                Logging.info(line);
+                this.plugin.getServer().getLogger().info(line);
             }
         }
 

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/CommandQueueManager.java

@@ -0,0 +1,158 @@
+/******************************************************************************
+ * 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;
+
+/**
+ * Managers the queuing of dangerous commands that needs to use '/mv confirm' before executing.
+ */
+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 queue command into queue.
+     *
+     * @param queuedCommand The queue 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 remove {@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 queue 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;
+    }
+
+    /**
+     * Check if sender is a command block.
+     *
+     * @param sender    The sender to check on.
+     * @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;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/DummyCommandBlockSender.java

@@ -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() {
+        return true;
+    }
+
+    @Override
+    public void setOp(boolean value) {
+        throw new UnsupportedOperationException();
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/QueuedCommand.java

@@ -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;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Manager queuing of dangerous commands in need of confirmation.
+ */
+package com.onarandombox.MultiverseCore.commandtools.queue;

src/main/java/com/onarandombox/MultiverseCore/configuration/EntryFee.java

@@ -22,6 +22,8 @@ public class EntryFee extends SerializationConfig {
     @Nullable
     private Material currency;
 
+    private final Material DISABLED_MATERIAL = Material.AIR;
+
     public EntryFee() {
         super();
     }
@@ -51,6 +53,9 @@ public class EntryFee extends SerializationConfig {
      */
     @Nullable
     public Material getCurrency() {
+        if (currency == null || currency.equals(DISABLED_MATERIAL)) {
+            return null;
+        }
         return currency;
     }
 

src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java

@@ -23,7 +23,7 @@ import org.bukkit.util.Vector;
  * A bed-{@link MVDestination}.
  */
 public class BedDestination implements MVDestination {
-    public static final String OLD_BED_STRING = "b:playerbed";
+    public static final String OWN_BED_STRING = "playerbed";
     private String playername = "";
     private boolean isValid;
     private Location knownBedLoc;
@@ -46,11 +46,11 @@ public class BedDestination implements MVDestination {
         boolean validFormat = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());
 
         OfflinePlayer p = Bukkit.getOfflinePlayer(split[1]);
-        boolean validPlayer = (p != null);
+        boolean validPlayer = p.getName() != null && !p.getName().equals(OWN_BED_STRING);
 
         if (validFormat && validPlayer) this.playername = p.getName();
 
-        this.isValid = destination.equals(OLD_BED_STRING) || (validFormat && validPlayer);
+        this.isValid = destination.equals("b:" + OWN_BED_STRING) || (validFormat && validPlayer);
 
         return this.isValid;
     }
@@ -136,6 +136,6 @@ public class BedDestination implements MVDestination {
 
     @Override
     public String toString() {
-        return playername.isEmpty() ? OLD_BED_STRING : ("b:" + playername);
+        return "b:" + (playername.isEmpty() ? OWN_BED_STRING : playername);
     }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java

@@ -50,7 +50,7 @@ public class PlayerDestination implements MVDestination {
      */
     @Override
     public Location getLocation(Entity e) {
-        Player p = plugin.getServer().getPlayer(this.player);
+        Player p = plugin.getServer().getPlayerExact(this.player);
         Player plLoc = null;
         if (e instanceof Player) {
             plLoc = (Player) e;

src/main/java/com/onarandombox/MultiverseCore/enums/RespawnType.java

@@ -0,0 +1,7 @@
+package com.onarandombox.MultiverseCore.enums;
+
+public enum RespawnType {
+    BED,
+    ANCHOR,
+    OTHER
+}

src/main/java/com/onarandombox/MultiverseCore/listeners/MVAsyncPlayerChatListener.java

@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.listeners;
 
 import java.util.logging.Level;
 
+import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
@@ -20,7 +21,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 public class MVAsyncPlayerChatListener extends MVChatListener {
     public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
         super(plugin, playerListener);
-        plugin.log(Level.FINE, "Created AsyncPlayerChatEvent listener.");
+        Logging.fine("Created AsyncPlayerChatEvent listener.");
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.listeners;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
@@ -98,7 +99,7 @@ public class MVEntityListener implements Listener {
          * Handle people with non-standard animals: ie a patched craftbukkit.
          */
         if (type == null || type.getName() == null) {
-            this.plugin.log(Level.FINER, "Found a null typed creature.");
+            Logging.finer("Found a null typed creature.");
             return;
         }
 

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerChatListener.java

@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.listeners;
 
 import java.util.logging.Level;
 
+import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerChatEvent;
 
@@ -21,7 +22,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 public class MVPlayerChatListener extends MVChatListener {
     public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
         super(plugin, playerListener);
-        plugin.log(Level.FINE, "Registered PlayerChatEvent listener.");
+        Logging.fine("Registered PlayerChatEvent listener.");
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java

@@ -15,7 +15,9 @@ 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.enums.RespawnType;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
+import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -69,9 +71,16 @@ public class MVPlayerListener implements Listener {
             return;
         }
 
+        RespawnType respawnType = RespawnType.OTHER;
+        if (event.isBedSpawn()) {
+            respawnType = RespawnType.BED;
+        }
+        if (CompatibilityLayer.isAnchorSpawn(event)) {
+            respawnType = RespawnType.ANCHOR;
+        }
 
-        if (mvWorld.getBedRespawn() && event.isBedSpawn()) {
-            this.plugin.log(Level.FINE, "Spawning " + event.getPlayer().getName() + " at their bed");
+        if (mvWorld.getBedRespawn() && (respawnType == RespawnType.BED || respawnType == RespawnType.ANCHOR)) {
+            Logging.fine("Spawning %s at their %s", event.getPlayer().getName(), respawnType);
             return;
         }
 
@@ -110,15 +119,15 @@ public class MVPlayerListener implements Listener {
     public void playerJoin(PlayerJoinEvent event) {
         Player p = event.getPlayer();
         if (!p.hasPlayedBefore()) {
-            this.plugin.log(Level.FINER, "Player joined for the FIRST time!");
+            Logging.finer("Player joined for the FIRST time!");
             if (plugin.getMVConfig().getFirstSpawnOverride()) {
-                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): "
+                Logging.fine("Moving NEW player to(firstspawnoverride): "
                         + worldManager.getFirstSpawnWorld().getSpawnLocation());
                 this.sendPlayerToDefaultWorld(p);
             }
             return;
         } else {
-            this.plugin.log(Level.FINER, "Player joined AGAIN!");
+            Logging.finer("Player joined AGAIN!");
             if (this.plugin.getMVConfig().getEnforceAccess() // check this only if we're enforcing access!
                     && !this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
                 p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
@@ -156,7 +165,7 @@ public class MVPlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGHEST)
     public void playerTeleport(PlayerTeleportEvent event) {
-        this.plugin.log(Level.FINER, "Got teleport event for player '"
+        Logging.finer("Got teleport event for player '"
                 + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
         if (event.isCancelled()) {
             return;
@@ -166,25 +175,25 @@ public class MVPlayerListener implements Listener {
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
         if (teleporterName != null) {
             if (teleporterName.equals("CONSOLE")) {
-                this.plugin.log(Level.FINER, "We know the teleporter is the console! Magical!");
+                Logging.finer("We know the teleporter is the console! Magical!");
                 teleporter = this.plugin.getServer().getConsoleSender();
             } else {
-                teleporter = this.plugin.getServer().getPlayer(teleporterName);
+                teleporter = this.plugin.getServer().getPlayerExact(teleporterName);
             }
         }
-        this.plugin.log(Level.FINER, "Inferred sender '" + teleporter + "' from name '"
+        Logging.finer("Inferred sender '" + teleporter + "' from name '"
                 + teleporterName + "', fetched from name '" + teleportee.getName() + "'");
         MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
         if (toWorld == null) {
-            this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' is teleporting to world '"
+            Logging.fine("Player '" + teleportee.getName() + "' is teleporting to world '"
                     + event.getTo().getWorld().getName() + "' which is not managed by Multiverse-Core.  No further "
                     + "actions will be taken by Multiverse-Core.");
             return;
         }
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
             // The player is Teleporting to the same world.
-            this.plugin.log(Level.FINER, "Player '" + teleportee.getName() + "' is teleporting to the same world.");
+            Logging.finer("Player '" + teleportee.getName() + "' is teleporting to the same world.");
             this.stateSuccess(teleportee.getName(), toWorld.getAlias());
             return;
         }
@@ -192,7 +201,7 @@ public class MVPlayerListener implements Listener {
         // Charge the teleporter
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, teleporter, teleportee, true));
         if (event.isCancelled() && teleporter != null) {
-            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+            Logging.fine("Player '" + teleportee.getName()
                     + "' was DENIED ACCESS to '" + toWorld.getAlias()
                     + "' because '" + teleporter.getName()
                     + "' don't have the FUNDS required to enter it.");
@@ -203,14 +212,14 @@ public class MVPlayerListener implements Listener {
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, teleporter, teleportee));
             if (event.isCancelled() && teleporter != null) {
-                this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+                Logging.fine("Player '" + teleportee.getName()
                         + "' was DENIED ACCESS to '" + toWorld.getAlias()
                         + "' because '" + teleporter.getName()
                         + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
                 return;
             }
         } else {
-            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+            Logging.fine("Player '" + teleportee.getName()
                     + "' was allowed to go to '" + toWorld.getAlias() + "' because enforceaccess is off.");
         }
 
@@ -220,7 +229,7 @@ public class MVPlayerListener implements Listener {
             if (toWorld.getCBWorld().getPlayers().size() >= toWorld.getPlayerLimit()) {
                 // Ouch the world is full, lets see if the player can bypass that limitation
                 if (!pt.playerCanBypassPlayerLimit(toWorld, teleporter, teleportee)) {
-                    this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+                    Logging.fine("Player '" + teleportee.getName()
                             + "' was DENIED ACCESS to '" + toWorld.getAlias()
                             + "' because the world is full and '" + teleporter.getName()
                             + "' doesn't have: mv.bypass.playerlimit." + event.getTo().getWorld().getName());
@@ -235,7 +244,7 @@ public class MVPlayerListener implements Listener {
     }
 
     private void stateSuccess(String playerName, String worldName) {
-        this.plugin.log(Level.FINE, "MV-Core is allowing Player '" + playerName
+        Logging.fine("MV-Core is allowing Player '" + playerName
                 + "' to go to '" + worldName + "'.");
     }
 
@@ -282,12 +291,12 @@ public class MVPlayerListener implements Listener {
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
             // The player is Portaling to the same world.
-            this.plugin.log(Level.FINER, "Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
+            Logging.finer("Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
             return;
         }
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, event.getPlayer(), event.getPlayer(), true));
         if (event.isCancelled()) {
-            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
+            Logging.fine("Player '" + event.getPlayer().getName()
                     + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                     + "' because they don't have the FUNDS required to enter.");
             return;
@@ -295,12 +304,12 @@ public class MVPlayerListener implements Listener {
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
             if (event.isCancelled()) {
-                this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
+                Logging.fine("Player '" + event.getPlayer().getName()
                         + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                         + "' because they don't have: multiverse.access." + event.getTo().getWorld().getName());
             }
         } else {
-            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
+            Logging.fine("Player '" + event.getPlayer().getName()
                     + "' was allowed to go to '" + event.getTo().getWorld().getName()
                     + "' because enforceaccess is off.");
         }
@@ -311,7 +320,7 @@ public class MVPlayerListener implements Listener {
                     event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
                 }
             } catch (ClassNotFoundException ignore) {
-                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
+                Logging.fine("TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
             }
 
         }
@@ -335,7 +344,7 @@ public class MVPlayerListener implements Listener {
         if (mvWorld != null) {
             this.handleGameModeAndFlight(player, mvWorld);
         } else {
-            this.plugin.log(Level.FINER, "Not handling gamemode and flight for world '" + world.getName()
+            Logging.finer("Not handling gamemode and flight for world '" + world.getName()
                     + "' not managed by Multiverse.");
         }
     }
@@ -376,7 +385,7 @@ public class MVPlayerListener implements Listener {
                                         player.getName(), player.getWorld().getName(), world.getName());
                             }
                         } else {
-                            MVPlayerListener.this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
+                            Logging.fine("Player: " + player.getName() + " is IMMUNE to gamemode changes!");
                         }
                     }
                 }, 1L);

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.listeners;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
@@ -56,7 +57,7 @@ public class MVPortalListener implements Listener {
     public void portalForm(PortalCreateEvent event) {
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld());
         if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.NETHER)) {
-            plugin.log(Level.FINE, "Cancelling creation of nether portal because portalForm disallows.");
+            Logging.fine("Cancelling creation of nether portal because portalForm disallows.");
             event.setCancelled(true);
         }
     }
@@ -79,7 +80,7 @@ public class MVPortalListener implements Listener {
         }
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld());
         if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.ENDER)) {
-            plugin.log(Level.FINE, "Cancelling creation of ender portal because portalForm disallows.");
+            Logging.fine("Cancelling creation of ender portal because portalForm disallows.");
             event.setCancelled(true);
         }
     }

src/main/java/com/onarandombox/MultiverseCore/utils/AnchorManager.java

@@ -74,7 +74,7 @@ public class AnchorManager {
             this.anchorConfig.save(new File(this.plugin.getDataFolder(), "anchors.yml"));
             return true;
         } catch (IOException e) {
-            this.plugin.log(Level.SEVERE, "Failed to save anchors.yml. Please check your file permissions.");
+            Logging.severe("Failed to save anchors.yml. Please check your file permissions.");
             return false;
         }
     }

src/main/java/com/onarandombox/MultiverseCore/utils/BukkitTravelAgent.java

@@ -2,6 +2,7 @@ package com.onarandombox.MultiverseCore.utils;
 
 import java.util.logging.Level;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
 import org.bukkit.Location;
@@ -89,7 +90,7 @@ public class BukkitTravelAgent implements TravelAgent {
     private Location getSafeLocation() {
         // At this time, these can never use the velocity.
         if (agent.destination instanceof CannonDestination) {
-            agent.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
+            Logging.fine("Using Stock TP method. This cannon will have 0 velocity");
         }
         SafeTTeleporter teleporter = agent.core.getSafeTTeleporter();
         Location newLoc = agent.destination.getLocation(agent.player);

src/main/java/com/onarandombox/MultiverseCore/utils/CompatibilityLayer.java

@@ -0,0 +1,46 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import com.dumptruckman.minecraft.util.Logging;
+import org.bukkit.Bukkit;
+import org.bukkit.event.player.PlayerRespawnEvent;
+
+import java.lang.reflect.Method;
+
+/**
+ * A utility class to enable version specific minecraft features.
+ */
+public class CompatibilityLayer {
+
+    private static Method checkAnchorSpawn;
+
+    /**
+     * Initialise the reflection methods.
+     */
+    public static void init() {
+        try {
+            checkAnchorSpawn = PlayerRespawnEvent.class.getDeclaredMethod("isAnchorSpawn");
+        } catch (NoSuchMethodException e) {
+            Logging.fine("%s does not support respawn anchors.", Bukkit.getVersion());
+        }
+    }
+
+    /**
+     * Check if the respawn point is of respawn anchor type.
+     * Introduced in minecraft 1.16
+     *
+     * @param event A player respawn event.
+     * @return If the respawn location is an anchor point.
+     */
+    public static boolean isAnchorSpawn(PlayerRespawnEvent event) {
+        if (checkAnchorSpawn == null) {
+            return false;
+        }
+        try {
+            return (boolean) checkAnchorSpawn.invoke(event);
+        } catch (Exception e) {
+            Logging.warning("Error checking for: %s", checkAnchorSpawn);
+            e.printStackTrace();
+        }
+        return false;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java

@@ -72,12 +72,11 @@ public class FileUtils {
      * Helper method to copy the world-folder.
      * @param source Source-File
      * @param target Target-File
-     * @param log A logger that logs the operation
      *
      * @return true if it had success
      */
-    public static boolean copyFolder(File source, File target, Logger log) {
-        return copyFolder(source, target, null, log);
+    public static boolean copyFolder(File source, File target) {
+        return copyFolder(source, target, null);
     }
 
     /**
@@ -85,11 +84,10 @@ public class FileUtils {
      * @param source Source-File
      * @param target Target-File
      * @param excludeFiles files to ignore and not copy over to Target-File
-     * @param log A logger that logs the operation
      *
      * @return true if it had success
      */
-    public static boolean copyFolder(File source, File target, List<String> excludeFiles, Logger log) {
+    public static boolean copyFolder(File source, File target, List<String> excludeFiles) {
         Path sourceDir = source.toPath();
         Path targetDir = target.toPath();
 
@@ -97,7 +95,7 @@ public class FileUtils {
             Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir, excludeFiles));
             return true;
         } catch (IOException e) {
-            log.log(Level.WARNING, "Unable to copy directory", e);
+            Logging.warning("Unable to copy directory", e);
             return false;
         }
     }

src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -100,7 +101,7 @@ public class MVPermissions implements PermissionsInterface {
     public boolean canEnterWorld(Player p, MultiverseWorld w) {
         // If we're not enforcing access, anyone can enter.
         if (!plugin.getMVConfig().getEnforceAccess()) {
-            this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
+            Logging.finest("EnforceAccess is OFF. Player was allowed in " + w.getAlias());
             return true;
         }
         return this.hasPermission(p, "multiverse.access." + w.getName(), false);
@@ -257,14 +258,14 @@ public class MVPermissions implements PermissionsInterface {
 
         boolean hasPermission = sender.hasPermission(node);
         if (!sender.isPermissionSet(node)) {
-            this.plugin.log(Level.FINER, String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
+            Logging.finer(String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
                     ChatColor.RED, node, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA,
                     player.getDisplayName(), ChatColor.WHITE));
         }
         if (hasPermission) {
-            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
+            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
         } else {
-            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
+            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
         }
         return hasPermission;
     }

src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
@@ -195,7 +196,7 @@ public class PermissionTools {
      * @return True if they can't go to the world, False if they can.
      */
     public boolean playerCanGoFromTo(MultiverseWorld fromWorld, MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
-        this.plugin.log(Level.FINEST, "Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
+        Logging.finest("Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
 
         Player teleporterPlayer;
         if (plugin.getMVConfig().getTeleportIntercept()) {

src/main/java/com/onarandombox/MultiverseCore/utils/PurgeWorlds.java

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 
@@ -86,7 +87,7 @@ public class PurgeWorlds {
         }
         int entitiesKilled = 0;
         for (Entity e : world.getEntities()) {
-            this.plugin.log(Level.FINEST, "Entity list (aval for purge) from WORLD < " + mvworld.getName() + " >: " + e.toString());
+            Logging.finest("Entity list (aval for purge) from WORLD < " + mvworld.getName() + " >: " + e.toString());
 
             // Check against Monsters
             if (killMonster(mvworld, e, thingsToKill, negateMonsters)) {
@@ -133,16 +134,16 @@ public class PurgeWorlds {
             entityName = e.toString().replaceAll("Craft", "").toUpperCase();
         }
         if (e instanceof Slime || e instanceof Monster || e instanceof Ghast || e instanceof EnderDragon) {
-            this.plugin.log(Level.FINEST, "Looking at a monster: " + e);
+            Logging.finest("Looking at a monster: " + e);
             if (creaturesToKill.contains(entityName) || creaturesToKill.contains("ALL") || creaturesToKill.contains("MONSTERS")) {
                 if (!negate) {
-                    this.plugin.log(Level.FINEST, "Removing a monster: " + e);
+                    Logging.finest("Removing a monster: " + e);
                     e.remove();
                     return true;
                 }
             } else {
                 if (negate) {
-                    this.plugin.log(Level.FINEST, "Removing a monster: " + e);
+                    Logging.finest("Removing a monster: " + e);
                     e.remove();
                     return true;
                 }

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleLocationManipulation.java

@@ -40,6 +40,15 @@ public class SimpleLocationManipulation implements LocationManipulation {
         orientationInts.put("w", 90);
         orientationInts.put("nw", 135);
 
+        orientationInts.put("north", 180);
+        orientationInts.put("northeast", 225);
+        orientationInts.put("east", 270);
+        orientationInts.put("southeast", 315);
+        orientationInts.put("south", 0);
+        orientationInts.put("southwest", 45);
+        orientationInts.put("west", 90);
+        orientationInts.put("northwest", 135);
+
         // "freeze" the map:
         ORIENTATION_INTS = Collections.unmodifiableMap(orientationInts);
         // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleSafeTTeleporter.java

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
@@ -58,9 +59,9 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
         if (safe != null) {
             safe.setX(safe.getBlockX() + .5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
             safe.setZ(safe.getBlockZ() + .5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-            this.plugin.log(Level.FINE, "Hey! I found one: " + plugin.getLocationManipulation().strCoordsRaw(safe));
+            Logging.fine("Hey! I found one: " + plugin.getLocationManipulation().strCoordsRaw(safe));
         } else {
-            this.plugin.log(Level.FINE, "Uh oh! No safe place found!");
+            Logging.fine("Uh oh! No safe place found!");
         }
         return safe;
     }
@@ -72,8 +73,8 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
         }
         // We want half of it, so we can go up and down
         tolerance /= 2;
-        this.plugin.log(Level.FINER, "Given Location of: " + plugin.getLocationManipulation().strCoordsRaw(l));
-        this.plugin.log(Level.FINER, "Checking +-" + tolerance + " with a radius of " + radius);
+        Logging.finer("Given Location of: " + plugin.getLocationManipulation().strCoordsRaw(l));
+        Logging.finer("Checking +-" + tolerance + " with a radius of " + radius);
 
         // For now this will just do a straight up block.
         Location locToCheck = l.clone();
@@ -191,7 +192,7 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
     @Override
     public TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d) {
         if (d instanceof InvalidDestination) {
-            this.plugin.log(Level.FINER, "Entity tried to teleport to an invalid destination");
+            Logging.finer("Entity tried to teleport to an invalid destination");
             return TeleportResult.FAIL_INVALID;
         }
         Player teleporteePlayer = null;
@@ -248,7 +249,7 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
     public Location getSafeLocation(Entity e, MVDestination d) {
         Location l = d.getLocation(e);
         if (plugin.getBlockSafety().playerCanSpawnHereSafely(l)) {
-            plugin.log(Level.FINE, "The first location you gave me was safe.");
+            Logging.fine("The first location you gave me was safe.");
             return l;
         }
         if (e instanceof Minecart) {
@@ -267,21 +268,21 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
             // Add offset to account for a vehicle on dry land!
             if (e instanceof Minecart && !plugin.getBlockSafety().isEntitiyOnTrack(safeLocation)) {
                 safeLocation.setY(safeLocation.getBlockY() + .5);
-                this.plugin.log(Level.FINER, "Player was inside a minecart. Offsetting Y location.");
+                Logging.finer("Player was inside a minecart. Offsetting Y location.");
             }
-            this.plugin.log(Level.FINE, "Had to look for a bit, but I found a safe place for ya!");
+            Logging.finer("Had to look for a bit, but I found a safe place for ya!");
             return safeLocation;
         }
         if (e instanceof Player) {
             Player p = (Player) e;
             this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
-            this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
+            Logging.finer("No safe location found for " + p.getName());
         } else if (e.getPassenger() instanceof Player) {
             Player p = (Player) e.getPassenger();
             this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
-            this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
+            Logging.finer("No safe location found for " + p.getName());
         }
-        this.plugin.log(Level.FINE, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
+        Logging.fine("Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
         return null;
     }
 

src/main/java/com/onarandombox/MultiverseCore/utils/TestingMode.java

@@ -0,0 +1,18 @@
+package com.onarandombox.MultiverseCore.utils;
+
+/**
+ * A utility class that enables automated tests to flag Multiverse for testing. This allows Multiverse to not perform
+ * certain behaviors such as enabled stats uploads.
+ */
+public class TestingMode {
+
+    private static boolean enabled = false;
+
+    public static void enable() {
+        enabled = true;
+    }
+
+    public static boolean isDisabled() {
+        return !enabled;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java

@@ -91,7 +91,7 @@ public class WorldManager implements MVWorldManager {
                 }
             }
         } else {
-            this.plugin.log(Level.WARNING, "Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
+            Logging.warning("Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
         }
     }
 
@@ -140,7 +140,7 @@ public class WorldManager implements MVWorldManager {
 
         // Make sure the new world doesn't exist outside of multiverse.
         if (newWorldFile.exists()) {
-            Logging.warning("File for new world '%s' already exists", newName);
+            Logging.warning("Folder for new world '%s' already exists", newName);
             return false;
         }
 
@@ -162,14 +162,8 @@ public class WorldManager implements MVWorldManager {
         }
         
         // Grab a bit of metadata from the old world.
-        MVWorld oldWorld = (MVWorld) getMVWorld(oldName);
-        Environment environment = oldWorld.getEnvironment();
-        String seedString = oldWorld.getSeed() + "";
-        WorldType worldType = oldWorld.getWorldType();
-        Boolean generateStructures = oldWorld.getCBWorld().canGenerateStructures();
-        String generator = oldWorld.getGenerator();
-        boolean useSpawnAdjust = oldWorld.getAdjustSpawn();
-        
+        MultiverseWorld oldWorld = getMVWorld(oldName);
+
         // Don't need the loaded world anymore.
         if (wasJustLoaded) {
             this.unloadWorld(oldName, true);
@@ -187,7 +181,7 @@ public class WorldManager implements MVWorldManager {
             oldWorld.getCBWorld().save();
         }
         Logging.config("Copying files for world '%s'", oldName);
-        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, ignoreFiles, Logging.getLogger())) {
+        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, ignoreFiles)) {
             Logging.warning("Failed to copy files for world '%s', see the log info", newName);
             return false;
         }
@@ -208,16 +202,16 @@ public class WorldManager implements MVWorldManager {
 
             // save the worlds config to disk (worlds.yml)
             if (!saveWorldsConfig()) {
-                this.plugin.log(Level.SEVERE, "Failed to save worlds.yml");
+                Logging.severe("Failed to save worlds.yml");
                 return false;
             }
 
             // actually load the world
             if (doLoad(newName)) {
-               this.plugin.log(Level.FINE, "Succeeded at loading cloned world '" + newName + "'");
+               Logging.fine("Succeeded at loading cloned world '" + newName + "'");
                return true;
             }
-            this.plugin.log(Level.SEVERE, "Failed to load the cloned world '" + newName + "'");
+            Logging.severe("Failed to load the cloned world '" + newName + "'");
             return false;
         }
 
@@ -290,7 +284,7 @@ public class WorldManager implements MVWorldManager {
         Logging.info(builder.toString());
 
         if (!doLoad(c, true)) {
-            this.plugin.log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
+            Logging.severe("Failed to Create/Load the world '" + name + "'");
             return false;
         }
 
@@ -363,7 +357,7 @@ public class WorldManager implements MVWorldManager {
         MultiverseWorld world = this.getMVWorld(this.firstSpawn);
         if (world == null) {
             // If the spawn world was unloaded, get the default world
-            this.plugin.log(Level.WARNING, "The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
+            Logging.warning("The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
             try {
                 return this.getMVWorld(this.plugin.getServer().getWorlds().get(0));
             } catch (IndexOutOfBoundsException e) {
@@ -446,15 +440,15 @@ public class WorldManager implements MVWorldManager {
     }
 
     private void brokenWorld(String name) {
-        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
-        this.plugin.log(Level.SEVERE, "Try using Minecraft Region Fixer to repair your world! '" + name + "'");
-        this.plugin.log(Level.SEVERE, "https://github.com/Fenixin/Minecraft-Region-Fixer");
+        Logging.severe("The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
+        Logging.severe("Try using Minecraft Region Fixer to repair your world! '" + name + "'");
+        Logging.severe("https://github.com/Fenixin/Minecraft-Region-Fixer");
     }
 
     private void nullWorld(String name) {
-        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because the server didn't like it!");
-        this.plugin.log(Level.SEVERE, "We don't really know why this is. Contact the developer of your server software!");
-        this.plugin.log(Level.SEVERE, "Server version info: " + Bukkit.getServer().getVersion());
+        Logging.severe("The world '" + name + "' could NOT be loaded because the server didn't like it!");
+        Logging.severe("We don't really know why this is. Contact the developer of your server software!");
+        Logging.severe("Server version info: " + Bukkit.getServer().getVersion());
     }
 
     private boolean doLoad(String name) {
@@ -494,8 +488,8 @@ public class WorldManager implements MVWorldManager {
             throw new IllegalArgumentException("That world is already loaded!");
 
         if (!ignoreExists && !new File(this.plugin.getServer().getWorldContainer(), worldName).exists() && !new File(this.plugin.getServer().getWorldContainer().getParent(), worldName).exists()) {
-            this.plugin.log(Level.WARNING, "WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
-            this.plugin.log(Level.WARNING, "Use '/mv remove' to remove it from the config!");
+            Logging.warning("WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
+            Logging.warning("Use '/mv remove' to remove it from the config!");
             return false;
         }
 
@@ -525,6 +519,13 @@ public class WorldManager implements MVWorldManager {
      */
     @Override
     public boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder) {
+        if (this.hasUnloadedWorld(name, false)) {
+            // Attempt to load if unloaded so we can actually delete the world
+            if (!this.doLoad(name)) {
+                return false;
+            }
+        }
+
         World world = this.plugin.getServer().getWorld(name);
         if (world == null) {
             // We can only delete loaded worlds
@@ -535,7 +536,7 @@ public class WorldManager implements MVWorldManager {
         MVWorldDeleteEvent mvwde = new MVWorldDeleteEvent(getMVWorld(name), removeFromConfig);
         this.plugin.getServer().getPluginManager().callEvent(mvwde);
         if (mvwde.isCancelled()) {
-            this.plugin.log(Level.FINE, "Tried to delete a world, but the event was cancelled!");
+            Logging.fine("Tried to delete a world, but the event was cancelled!");
             return false;
         }
 
@@ -551,7 +552,7 @@ public class WorldManager implements MVWorldManager {
 
         try {
             File worldFile = world.getWorldFolder();
-            plugin.log(Level.FINER, "deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
+            Logging.finer("deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
             if (deleteWorldFolder ? FileUtils.deleteFolder(worldFile) : FileUtils.deleteFolderContents(worldFile)) {
                 Logging.info("World '%s' was DELETED.", name);
                 return true;
@@ -865,7 +866,7 @@ public class WorldManager implements MVWorldManager {
             this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
             return true;
         } catch (IOException e) {
-            this.plugin.log(Level.SEVERE, "Could not save worlds.yml. Please check your settings.");
+            Logging.severe("Could not save worlds.yml. Please check your settings.");
             return false;
         }
     }
@@ -937,6 +938,9 @@ public class WorldManager implements MVWorldManager {
         return this.configWorlds;
     }
 
+    /**
+     * {@inheritDoc}
+     */
 	@Override
 	public boolean hasUnloadedWorld(String name, boolean includeLoaded) {
 		if (getMVWorld(name) != null) {

src/test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java

@@ -50,6 +50,10 @@ public class TestEntryFeeConversion {
         WorldProperties props = new WorldProperties(config);
         assertNull(props.entryfee.getCurrency());
 
+        entryFee.put("currency", 0);
+        props = new WorldProperties(config);
+        assertNull(props.entryfee.getCurrency());
+
         entryFee.put("currency", 1);
         props = new WorldProperties(config);
         assertEquals(Material.STONE, props.entryfee.getCurrency());

src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java

@@ -81,7 +81,7 @@ public class FileUtilsTest {
         assertFalse(Files.isDirectory(targetChildDir));
         assertFalse(Files.isRegularFile(targetChildDirFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -107,7 +107,7 @@ public class FileUtilsTest {
         assertFalse(Files.isRegularFile(targetChildDirFile));
         assertFalse(Files.isRegularFile(targetChildIgnoreFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), excludeFiles, Logging.getLogger()));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), excludeFiles));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -129,7 +129,7 @@ public class FileUtilsTest {
         assertFalse(Files.isDirectory(targetChildDir));
         assertFalse(Files.isRegularFile(targetChildDirFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -145,6 +145,6 @@ public class FileUtilsTest {
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
 
-        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
+        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
     }
 }

src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java

@@ -64,6 +64,7 @@ public class TestInstanceCreator {
     public static final File worldsDirectory = new File("bin/test/server");
 
     public boolean setUp() {
+        TestingMode.enable();
         try {
             pluginDirectory.mkdirs();
             assertTrue(pluginDirectory.exists());
@@ -213,11 +214,18 @@ public class TestInstanceCreator {
             serverfield.set(core, mockServer);
 
             // Set buscript
-            Buscript buscript = PowerMockito.spy(new Buscript(core));
+            Buscript buscript;
             Field buscriptfield = MultiverseCore.class.getDeclaredField("buscript");
             buscriptfield.setAccessible(true);
+
+            try {
+                buscript = PowerMockito.spy(new Buscript(core));
+                when(buscript.getPlugin()).thenReturn(core);
+            } catch (NullPointerException e) {
+                buscript = null;
+            }
+
             buscriptfield.set(core, buscript);
-            when(buscript.getPlugin()).thenReturn(core);
 
             // Set worldManager
             WorldManager wm = PowerMockito.spy(new WorldManager(core));