Implement suggested improvements.

* Use singleton pattern for DefaultContentFilter with getInstance method. * Have a default SendHandler. * Don't need streams for small dataset. * Private WorldListContentParser class to improve readability.
Revamp content display API.
2021-08-17 16:29:31 +08:00 · 2021-08-17 00:26:57 +08:00 · 2021-07-22 10:12:35 +08:00 · 2021-07-21 22:11:09 -04:00 · 2021-07-19 20:14:17 -04:00 · 2021-07-19 20:12:25 -04:00
84 changed files with 2785 additions and 694 deletions
@@ -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/ -->

@@ -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/ -->

@@ -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: ''

 ---
@@ -0,0 +1,22 @@
+name: Maven CI/CD
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build_and_test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
@@ -1,6 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-notifications:
-  email: false
-dist: trusty
@@ -0,0 +1,6 @@
+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.
+
@@ -1,11 +1,43 @@
+![Multiverse 2](config/multiverse2-long.png)
+
+[![Maven CI/CD](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml/badge.svg)](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml)
+[![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/Multiverse-Core?label=release&server=https%3A%2F%2Frepo.onarandombox.com%2F)](https://dev.bukkit.org/projects/multiverse-core)
+[![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/Multiverse-Core?label=dev%20builds&server=http%3A%2F%2Frepo.onarandombox.com%2F)](https://ci.onarandombox.com/job/Multiverse-Core/)
+[![Discord](https://img.shields.io/discord/325459248047980545?label=discord&logo=discord)](https://discord.gg/NZtfKky)
+[![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
+
+About
+========
+[Multiverse](https://dev.bukkit.org/projects/multiverse-core) was created at the dawn of Bukkit multiworld support. It has since then grown into a **complete world management solution!** Multiverse provides the easiest to use world management solution for your Minecraft server, big or small, and with great addons like [Portals](https://dev.bukkit.org/projects/multiverse-portals) and [NetherPortals](https://dev.bukkit.org/projects/multiverse-netherportals/), what's not to love!
+<br><br>
+Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
+
+### Amazing sub-modules available:
+* [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
+* [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
+* [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
+
 Building
 ========
 Simply build the source with maven:
-
-    $ mvn install
-
+```
+$ mvn install
+```
 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).

+
+Contributing
+=======
+**Want to help improve Multiverse?** There are several ways you can support and contribute to the project.
+* Take a look at our "Bug: Unconfirmed" issues, where you can find issues that need extra testing and investigation.
+* Want others to love Multiverse too? You can join the [Multiverse Discord community](https://discord.gg/NZtfKky) and help others with issues and setup!
+* A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) with your latest tip, tricks and guides! The wiki open for all to edit and improve.
+* Love coding? You could look at ["State: Open to PR"](https://github.com/Multiverse/Multiverse-Core/labels/State%3A%20Open%20to%20PR) and ["Resolution: Accepted"](https://github.com/Multiverse/Multiverse-Core/labels/Resolution%3A%20Accepted) issues. We're always happy to receive bug fixes and feature additions as [pull requests](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/).
+* If you'd like to make a financial contribution to the project, do consider joining our [patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
+
+Additionally, we would like to give a big thanks to everyone that has supported Multiverse over the years, as well as those in the years to come. Thank you!
+
 License
 =======
 Copyright (c) 2011, The Multiverse Team All rights reserved.
@@ -13,4 +45,3 @@ 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.
- 
@@ -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.3.1-SNAPSHOT</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
@@ -20,31 +20,27 @@
        </repository>
        <repository>
            <id>onarandombox</id>
-            <url>http://repo.onarandombox.com/content/groups/public</url>
+            <url>https://repo.onarandombox.com/content/groups/public</url>
        </repository>
        <repository>
            <id>spigot</id>
            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
        </repository>
        <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
        </repository>
        <repository>
            <id>minebench-repo</id>
            <url>https://repo.minebench.de/</url>
        </repository>
-        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
-        </repository>
    </repositories>

    <pluginRepositories>
        <pluginRepository>
            <id>doodleproject-repo</id>
            <name>DoodleProject Maven 2 Repository</name>
-            <url>http://doodleproject.sourceforge.net/maven2/release</url>
+            <url>https://doodleproject.sourceforge.net/maven2/release</url>
            <releases>
                <enabled>true</enabled>
            </releases>
@@ -53,7 +49,7 @@

    <ciManagement>
        <system>jenkins</system>
-        <url>http://ci.onarandombox.com</url>
+        <url>https://ci.onarandombox.com</url>
    </ciManagement>

    <!-- Profiles are used to detect whether this is a local or Jenkins build
@@ -158,8 +154,6 @@
                <artifactId>maven-surefire-plugin</artifactId>
                <version>3.0.0-M3</version>
                <configuration>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
                    <excludes>
                        <exclude>**/TestCommandSender.java</exclude>
                        <exclude>**/TestInstanceCreator.java</exclude>
@@ -215,7 +209,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>
@@ -223,6 +217,7 @@
                            <goal>shade</goal>
                        </goals>
                        <configuration>
+                            <minimizeJar>true</minimizeJar>
                            <relocations>
                                <relocation>
                                    <pattern>me.main__.util</pattern>
@@ -264,13 +259,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>
@@ -299,7 +300,7 @@
        <!-- End of SerializationConfig Dependency -->
        <!-- Start of Economy Dependency -->
        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
+            <groupId>com.github.MilkBowl</groupId>
            <artifactId>VaultAPI</artifactId>
            <version>1.7</version>
            <scope>provided</scope>
@@ -319,13 +320,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.2.1</version>
        </dependency>
        <dependency>
            <groupId>com.dumptruckman.minecraft</groupId>
@@ -351,30 +346,9 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.0</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.0</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.0</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>4.0.2</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.11.2</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -387,11 +361,11 @@
    <distributionManagement>
        <repository>
            <id>OnARandomBox</id>
-            <url>http://repo.onarandombox.com/content/repositories/multiverse</url>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse</url>
        </repository>
        <snapshotRepository>
            <id>OnARandomBox</id>
-            <url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
 </project>
@@ -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!!!");
                }
            }
        }
@@ -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,27 @@ 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! " +
+                        "If you would like not to see this message, " +
+                        "use `/mv conf enablebuscript false` to disable Buscript from loading.");
+            }
        }
    }

@@ -380,7 +394,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 +513,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 +532,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 +698,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 +716,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 +850,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 +922,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 +1083,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;
        }
    }
@@ -1104,12 +1131,22 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

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

    /**
@@ -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;
@@ -94,17 +96,18 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        enforceaccess = false;
        useasyncchat = true;
-        prefixchat = true;
+        prefixchat = false;
        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
        displaypermerrors = true;
+        enablebuscript = true;
        globaldebug = 0;
        messagecooldown = 5000;
        teleportcooldown = 1000;
        this.version = 2.9;
        silentstart = false;
-        defaultportalsearch = false;
+        defaultportalsearch = true;
        portalsearchradius = 128;
        autopurge = true;
        idonotwanttodonate = false;
@@ -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}
     */
@@ -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.
@@ -116,20 +126,38 @@ public interface Core {
    AnchorManager getAnchorManager();

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

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

+    /**
+     * Returns a {@link MultiverseWorld} if the world with name given exists, and null if it does not.
+     * This will search optionally for alias names.
+     *
+     * @param name          The name or optionally the alias of the world to get.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return A {@link MultiverseWorld} or null.
+     */
+    MultiverseWorld getMVWorld(String name, boolean checkAliases);
+
    /**
     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
     *
@@ -183,13 +193,24 @@ public interface MVWorldManager {
    MultiverseWorld getMVWorld(World world);

    /**
-     * Checks to see if the given name is a valid {@link MultiverseWorld}.
+     * Checks to see if the given name is a valid {@link MultiverseWorld}
+     * Searches based on world name AND alias.
     *
     * @param name The name or alias of the world to check.
     * @return True if the world exists, false if not.
     */
    boolean isMVWorld(String name);

+    /**
+     * Checks to see if the given name is a valid {@link MultiverseWorld}.
+     * Optionally searches by alias is specified.
+     *
+     * @param name          The name or alias of the world to check.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return True if the world exists, false if not.
+     */
+    boolean isMVWorld(String name, boolean checkAliases);
+
    /**
     * Checks to see if the given world is a valid {@link MultiverseWorld}.
     *
@@ -292,15 +313,28 @@ public interface MVWorldManager {
    /**
     * Regenerates a world.
     *
-     * @param name Name of the world to regenerate
-     * @param useNewSeed If a new seed should be used
-     * @param randomSeed IF the new seed should be random
-     * @param seed The seed of the world.
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
     *
     * @return True if success, false if fail.
     */
    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);

+    /**
+     * Regenerates a world.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     * @param keepGameRules If GameRules should be kept on world regen.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules);
+
    boolean isKeepingSpawnInMemory(World world);
    
    /**
@@ -314,4 +348,11 @@ public interface MVWorldManager {
     * does not exist. {@code includeLoaded} if the world exists and is loaded.
     */
    boolean hasUnloadedWorld(String name, boolean includeLoaded);
+
+    /**
+     * Get all the possible worlds that Multiverse has detected to be importable.
+     *
+     * @return A collection of world names that are deemed importable.
+     */
+    Collection<String> getPotentialWorlds();
 }
@@ -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.
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -37,7 +38,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 = PlayerFinder.get(args.get(0), sender);
        if (p == null) {
            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
            sender.sendMessage("Are they online?");
@@ -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);
    }

 }
@@ -46,10 +46,15 @@ public class CreateCommand extends MultiverseCommand {
        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
        this.worldManager = this.plugin.getMVWorldManager();
    }
-
+	
+	private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
+    }
+	
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
+        String worldName = trimWorldName(args.get(0));
        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
        String env = args.get(1);
        String seed = CommandHandler.getFlag("-s", args);
@@ -66,7 +71,13 @@ public class CreateCommand extends MultiverseCommand {
                useSpawnAdjust = false;
            }
        }
-
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}
+		
        if (this.worldManager.isMVWorld(worldName)) {
            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
@@ -117,4 +128,4 @@ public class CreateCommand extends MultiverseCommand {
            Command.broadcastCommandMessage(sender, "FAILED.");
        }
    }
-}
+}
@@ -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");
        }
    }
 }
@@ -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));
+        };
    }
 }
@@ -8,6 +8,12 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter;
+import com.onarandombox.MultiverseCore.display.handlers.InlineSendHandler;
+import com.onarandombox.MultiverseCore.display.parsers.MapContentParser;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameRule;
@@ -16,7 +22,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 /**
 * Allows management of Anchor Destinations.
@@ -26,8 +34,8 @@ public class GamerulesCommand extends MultiverseCommand {
    public GamerulesCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("List the Minecraft Game Rules for a World.");
-        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(0, 1);
+        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD] [FILTER]");
+        this.setArgRange(0, 2);
        this.addKey("mv gamerules");
        this.addKey("mv rules");
        this.addKey("mvgamerules");
@@ -37,11 +45,13 @@ public class GamerulesCommand extends MultiverseCommand {
        this.setPermission("multiverse.core.gamerule.list", "Allows a player to list gamerules.", PermissionDefault.OP);
    }

-
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        // We NEED a world from the command line
-        final Player p;
+        Player p;
+        World world;
+        ContentFilter filter = DefaultContentFilter.getInstance();
+
        if (sender instanceof Player) {
            p = (Player) sender;
        } else {
@@ -56,9 +66,20 @@ public class GamerulesCommand extends MultiverseCommand {
            return;
        }

-        final World world;
+        // Not the best way, need to fix with ACF soon...
        if (args.size() == 0) {
            world = p.getWorld();
+        } else if (args.size() == 1) {
+            world = Bukkit.getWorld(args.get(0));
+            if (world == null) {
+                if (p == null) {
+                    sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
+                            + ChatColor.WHITE + " does not exist.");
+                    return;
+                }
+                world = p.getWorld();
+                filter = RegexContentFilter.fromString(args.get(0));
+            }
        } else {
            world = Bukkit.getWorld(args.get(0));
            if (world == null) {
@@ -66,17 +87,25 @@ public class GamerulesCommand extends MultiverseCommand {
                        + ChatColor.WHITE + " does not exist.");
                return;
            }
+            filter = RegexContentFilter.fromString(args.get(1));
        }

-        final StringBuilder gameRules = new StringBuilder();
-        for (final String gameRule : world.getGameRules()) {
-            if (gameRules.length() != 0) {
-                gameRules.append(ChatColor.WHITE).append(", ");
-            }
-            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
-            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(GameRule.getByName(gameRule)));
+        ContentDisplay.create()
+                .addContentParser(MapContentParser.forContent(getGameRuleMap(world))
+                        .withKeyColor(ChatColor.GREEN)
+                        .withValueColor(ChatColor.YELLOW))
+                .withSendHandler(InlineSendHandler.create()
+                        .withHeader("====[ Gamerules for %s%s%s ]====", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
+                        .withFilter(filter))
+                .send(sender);
+    }
+
+    private Map<String, Object> getGameRuleMap(World world) {
+        Map<String, Object> gameRuleMap = new HashMap<>();
+        for (GameRule<?> rule : GameRule.values()) {
+            Object value = world.getGameRuleValue(rule);
+            gameRuleMap.put(rule.getName(), value);
        }
-        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
-        sender.sendMessage(gameRules.toString());
+        return gameRuleMap;
    }
 }
@@ -40,24 +40,16 @@ public class HelpCommand extends PaginatedCoreCommand<Command> {

    @Override
    protected List<Command> getFilteredItems(List<Command> availableItems, String filter) {
+        String expression = "(?i).*" + cleanFilter(filter) + ".*";
        List<Command> filtered = new ArrayList<Command>();

        for (Command c : availableItems) {
-            if (stitchThisString(c.getKeyStrings()).matches("(?i).*" + filter + ".*")) {
+            if (stitchThisString(c.getKeyStrings()).matches(expression)
+                    || c.getCommandName().matches(expression)
+                    || c.getCommandDesc().matches(expression)
+                    || c.getCommandUsage().matches(expression)
+                    || c.getCommandExamples().stream().anyMatch(eg -> eg.matches(expression))) {
                filtered.add(c);
-            } else if (c.getCommandName().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandDesc().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandUsage().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else {
-                for (String example : c.getCommandExamples()) {
-                    if (example.matches("(?i).*" + filter + ".*")) {
-                        filtered.add(c);
-                        break;
-                    }
-                }
            }
        }
        return filtered;
@@ -9,7 +9,7 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.WorldNameChecker;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
@@ -18,8 +18,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

@@ -45,55 +43,17 @@ public class ImportCommand extends MultiverseCommand {
        this.worldManager = this.plugin.getMVWorldManager();
    }

-    /**
-     * A very basic check to see if a folder has a level.dat file.
-     * If it does, we can safely assume it's a world folder.
-     *
-     * @param worldFolder The File that may be a world.
-     * @return True if it looks like a world, false if not.
-     */
-    private static boolean checkIfIsWorld(File worldFolder) {
-        if (worldFolder.isDirectory()) {
-            File[] files = worldFolder.listFiles(new FilenameFilter() {
-                @Override
-                public boolean accept(File file, String name) {
-                    return name.toLowerCase().endsWith(".dat");
-                }
-            });
-            if (files != null && files.length > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private String getPotentialWorlds() {
-        File worldFolder = this.plugin.getServer().getWorldContainer();
-        if (worldFolder == null) {
-            return "";
-        }
-        File[] files = worldFolder.listFiles();
-        String worldList = "";
-        Collection<MultiverseWorld> worlds = this.worldManager.getMVWorlds();
-        List<String> worldStrings = new ArrayList<String>();
-        for (MultiverseWorld world : worlds) {
-            worldStrings.add(world.getName());
-        }
-        for (String world : this.worldManager.getUnloadedWorlds()) {
-            worldStrings.add(world);
-        }
+    private String getPotentialWorldStrings() {
+        final Collection<String> potentialWorlds = this.worldManager.getPotentialWorlds();
+        StringBuilder worldList = new StringBuilder();
        ChatColor currColor = ChatColor.WHITE;
-        for (File file : files) {
-            if (file.isDirectory() && checkIfIsWorld(file) && !worldStrings.contains(file.getName())) {
-                worldList += currColor + file.getName() + " ";
-                if (currColor == ChatColor.WHITE) {
-                    currColor = ChatColor.YELLOW;
-                } else {
-                    currColor = ChatColor.WHITE;
-                }
-            }
+
+        for (String world : potentialWorlds) {
+            worldList.append(currColor).append(world).append(' ');
+            currColor = currColor == ChatColor.WHITE ? ChatColor.YELLOW : ChatColor.WHITE;
        }
-        return worldList;
+
+        return worldList.toString();
    }
    
    private String trimWorldName(String userInput) {
@@ -106,7 +66,7 @@ public class ImportCommand extends MultiverseCommand {
        String worldName = trimWorldName(args.get(0));

        if (worldName.toLowerCase().equals("--list") || worldName.toLowerCase().equals("-l")) {
-            String worldList = this.getPotentialWorlds();
+            String worldList = this.getPotentialWorldStrings();
            if (worldList.length() > 2) {
                sender.sendMessage(ChatColor.AQUA + "====[ These look like worlds ]====");
                sender.sendMessage(worldList);
@@ -121,6 +81,12 @@ public class ImportCommand extends MultiverseCommand {
            this.showHelp(sender);
            return;
        }
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}

        // Make sure we don't already know about this world.
        if (this.worldManager.isMVWorld(worldName)) {
@@ -149,10 +115,10 @@ public class ImportCommand extends MultiverseCommand {

        if (!worldFile.exists()) {
            sender.sendMessage(ChatColor.RED + "FAILED.");
-            String worldList = this.getPotentialWorlds();
+            String worldList = this.getPotentialWorldStrings();
            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
            sender.sendMessage(worldList);
-        } else if (!checkIfIsWorld(worldFile)) {
+        } else if (!WorldNameChecker.isValidWorldFolder(worldFile)) {
            sender.sendMessage(ChatColor.RED + "FAILED.");
            sender.sendMessage(String.format("'%s' does not appear to be a world. It is lacking a .dat file.",
                                             worldName));
@@ -168,4 +134,4 @@ public class ImportCommand extends MultiverseCommand {
                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
        }
    }
-}
+}
@@ -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));
@@ -9,122 +9,112 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter;
+import com.onarandombox.MultiverseCore.display.handlers.PagedSendHandler;
+import com.onarandombox.MultiverseCore.display.parsers.ContentParser;
 import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

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

 /**
 * Displays a listing of all worlds that a player can enter.
 */
-public class ListCommand extends PaginatedCoreCommand<String> {
+public class ListCommand extends MultiverseCommand {

    public ListCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("World Listing");
-        this.setCommandUsage("/mv list [page]");
+        this.setCommandUsage("/mv list [filter] [page]");
        this.setArgRange(0, 2);
        this.addKey("mvlist");
        this.addKey("mvl");
        this.addKey("mv list");
        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
-        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-    }
-
-    private List<String> getFancyWorldList(Player p) {
-        List<String> worldList = new ArrayList<String>();
-        for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {
-
-            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
-                continue;
-            }
-
-            ChatColor color = ChatColor.GOLD;
-            Environment env = world.getEnvironment();
-            if (env == Environment.NETHER) {
-                color = ChatColor.RED;
-            } else if (env == Environment.NORMAL) {
-                color = ChatColor.GREEN;
-            } else if (env == Environment.THE_END) {
-                color = ChatColor.AQUA;
-            }
-            StringBuilder builder = new StringBuilder();
-            builder.append(world.getColoredWorldString()).append(ChatColor.WHITE);
-            builder.append(" - ").append(color).append(world.getEnvironment());
-            if (world.isHidden()) {
-                if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.core.modify", true)) {
-                    // Prefix hidden worlds with an "[H]"
-                    worldList.add(ChatColor.GRAY + "[H]" + builder.toString());
-                }
-            } else {
-                worldList.add(builder.toString());
-            }
-        }
-        for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
-            if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + name, true)) {
-                worldList.add(ChatColor.GRAY + name + " - UNLOADED");
-            }
-        }
-        return worldList;
-    }
-
-    @Override
-    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
-        List<String> filtered = new ArrayList<String>();
-
-        for (String s : availableItems) {
-            if (s.matches("(?i).*" + filter + ".*")) {
-                filtered.add(s);
-            }
-        }
-        return filtered;
-    }
-
-    @Override
-    protected String getItemText(String item) {
-        return item;
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse World List ]====");
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
+        ContentFilter filter = DefaultContentFilter.getInstance();
+        int page = 1;

-
-        FilterObject filterObject = this.getPageAndFilter(args);
-
-        List<String> availableWorlds = new ArrayList<String>(this.getFancyWorldList(p));
-        if (filterObject.getFilter().length() > 0) {
-            availableWorlds = this.getFilteredItems(availableWorlds, filterObject.getFilter());
-            if (availableWorlds.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
-                        + "No worlds matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
-                return;
+        // Either page or filter.
+        if (args.size() == 1) {
+            try {
+                page = Integer.parseInt(args.get(0));
+            } catch (NumberFormatException ignore) {
+                filter = RegexContentFilter.fromString(args.get(0));
            }
        }

-        if (!(sender instanceof Player)) {
-            for (String c : availableWorlds) {
-                sender.sendMessage(c);
+        // Filter then page.
+        if (args.size() == 2) {
+            filter = RegexContentFilter.fromString(args.get(0));
+            try {
+                page = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ignore) {
+                sender.sendMessage(ChatColor.RED + args.get(1) + " is not valid number!");
            }
-            return;
        }

-        int totalPages = (int) Math.ceil(availableWorlds.size() / (this.itemsPerPage + 0.0));
+        ContentDisplay.create()
+                .addContentParser(new WorldListContentParser())
+                .withSendHandler(PagedSendHandler.create()
+                        .withHeader("%s====[ Multiverse World List ]====", ChatColor.GOLD)
+                        .withFilter(filter)
+                        .withTargetPage(page))
+                .send(sender);
+    }

-        if (filterObject.getPage() > totalPages) {
-            filterObject.setPage(totalPages);
+    private class WorldListContentParser implements ContentParser {
+
+        @Override
+        public void parse(@NotNull CommandSender sender, @NotNull List<String> content) {
+            Player player = (sender instanceof Player) ? (Player) sender : null;
+
+            plugin.getMVWorldManager().getMVWorlds().stream()
+                    .filter(world -> player == null || plugin.getMVPerms().canEnterWorld(player, world))
+                    .filter(world -> canSeeWorld(player, world))
+                    .map(world -> hiddenText(world) + world.getColoredWorldString() + " - " + parseColouredEnvironment(world.getEnvironment()))
+                    .forEach(content::add);
+
+            plugin.getMVWorldManager().getUnloadedWorlds().stream()
+                    .filter(world -> plugin.getMVPerms().hasPermission(sender, "multiverse.access." + world, true))
+                    .map(world -> ChatColor.GRAY + world + " - UNLOADED")
+                    .forEach(content::add);
        }

-        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+        private boolean canSeeWorld(Player player, MultiverseWorld world) {
+            return !world.isHidden()
+                    || player == null
+                    || plugin.getMVPerms().hasPermission(player, "multiverse.core.modify", true);
+        }

-        this.showPage(filterObject.getPage(), sender, availableWorlds);
+        private String hiddenText(MultiverseWorld world) {
+            return (world.isHidden()) ? String.format("%s[H] ", ChatColor.GRAY) : "";
+        }
+
+        private String parseColouredEnvironment(World.Environment env) {
+            ChatColor color = ChatColor.GOLD;
+            switch (env) {
+                case NETHER:
+                    color = ChatColor.RED;
+                    break;
+                case NORMAL:
+                    color = ChatColor.GREEN;
+                    break;
+                case THE_END:
+                    color = ChatColor.AQUA;
+                    break;
+            }
+            return color + env.toString();
+        }
    }
 }
@@ -13,12 +13,14 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;

 import java.util.List;
+import java.util.regex.Pattern;

 /**
 * A generic paginated command.
 * @param <T> The type of items on the page.
 */
 public abstract class PaginatedCommand<T> extends Command {
+    private final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
    private static final int DEFAULT_ITEMS_PER_PAGE = 9;
    /**
     * The number of items per page.
@@ -40,12 +42,23 @@ public abstract class PaginatedCommand<T> extends Command {

    /**
     * Gets filtered items.
+     *
     * @param availableItems All available items.
     * @param filter The filter-{@link String}.
     * @return A list of items that match the filter.
     */
    protected abstract List<T> getFilteredItems(List<T> availableItems, String filter);

+    /**
+     * Escape regex special characters from filter
+     *
+     * @param filter The filter-{@link String}.
+     * @return String with regex characters escaped
+     */
+    protected String cleanFilter(String filter) {
+        return REGEX_SPECIAL_CHARS.matcher(filter).replaceAll("\\\\$0");
+    }
+
    /**
     * Constructs a single string from a list of strings.
     *
@@ -8,11 +8,13 @@
 package com.onarandombox.MultiverseCore.commands;

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

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

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

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

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

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -50,7 +51,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 = PlayerFinder.get(args.get(0), sender);
            if (target != null) {
                target.sendMessage("Teleporting to this world's spawn...");
                spawnAccurately(target);
@@ -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;
@@ -17,6 +19,7 @@ import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.enums.TeleportResult;
 import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -27,7 +30,6 @@ import org.bukkit.permissions.PermissionDefault;

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

 /**
 * Used to teleport players.
@@ -58,7 +60,7 @@ public class TeleportCommand extends MultiverseCommand {
        String destinationName;

        if (args.size() == 2) {
-            teleportee = this.plugin.getServer().getPlayer(args.get(0));
+            teleportee = PlayerFinder.get(args.get(0), sender);
            if (teleportee == null) {
                this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
                        ChatColor.GOLD, args.get(0)), false);
@@ -74,27 +76,14 @@ public class TeleportCommand extends MultiverseCommand {
            }
            teleportee = (Player) sender;
        }
-        // Special case for cannons:
-        if (destinationName.matches("(?i)cannon-[\\d]+(\\.[\\d]+)?")) {
-            String[] cannonSpeed = destinationName.split("-");
-            try {
-                double speed = Double.parseDouble(cannonSpeed[1]);
-                destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX()
-                        + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":"
-                        + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
-            } catch (Exception e) {
-                destinationName = "i:invalid";
-            }

-        }
        DestinationFactory df = this.plugin.getDestFactory();
-        MVDestination d = df.getDestination(destinationName);
-
+        MVDestination d = df.getPlayerAwareDestination(teleportee, destinationName);

        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 +151,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)) {
@@ -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;

@@ -50,63 +45,67 @@ public class VersionCommand extends MultiverseCommand {
        this.addKey("mvver");
        this.addKey("mvv");
        this.addKey("mvversion");
-        this.setPermission("multiverse.core.version",
-                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.", PermissionDefault.TRUE);
+        this.setPermission(
+                "multiverse.core.version",
+                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.",
+                PermissionDefault.OP)
+        ;
    }

    private String getLegacyString() {
-        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 +113,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 +138,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);
            }
        }

@@ -0,0 +1,161 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.block.data.type.CommandBlock;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+/**
+ * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
+ *
+ * <p>Each sender can only have one command in queue at any given time. When a queued command is added
+ * for a sender that already has a command in queue, it will replace the old queued command.</p>
+ */
+public class CommandQueueManager {
+
+    private static final long TICKS_PER_SECOND = 20;
+    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
+
+    private final MultiverseCore plugin;
+    private final Map<CommandSender, QueuedCommand> queuedCommandMap;
+
+    public CommandQueueManager(@NotNull MultiverseCore plugin) {
+        this.plugin = plugin;
+        this.queuedCommandMap = new WeakHashMap<>();
+    }
+
+    /**
+     * Adds a {@link QueuedCommand} into queue.
+     *
+     * @param queuedCommand The queued command to add.
+     */
+    public void addToQueue(QueuedCommand queuedCommand) {
+        CommandSender targetSender = parseSender(queuedCommand.getSender());
+
+        // Since only one command is stored in queue per sender, we remove the old one.
+        this.removeFromQueue(targetSender);
+
+        Logging.finer("Add new command to queue for sender %s.", targetSender);
+        this.queuedCommandMap.put(targetSender, queuedCommand);
+        queuedCommand.setExpireTask(runExpireLater(queuedCommand));
+
+        queuedCommand.getSender().sendMessage(queuedCommand.getPrompt());
+        queuedCommand.getSender().sendMessage(String.format("Run %s/mv confirm %sto continue. This will expire in %s seconds.",
+                ChatColor.GREEN, ChatColor.WHITE, queuedCommand.getValidDuration()));
+    }
+
+    /**
+     * Expire task that removes a {@link QueuedCommand} from queue after valid duration defined.
+     *
+     * @param queuedCommand Command to run the expire task on.
+     * @return The expire {@link BukkitTask}.
+     */
+    @NotNull
+    private BukkitTask runExpireLater(@NotNull QueuedCommand queuedCommand) {
+        return Bukkit.getScheduler().runTaskLater(
+                this.plugin,
+                expireRunnable(queuedCommand),
+                queuedCommand.getValidDuration() * TICKS_PER_SECOND
+        );
+    }
+
+    /**
+     * Runnable responsible for expiring the queued command.
+     *
+     * @param queuedCommand Command to create the expire task on.
+     * @return The expire runnable.
+     */
+    @NotNull
+    private Runnable expireRunnable(@NotNull QueuedCommand queuedCommand) {
+        return () -> {
+            CommandSender targetSender = parseSender(queuedCommand.getSender());
+            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(targetSender);
+            if (!queuedCommand.equals(matchingQueuedCommand) || queuedCommand.getExpireTask().isCancelled()) {
+                // To be safe, but this shouldn't happen since we cancel old commands before add new once.
+                Logging.finer("This is an old queue command already.");
+                return;
+            }
+            queuedCommand.getSender().sendMessage("Your queued command has expired.");
+            this.queuedCommandMap.remove(queuedCommand.getSender());
+        };
+    }
+
+    /**
+     * Runs the command in queue for the given sender, if any.
+     *
+     * @param sender    {@link CommandSender} that confirmed the command.
+     * @return True if queued command ran successfully, else false.
+     */
+    public boolean runQueuedCommand(@NotNull CommandSender sender) {
+        CommandSender targetSender = parseSender(sender);
+        QueuedCommand queuedCommand = this.queuedCommandMap.get(targetSender);
+        if (queuedCommand == null) {
+            sender.sendMessage(ChatColor.RED + "You do not have any commands in queue.");
+            return false;
+        }
+        Logging.finer("Running queued command...");
+        queuedCommand.getAction().run();
+        return removeFromQueue(targetSender);
+    }
+
+    /**
+     * Since only one command is stored in queue per sender, we remove the old one.
+     *
+     * @param sender    The {@link CommandSender} that executed the command.
+     * @return True if queue command is removed from sender successfully, else false.
+     */
+    public boolean removeFromQueue(@NotNull CommandSender sender) {
+        CommandSender targetSender = parseSender(sender);
+        QueuedCommand previousCommand = this.queuedCommandMap.remove(targetSender);
+        if (previousCommand == null) {
+            Logging.finer("No queue command to remove for sender %s.", targetSender.getName());
+            return false;
+        }
+        previousCommand.getExpireTask().cancel();
+        Logging.finer("Removed queue command for sender %s.", targetSender.getName());
+        return true;
+    }
+
+    /**
+     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
+     * So confirm command can be used for a queued command on another command block.
+     *
+     * @param sender    The sender to parse.
+     * @return The sender, or if its a command block, a {@link DummyCommandBlockSender}.
+     */
+    @NotNull
+    private CommandSender parseSender(@NotNull CommandSender sender) {
+        Logging.fine(sender.getClass().getName());
+        if (isCommandBlock(sender)) {
+            Logging.finer("Is command block.");
+            return COMMAND_BLOCK;
+        }
+        return sender;
+    }
+
+    /**
+     * Checks if the sender is a command block.
+     *
+     * @param sender    The sender to check.
+     * @return True if sender is a command block, else false.
+     */
+    private boolean isCommandBlock(@NotNull CommandSender sender) {
+        return sender instanceof BlockCommandSender
+                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
+    }
+}
@@ -0,0 +1,104 @@
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+/**
+ * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
+ */
+class DummyCommandBlockSender implements CommandSender {
+
+    @Override
+    public void sendMessage(@NotNull String message) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void sendMessage(@NotNull String[] messages) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Server getServer() {
+        return Bukkit.getServer();
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return "DummyCommandBlockSender";
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void removeAttachment(@NotNull PermissionAttachment attachment) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void recalculatePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Set<PermissionAttachmentInfo> getEffectivePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isOp() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setOp(boolean value) {
+        throw new UnsupportedOperationException();
+    }
+}
@@ -0,0 +1,86 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
+ * dangerous action.
+ */
+public class QueuedCommand {
+
+    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
+    private static final int DEFAULT_VALID_TIME = 10;
+
+    private final CommandSender sender;
+    private final Runnable action;
+    private final String prompt;
+    private final int validDuration;
+    private BukkitTask expireTask;
+
+    public QueuedCommand(CommandSender sender, Runnable action) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
+        this(sender, action, prompt, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
+    }
+
+    /**
+     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
+     *
+     * @param sender        The sender that ran the command needed for confirmation.
+     * @param action        The logic to execute upon confirming.
+     * @param prompt        Question to ask sender to confirm.
+     * @param validDuration Duration in which the command is valid for confirm in seconds.
+     */
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
+        this.sender = sender;
+        this.action = action;
+        this.prompt = prompt;
+        this.validDuration = validDuration;
+    }
+
+    @NotNull
+    CommandSender getSender() {
+        return sender;
+    }
+
+    @NotNull
+    String getPrompt() {
+        return prompt;
+    }
+
+    int getValidDuration() {
+        return validDuration;
+    }
+
+    @NotNull
+    Runnable getAction() {
+        return action;
+    }
+
+    @NotNull
+    BukkitTask getExpireTask() {
+        return expireTask;
+    }
+
+    void setExpireTask(@NotNull BukkitTask expireTask) {
+        if (this.expireTask != null) {
+            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
+        }
+        this.expireTask = expireTask;
+    }
+}
@@ -0,0 +1,4 @@
+/**
+ * Manager queuing of dangerous commands in need of confirmation.
+ */
+package com.onarandombox.MultiverseCore.commandtools.queue;
@@ -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;
    }

@@ -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);
    }
 }
@@ -11,16 +11,29 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.commands.TeleportCommand;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

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

-/** A factory class that will create destinations from specific strings. */
+/**
+ * A factory class that will create destinations from specific strings.
+ */
 public class DestinationFactory {
+
+    private static final Pattern CANNON_PATTERN = Pattern.compile("(?i)cannon-[\\d]+(\\.[\\d]+)?");
+
    private MultiverseCore plugin;
    private Map<String, Class<? extends MVDestination>> destList;
    private Command teleportCommand;
@@ -36,6 +49,59 @@ public class DestinationFactory {
        }
    }

+    /**
+     * Parse a destination that has relation to sender, such as a cannon or player destination.
+     *
+     * @param teleportee        The player that is going to be teleported.
+     * @param destinationName   The destination to parse.
+     * @return A non-null MVDestination
+     */
+    @NotNull
+    public MVDestination getPlayerAwareDestination(@NotNull Player teleportee,
+                                                   @NotNull String destinationName) {
+
+        // Prioritise world, in the event that a world is named after a player online.
+        if (Bukkit.getWorld(destinationName) != null) {
+            return getDestination(destinationName);
+        }
+
+        Player targetPlayer = PlayerFinder.get(destinationName, teleportee);
+        if (targetPlayer != null) {
+            return getDestination("pl:" + targetPlayer.getName());
+        }
+
+        if (CANNON_PATTERN.matcher(destinationName).matches()) {
+            return getDestination(parseCannonDest(teleportee, destinationName));
+        }
+
+        return getDestination(destinationName);
+    }
+
+    /**
+     * Parses a cannon destination.
+     *
+     * @param teleportee        The player that is going to be teleported.
+     * @param destinationName   The destination to parse.
+     * @return A destination string.
+     */
+    @NotNull
+    private String parseCannonDest(@NotNull Player teleportee,
+                                   @NotNull String destinationName) {
+
+        String[] cannonSpeed = destinationName.split("-");
+        try {
+            double speed = Double.parseDouble(cannonSpeed[1]);
+            destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX()
+                    + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":"
+                    + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
+        }
+        catch (Exception e) {
+            destinationName = "i:invalid";
+        }
+
+        return destinationName;
+    }
+
    /**
     * Gets a new destination from a string.
     * Returns a new InvalidDestination if the string could not be parsed.
@@ -101,4 +167,13 @@ public class DestinationFactory {
        this.teleportCommand.addAdditonalPermission(other);
        return true;
    }
+
+    /**
+     * Gets all the {@link MVDestination} identifiers registered.
+     *
+     * @return A collection of destination identifiers.
+     */
+    public Collection<String> getRegisteredIdentifiers() {
+        return this.destList.keySet();
+    }
 }
@@ -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;
@@ -0,0 +1,69 @@
+package com.onarandombox.MultiverseCore.display;
+
+import com.onarandombox.MultiverseCore.display.handlers.DefaultSendHandler;
+import com.onarandombox.MultiverseCore.display.handlers.SendHandler;
+import com.onarandombox.MultiverseCore.display.parsers.ContentParser;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Helps to display contents such as list and maps in a nicely formatted fashion.
+ */
+public class ContentDisplay {
+
+    /**
+     * Makes a new {@link ContentDisplay} instance to use.
+     *
+     * @return  New {@link ContentDisplay} instance.
+     */
+    @NotNull
+    public static ContentDisplay create() {
+        return new ContentDisplay();
+    }
+
+    private final List<ContentParser> contentParsers = new ArrayList<>();
+    private SendHandler sendHandler = DefaultSendHandler.getInstance();
+
+    public ContentDisplay() {
+    }
+
+    /**
+     * Adds content to be displayed.
+     *
+     * @param parser    The content parser to add.
+     * @return Same {@link ContentDisplay} for method chaining.
+     */
+    @NotNull
+    public ContentDisplay addContentParser(@NotNull ContentParser parser) {
+        contentParsers.add(parser);
+        return this;
+    }
+
+    /**
+     * Sets the handler for displaying the message to command sender.
+     *
+     * @param handler   The send handler to use.
+     * @return Same {@link ContentDisplay} for method chaining.
+     */
+    @NotNull
+    public ContentDisplay withSendHandler(@NotNull SendHandler handler) {
+        sendHandler = handler;
+        return this;
+    }
+
+    /**
+     * Format and display the message to command sender.
+     *
+     * @param sender    The target command sender to show the display to.
+     */
+    public void send(@NotNull CommandSender sender) {
+        Objects.requireNonNull(sendHandler, "No send handler set for content display");
+        List<String> parsedContent = new ArrayList<>();
+        contentParsers.forEach(parser -> parser.parse(sender, parsedContent));
+        sendHandler.send(sender, parsedContent);
+    }
+}
@@ -0,0 +1,21 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+/**
+ * Filter display content for it show only certain string.
+ */
+public interface ContentFilter {
+    /**
+     * Checks if a particular string should be displayed.
+     *
+     * @param value String to check on.
+     * @return True if should be display, false otherwise.
+     */
+    boolean checkMatch(String value);
+
+    /**
+     * Gets whether content needs to be filtered by this filter.
+     *
+     * @return True if content should be filtered, false otherwise.
+     */
+    boolean needToFilter();
+}
@@ -0,0 +1,35 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+/**
+ * Default implementation of {@link ContentFilter} that doesn't filter anything.
+ */
+public class DefaultContentFilter implements ContentFilter {
+
+    public static DefaultContentFilter instance;
+
+    public static DefaultContentFilter getInstance() {
+        if (instance == null) {
+            instance = new DefaultContentFilter();
+        }
+        return instance;
+    }
+
+    private DefaultContentFilter() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean checkMatch(String value) {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean needToFilter() {
+        return false;
+    }
+}
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.display.filters;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.google.common.base.Strings;
+import org.bukkit.ChatColor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * Filter content and text based on regex matching.
+ */
+public class RegexContentFilter implements ContentFilter {
+
+    private static final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
+
+    /**
+     * Compile regex pattern to create a regex filter.
+     *
+     * When prefixed with 'r=', filter string is used as the full regex pattern.
+     * Else, set to regex that contains the filterString.
+     *
+     * @param filterString  The target string to create filter.
+     * @return A new instance of {@link RegexContentFilter} with filter applied.
+     */
+    @NotNull
+    public static RegexContentFilter fromString(@Nullable String filterString) {
+        if (filterString == null) {
+            return new RegexContentFilter(null);
+        }
+        if (filterString.startsWith("r=")) {
+            return new RegexContentFilter(filterString.substring(2));
+        }
+        String cleanedFilter = REGEX_SPECIAL_CHARS.matcher(filterString.toLowerCase()).replaceAll("\\\\$0");
+        return new RegexContentFilter("(?i).*" + cleanedFilter + ".*");
+    }
+
+    private final String regexString;
+    private Pattern regexPattern;
+
+    public RegexContentFilter(@Nullable String regexString) {
+        this.regexString = regexString;
+        convertToPattern();
+    }
+
+    /**
+     * Try to compile and store the regex into a {@link Pattern}.
+     */
+    private void convertToPattern() {
+        if (Strings.isNullOrEmpty(regexString)) {
+            return;
+        }
+        try {
+            regexPattern = Pattern.compile(regexString);
+        } catch (PatternSyntaxException ignored) {
+            regexPattern = null;
+            Logging.fine("Error parsing regex: %s", regexString);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean checkMatch(String value) {
+        if (!hasValidRegex()) {
+            return false;
+        }
+        String text = ChatColor.stripColor(String.valueOf(value));
+        return regexPattern.matcher(text).find();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean needToFilter() {
+        return hasValidRegex();
+    }
+
+    public boolean hasValidRegex() {
+        return regexPattern != null;
+    }
+
+    public String getRegexString() {
+        return regexString;
+    }
+
+    public Pattern getRegexPattern() {
+        return regexPattern;
+    }
+
+    @Override
+    public String toString() {
+        return regexString;
+    }
+}
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import com.google.common.base.Strings;
+import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Base implementation of {@link SendHandler} with some common parameters.
+ *
+ * @param <T>   The subclass that inherited this baseclass.
+ */
+public abstract class BaseSendHandler<T extends BaseSendHandler<?>> implements SendHandler {
+
+    protected String header = "";
+    protected ContentFilter filter = DefaultContentFilter.getInstance();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void send(@NotNull CommandSender sender, @NotNull List<String> content) {
+        sendHeader(sender);
+        List<String> filteredContent = filterContent(content);
+        if (filteredContent.isEmpty()) {
+            sender.sendMessage(String.format("%sThere is no content to display.", ChatColor.RED));
+            return;
+        }
+        sendContent(sender, filteredContent);
+    }
+
+    /**
+     * Sends the header if header is present.
+     *
+     * @param sender    The target which the header will be displayed to.
+     */
+    protected void sendHeader(CommandSender sender) {
+        if (!Strings.isNullOrEmpty(header)) {
+            sender.sendMessage(header);
+        }
+    }
+
+    /**
+     * Filter to keep only contents that matches the filter.
+     *
+     * @param content   The content to filter on.
+     * @return The filtered list of content.
+     */
+    protected List<String> filterContent(@NotNull List<String> content) {
+        if (filter.needToFilter()) {
+            return content.stream().filter(filter::checkMatch).collect(Collectors.toList());
+        }
+        return content;
+    }
+
+    /**
+     * Display the contents.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    protected abstract void sendContent(@NotNull CommandSender sender, @NotNull List<String> content);
+
+    /**
+     * Sets header to be displayed.
+     *
+     * @param header        The header text.
+     * @param replacements  String formatting replacements.
+     * @return Same {@link T} for method chaining.
+     */
+    public T withHeader(@NotNull String header, @NotNull Object...replacements) {
+        this.header = String.format(header, replacements);
+        return (T) this;
+    }
+
+    /**
+     * Sets content filter used to match specific content to be displayed.
+     *
+     * @param filter    The filter to use.
+     * @return Same {@link T} for method chaining.
+     */
+    public T withFilter(@NotNull ContentFilter filter) {
+        this.filter = filter;
+        return (T) this;
+    }
+
+    public String getHeader() {
+        return header;
+    }
+
+    public ContentFilter getFilter() {
+        return filter;
+    }
+}
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class DefaultSendHandler implements SendHandler {
+
+    private static DefaultSendHandler instance;
+
+    public static DefaultSendHandler getInstance() {
+        if (instance == null) {
+            instance = new DefaultSendHandler();
+        }
+        return instance;
+    }
+
+    private DefaultSendHandler() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void send(@NotNull CommandSender sender, @NotNull List<String> content) {
+        sender.sendMessage(content.toArray(new String[0]));
+    }
+}
@@ -0,0 +1,53 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Display the contents in a single line.
+ */
+public class InlineSendHandler extends BaseSendHandler<InlineSendHandler> {
+
+    /**
+     * Makes a new {@link InlineSendHandler} instance to use.
+     *
+     * @return  New {@link InlineSendHandler} instance.
+     */
+    public static InlineSendHandler create() {
+        return new InlineSendHandler();
+    }
+
+    private String delimiter = ChatColor.WHITE + ", ";
+
+    public InlineSendHandler() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sendContent(@NotNull CommandSender sender, @NotNull List<String> content) {
+        if (filter.needToFilter()) {
+            sender.sendMessage(String.format("%s[Filter '%s']", ChatColor.GRAY, filter));
+        }
+        sender.sendMessage(String.join(delimiter, content));
+    }
+
+    /**
+     * Sets the delimiter. A sequence of characters that is used to separate each of the elements in content.
+     *
+     * @param delimiter The delimiter to use.
+     * @return Same {@link InlineSendHandler} for method chaining.
+     */
+    public InlineSendHandler withDelimiter(String delimiter) {
+        this.delimiter = delimiter;
+        return this;
+    }
+
+    public String getDelimiter() {
+        return delimiter;
+    }
+}
@@ -0,0 +1,170 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Display content as a list with optional pagination.
+ */
+public class PagedSendHandler extends BaseSendHandler<PagedSendHandler> {
+
+    /**
+     * Makes a new {@link PagedSendHandler} instance to use.
+     *
+     * @return  New {@link PagedSendHandler} instance.
+     */
+    public static PagedSendHandler create() {
+        return new PagedSendHandler();
+    }
+
+    private boolean paginate = true;
+    private boolean paginateInConsole = false;
+    private boolean padEnd = true;
+    private int linesPerPage = 8;
+    private int targetPage = 1;
+
+    public PagedSendHandler() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sendContent(@NotNull CommandSender sender,
+                            @NotNull List<String> content) {
+
+        if (!paginate || (sender instanceof ConsoleCommandSender && !paginateInConsole)) {
+            sendNormal(sender, content);
+            return;
+        }
+        sendPaged(sender, content);
+    }
+
+    /**
+     * Send content list without pagination.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    private void sendNormal(@NotNull CommandSender sender,
+                            @NotNull List<String> content) {
+
+        if (filter.needToFilter()) {
+            sender.sendMessage(String.format("%s[Filter '%s']", ChatColor.GRAY, filter));
+        }
+        sender.sendMessage(content.toArray(new String[0]));
+    }
+
+    /**
+     * Send content list with pagination.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    private void sendPaged(@NotNull CommandSender sender,
+                           @NotNull List<String> content) {
+
+        int totalPages = (content.size() + linesPerPage - 1) / linesPerPage; // Basically just divide round up
+        if (targetPage < 1 || targetPage > totalPages) {
+            sender.sendMessage(String.format("%sInvalid page number. Please enter a page number between 1 and %s", ChatColor.RED, totalPages));
+            return;
+        }
+
+        if (filter.needToFilter()) {
+            sender.sendMessage(String.format("%s[Page %s of %s] [Filter '%s']", ChatColor.GRAY, targetPage, totalPages, filter));
+        } else {
+            sender.sendMessage(String.format("%s[Page %s of %s]", ChatColor.GRAY, targetPage, totalPages));
+        }
+
+        int startIndex = (targetPage - 1) * linesPerPage;
+        int pageEndIndex = startIndex + linesPerPage;
+        int endIndex = Math.min(pageEndIndex, content.size());
+        List<String> pageContent = content.subList(startIndex, endIndex);
+        if (padEnd) {
+            for (int i = 0; i < (pageEndIndex - endIndex); i++) {
+                pageContent.add("");
+            }
+        }
+        sender.sendMessage(pageContent.toArray(new String[0]));
+    }
+
+    /**
+     * Sets whether display output should be paginated.
+     *
+     * @param paginate  State of doing pagination.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler doPagination(boolean paginate) {
+        this.paginate = paginate;
+        return this;
+    }
+
+    /**
+     * Sets whether display output should be paginated if is for console output.
+     * This option will be useless of {@link PagedSendHandler#paginate} is set to false.
+     *
+     * @param paginateInConsole State of doing pagination in console.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler doPaginationInConsole(boolean paginateInConsole) {
+        this.paginateInConsole = paginateInConsole;
+        return this;
+    }
+
+    /**
+     * Sets whether empty lines should be added if content lines shown is less that {@link PagedSendHandler#linesPerPage}.
+     *
+     * @param padEnd    State of doing end padding.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler doEndPadding(boolean padEnd) {
+        this.padEnd = padEnd;
+        return this;
+    }
+
+    /**
+     * Sets the max number of lines per page. This excludes header.
+     *
+     * @param linesPerPage  The number of lines per page.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler withLinesPerPage(int linesPerPage) {
+        this.linesPerPage = linesPerPage;
+        return this;
+    }
+
+    /**
+     * Sets the page number to display.
+     *
+     * @param targetPage    The target page number to display.
+     * @return Same {@link PagedSendHandler} for method chaining.
+     */
+    public PagedSendHandler withTargetPage(int targetPage) {
+        this.targetPage = targetPage;
+        return this;
+    }
+
+    public boolean isPaginate() {
+        return paginate;
+    }
+
+    public boolean isPaginateInConsole() {
+        return paginateInConsole;
+    }
+
+    public boolean isPadEnd() {
+        return padEnd;
+    }
+
+    public int getLinesPerPage() {
+        return linesPerPage;
+    }
+
+    public int getTargetPage() {
+        return targetPage;
+    }
+}
@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.display.handlers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Handles the sending of all content to the command sender.
+ */
+@FunctionalInterface
+public interface SendHandler {
+    /**
+     * Sends all the content to the given command sender.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    void send(@NotNull CommandSender sender, @NotNull List<String> content);
+}
@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Parse objects into string or list of strings.
+ */
+@FunctionalInterface
+public interface ContentParser {
+    /**
+     * Parse the object to string(s) and add it to the content.
+     *
+     * @param sender    The target which the content will be displayed to.
+     * @param content   The content to display.
+     */
+    void parse(@NotNull CommandSender sender, @NotNull List<String> content);
+}
@@ -0,0 +1,60 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Simple parser for list object.
+ *
+ * @param <T>   List element type.
+ */
+public class ListContentParser<T> implements ContentParser {
+
+    /**
+     * New list content parser for the given list.
+     *
+     * @param list  The list object to parse.
+     * @param <T>   List element type.
+     * @return New {@link MapContentParser} instance.
+     */
+    public static <T> ListContentParser<T> forContent(List<T> list) {
+        return new ListContentParser<>(list);
+    }
+
+    private final List<T> list;
+
+    private String format = "%s";
+
+    public ListContentParser(List<T> list) {
+        this.list = list;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void parse(@NotNull CommandSender sender, @NotNull List<String> content) {
+        list.forEach(element -> content.add(String.format(format, element)));
+    }
+
+    /**
+     * Sets the format that will be used to parse each list entry. Uses java string format pattern.
+     *
+     * @param format    The format to use.
+     * @return Same {@link ListContentParser} for method chaining.
+     */
+    public ListContentParser<T> withFormat(String format) {
+        this.format = format;
+        return this;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+}
@@ -0,0 +1,112 @@
+package com.onarandombox.MultiverseCore.display.parsers;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Simple parser for map object.
+ *
+ * @param <K>   Key type.
+ * @param <V>   Value type.
+ */
+public class MapContentParser<K, V> implements ContentParser {
+
+    /**
+     * New map content parser for the given map.
+     *
+     * @param map   The map object to parse.
+     * @param <K>   Key type.
+     * @param <V>   Value type.
+     * @return New {@link MapContentParser} instance.
+     */
+    public static <K, V> MapContentParser<K, V> forContent(Map<K, V> map) {
+        return new MapContentParser<>(map);
+    }
+
+    private final Map<K, V> map;
+
+    private String format = "%s%s%s%s%s";
+    private ChatColor keyColor = ChatColor.WHITE;
+    private ChatColor valueColor = ChatColor.WHITE;
+    private String separator = ": ";
+
+    public MapContentParser(Map<K, V> map) {
+        this.map = map;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void parse(@NotNull CommandSender sender, @NotNull List<String> content) {
+        map.forEach((k, v) -> content.add(String.format(format, keyColor, k, separator, valueColor, v)));
+    }
+
+    /**
+     * Sets the format that will be used to parse each map entry. Uses java string format pattern.
+     *
+     * @param format    The format to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withFormat(String format) {
+        this.format = format;
+        return this;
+    }
+
+    /**
+     * Sets the color for the key text.
+     *
+     * @param keyColor  The color to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withKeyColor(ChatColor keyColor) {
+        this.keyColor = keyColor;
+        return this;
+    }
+
+    /**
+     * Sets the color for the value text.
+     *
+     * @param valueColor    The color to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withValueColor(ChatColor valueColor) {
+        this.valueColor = valueColor;
+        return this;
+    }
+
+    /**
+     * Sets the separator between each key value pairing.
+     *
+     * @param separator The separator to use.
+     * @return Same {@link MapContentParser} for method chaining.
+     */
+    public MapContentParser<K, V> withSeparator(String separator) {
+        this.separator = separator;
+        return this;
+    }
+
+    public Map<K, V> getMap() {
+        return map;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public ChatColor getKeyColor() {
+        return keyColor;
+    }
+
+    public ChatColor getValueColor() {
+        return valueColor;
+    }
+
+    public String getSeparator() {
+        return separator;
+    }
+}
@@ -0,0 +1,7 @@
+package com.onarandombox.MultiverseCore.enums;
+
+public enum RespawnType {
+    BED,
+    ANCHOR,
+    OTHER
+}
@@ -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.");
    }

    /**
@@ -7,9 +7,11 @@

 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;
+import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import org.bukkit.World;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -17,6 +19,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.entity.EntityPortalEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
@@ -98,7 +101,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;
        }

@@ -106,4 +109,17 @@ public class MVEntityListener implements Listener {
        event.setCancelled(this.plugin.getMVWorldManager().getTheWorldPurger().shouldWeKillThisCreature(mvworld, event.getEntity()));
    }

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

    /**
@@ -7,15 +7,13 @@

 package com.onarandombox.MultiverseCore.listeners;

-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 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;
@@ -33,6 +31,9 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;

+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
 * Multiverse's {@link Listener} for players.
 */
@@ -69,9 +70,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 +118,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 +164,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 +174,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 +200,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 +211,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 +228,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 +243,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 +290,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,25 +303,17 @@ 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.");
        }
-        if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
-            try {
-                Class.forName("org.bukkit.TravelAgent");
-                if (event.getPortalTravelAgent() != null) {
-                    event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
-                }
-            } catch (ClassNotFoundException ignore) {
-                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
-            }
-
+        if (!this.plugin.getMVConfig().isUsingDefaultPortalSearch()) {
+            CompatibilityLayer.setPortalSearchRadius(event, this.plugin.getMVConfig().getPortalSearchRadius());
        }
    }

@@ -335,7 +335,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 +376,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);
@@ -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);
        }
    }
@@ -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;
        }
    }
@@ -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);
@@ -0,0 +1,106 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import com.dumptruckman.minecraft.util.Logging;
+import org.bukkit.event.entity.EntityPortalEvent;
+import org.bukkit.event.player.PlayerPortalEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+
+import java.lang.reflect.Method;
+
+/**
+ * Utility class to enable version specific minecraft features.
+ */
+public class CompatibilityLayer {
+
+    private static Method checkAnchorSpawn;
+    private static boolean useTravelAgent;
+    private static Method playerPortalSearchRadius;
+    private static Method entityPortalSearchRadius;
+
+    /**
+     * Initialise the reflection class, methods and fields.
+     */
+    public static void init() {
+        checkAnchorSpawn = ReflectHelper.getMethod(PlayerRespawnEvent.class, "isAnchorSpawn");
+        useTravelAgent = ReflectHelper.hasClass("org.bukkit.TravelAgent");
+        playerPortalSearchRadius = ReflectHelper.getMethod(PlayerPortalEvent.class, "setSearchRadius", int.class);
+        entityPortalSearchRadius = ReflectHelper.getMethod(EntityPortalEvent.class, "setSearchRadius", int.class);
+    }
+
+    /**
+     * <p>Check if the respawn point is of respawn anchor type.</p>
+     * <p>Introduced in minecraft 1.16</p>
+     *
+     * @param event A player respawn event.
+     * @return If the respawn location is an anchor point.
+     */
+    public static boolean isAnchorSpawn(PlayerRespawnEvent event) {
+        if (checkAnchorSpawn == null) {
+            return false;
+        }
+        Boolean result = ReflectHelper.invokeMethod(event, checkAnchorSpawn);
+        if (result == null) {
+            Logging.warning("Unable to check if spawning at respawn anchor!");
+            return false;
+        }
+        return result;
+    }
+
+    /**
+     * <p>Gets if Travel Agent is supported on the server's minecraft version.</p>
+     * <p>Removed in minecraft 1.14</p>
+     *
+     * @return True if Travel Agent is supported, else false.
+     */
+    public static boolean isUseTravelAgent() {
+        return useTravelAgent;
+    }
+
+    /**
+     * <p>Sets search radius for a PlayerPortalEvent.</p>
+     *
+     * <p>Use travel agent if available, else using new PlayerPortalEvent.setSearchRadius(int) method
+     * introduced in minecraft 1.15</p>
+     *
+     * @param event         A Player Portal Event.
+     * @param searchRadius  Target search radius to set to.
+     */
+    public static void setPortalSearchRadius(PlayerPortalEvent event, int searchRadius) {
+        if (useTravelAgent) {
+            event.getPortalTravelAgent().setSearchRadius(searchRadius);
+            event.useTravelAgent(true);
+            Logging.finer("Used travel agent to set player portal search radius.");
+            return;
+        }
+        if (playerPortalSearchRadius == null) {
+            Logging.warning("Unable to set player portal search radius!");
+            return;
+        }
+        ReflectHelper.invokeMethod(event, playerPortalSearchRadius, searchRadius);
+        Logging.finer("Used new method to set player portal search radius.");
+    }
+
+    /**
+     * <p>Sets search radius for a EntityPortalEvent.</p>
+     *
+     * <p>Use travel agent if available, else using new EntityPortalEvent.setSearchRadius(int) method
+     * introduced in minecraft 1.15</p>
+     *
+     * @param event         A Entity Portal Event.
+     * @param searchRadius  Target search radius to set to.
+     */
+    public static void setPortalSearchRadius(EntityPortalEvent event, int searchRadius) {
+        if (useTravelAgent) {
+            event.getPortalTravelAgent().setSearchRadius(searchRadius);
+            event.useTravelAgent(true);
+            Logging.finer("Used travel agent to set entity portal search radius.");
+            return;
+        }
+        if (entityPortalSearchRadius == null) {
+            Logging.warning("Unable to set entity portal search radius!");
+            return;
+        }
+        ReflectHelper.invokeMethod(event, entityPortalSearchRadius, searchRadius);
+        Logging.finer("Used new method to set entity portal search radius.");
+    }
+}
@@ -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;
        }
    }
@@ -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;
    }
@@ -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()) {
@@ -0,0 +1,176 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import com.dumptruckman.minecraft.util.Logging;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Helper class to get {@link Player} from name, UUID or Selectors.
+ */
+public class PlayerFinder {
+
+    private static final Pattern UUID_REGEX = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
+    private static final Pattern COMMA_SPLIT = Pattern.compile(",");
+
+    /**
+     * Get a {@link Player} based on an identifier of name UUID or selector.
+     *
+     * @param playerIdentifier  An identifier of name UUID or selector.
+     * @param sender            Target sender for selector.
+     * @return The player if found, else null.
+     */
+    @Nullable
+    public static Player get(@NotNull String playerIdentifier,
+                             @NotNull CommandSender sender) {
+
+        Player targetPlayer = getByName(playerIdentifier);
+        if (targetPlayer != null) {
+            return targetPlayer;
+        }
+        targetPlayer = getByUuid(playerIdentifier);
+        if (targetPlayer != null) {
+            return targetPlayer;
+        }
+        return getBySelector(playerIdentifier, sender);
+    }
+
+    /**
+     * Get multiple {@link Player} based on many identifiers of name UUID or selector.
+     *
+     * @param playerIdentifiers An identifier of multiple names, UUIDs or selectors, separated by comma.
+     * @param sender            Target sender for selector.
+     * @return A list of all the {@link Player} found.
+     */
+    @Nullable
+    public static List<Player> getMulti(@NotNull String playerIdentifiers,
+                                        @NotNull CommandSender sender) {
+
+        String[] playerIdentifierArray = COMMA_SPLIT.split(playerIdentifiers);
+        if (playerIdentifierArray == null || playerIdentifierArray.length == 0) {
+            return null;
+        }
+
+        List<Player> playerResults = new ArrayList<>();
+        for (String playerIdentifier : playerIdentifierArray) {
+            Player targetPlayer = getByName(playerIdentifier);
+            if (targetPlayer != null) {
+                playerResults.add(targetPlayer);
+                continue;
+            }
+            targetPlayer = getByUuid(playerIdentifier);
+            if (targetPlayer != null) {
+                playerResults.add(targetPlayer);
+                continue;
+            }
+            List<Player> targetPlayers = getMultiBySelector(playerIdentifier, sender);
+            if (targetPlayers != null) {
+                playerResults.addAll(targetPlayers);
+            }
+        }
+        return playerResults;
+    }
+
+    /**
+     * Get a {@link Player} based on player name.
+     *
+     * @param playerName    Name of a {@link Player}.
+     * @return The player if found, else null.
+     */
+    @Nullable
+    public static Player getByName(@NotNull String playerName) {
+        return Bukkit.getPlayerExact(playerName);
+    }
+
+    /**
+     * Get a {@link Player} based on player UUID.
+     *
+     * @param playerUuid    UUID of a player.
+     * @return The player if found, else null.
+     */
+    @Nullable
+    public static Player getByUuid(@NotNull String playerUuid) {
+        if (!UUID_REGEX.matcher(playerUuid).matches()) {
+            return null;
+        }
+        UUID uuid;
+        try {
+            uuid = UUID.fromString(playerUuid);
+        } catch (Exception e) {
+            return null;
+        }
+        return getByUuid(uuid);
+    }
+
+    /**
+     * Get a {@link Player} based on playerUUID.
+     *
+     * @param playerUuid    UUID of a player.
+     * @return The player if found, else null.
+     */
+    @Nullable
+    public static Player getByUuid(@NotNull UUID playerUuid) {
+        return Bukkit.getPlayer(playerUuid);
+    }
+
+    /**
+     * Get a {@link Player} based on vanilla selectors.
+     * https://minecraft.gamepedia.com/Commands#Target_selectors
+     *
+     * @param playerSelector    A target selector, usually starts with an '@'.
+     * @param sender            Target sender for selector.
+     * @return The player if only one found, else null.
+     */
+    @Nullable
+    public static Player getBySelector(@NotNull String playerSelector,
+                                       @NotNull CommandSender sender) {
+
+        List<Player> matchedPlayers = getMultiBySelector(playerSelector, sender);
+        if (matchedPlayers == null || matchedPlayers.isEmpty()) {
+            Logging.fine("No player found with selector '%s' for %s.", playerSelector, sender.getName());
+            return null;
+        }
+        if (matchedPlayers.size() > 1) {
+            Logging.warning("Ambiguous selector result '%s' for %s (more than one player matched) - %s",
+                    playerSelector, sender.getName(), matchedPlayers.toString());
+            return null;
+        }
+        return matchedPlayers.get(0);
+    }
+
+    /**
+     * Get multiple {@link Player} based on selector.
+     * https://minecraft.gamepedia.com/Commands#Target_selectors
+     *
+     * @param playerSelector    A target selector, usually starts with an '@'.
+     * @param sender            Target sender for selector.
+     * @return A list of all the {@link Player} found.
+     */
+    @Nullable
+    public static List<Player> getMultiBySelector(@NotNull String playerSelector,
+                                                  @NotNull CommandSender sender) {
+
+        if (playerSelector.charAt(0) != '@') {
+            return null;
+        }
+        try {
+            return Bukkit.selectEntities(sender, playerSelector).stream()
+                    .filter(e -> e instanceof Player)
+                    .map(e -> ((Player) e))
+                    .collect(Collectors.toList());
+        } catch (IllegalArgumentException e) {
+            Logging.warning("An error occurred while parsing selector '%s' for %s. Is it is the correct format?",
+                    playerSelector, sender.getName());
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
@@ -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;
                }
@@ -0,0 +1,140 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * Utility class used to help in doing various reflection actions.
+ */
+public class ReflectHelper {
+
+    /**
+     * Try to get the {@link Class} based on its classpath.
+     *
+     * @param classPath The target classpath.
+     * @return A {@link Class} if found, else null.
+     */
+    @Nullable
+    public static Class<?> getClass(String classPath) {
+        try {
+            return Class.forName(classPath);
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Check if the {@link Class} for a give classpath is present/valid.
+     *
+     * @param classPath Target classpath.
+     * @return True if class path is a valid class, else false.
+     */
+    public static boolean hasClass(String classPath) {
+        return getClass(classPath) != null;
+    }
+
+    /**
+     * Try to get a {@link Method} from a given class.
+     *
+     * @param clazz             The class to search the method on.
+     * @param methodName        Name of the method to get.
+     * @param parameterTypes    Parameters present for that method.
+     * @param <C>               The class type.
+     * @return A {@link Method} if found, else null.
+     */
+    @Nullable
+    public static <C> Method getMethod(Class<C> clazz, String methodName, Class<?>... parameterTypes) {
+        try {
+            Method method = clazz.getDeclaredMethod(methodName, parameterTypes);
+            method.setAccessible(true);
+            return method;
+        } catch (NoSuchMethodException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Try to get a {@link Method} from a given class.
+     *
+     * @param classInstance     Instance of the class to search the method on.
+     * @param methodName        Name of the method to get.
+     * @param parameterTypes    Parameters present for that method.
+     * @param <C>               The class type.
+     * @return A {@link Method} if found, else null.
+     */
+    @Nullable
+    public static <C> Method getMethod(C classInstance, String methodName, Class<?>... parameterTypes) {
+        return getMethod(classInstance.getClass(), methodName, parameterTypes);
+    }
+
+    /**
+     * Calls a {@link Method}.
+     *
+     * @param classInstance Instance of the class responsible for the method.
+     * @param method        The method to call.
+     * @param parameters    Parameters needed when calling the method.
+     * @param <C>           The class type.
+     * @param <R>           The return type.
+     * @return Return value of the method call if any, else null.
+     */
+    @Nullable
+    public static <C, R> R invokeMethod(C classInstance, Method method, Object...parameters) {
+        try {
+            return (R) method.invoke(classInstance, parameters);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * Try to get a {@link Field} from a given class.
+     *
+     * @param clazz     The class to search the field on.
+     * @param fieldName Name of the field to get.
+     * @param <C>       The class type.
+     * @return A {@link Field} if found, else null.
+     */
+    @Nullable
+    public static <C> Field getField(Class<C> clazz, String fieldName) {
+        try {
+            Field field = clazz.getDeclaredField(fieldName);
+            field.setAccessible(true);
+            return field;
+        } catch (NoSuchFieldException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Try to get a {@link Field} from a given class.
+     *
+     * @param classInstance Instance of the class to search the field on.
+     * @param fieldName     Name of the field to get.
+     * @param <C>           The class type.
+     * @return A {@link Field} if found, else null.
+     */
+    @Nullable
+    public static <C> Field getField(C classInstance, String fieldName) {
+        return getField(classInstance.getClass(), fieldName);
+    }
+
+    /**
+     * Gets the value of an {@link Field} from an instance of the class responsible.
+     *
+     * @param classInstance Instance of the class to get the field value from.
+     * @param field         The field to get value from.
+     * @param <C>           The class type.
+     * @param <V>           The field value type.
+     * @return The field value if any, else null.
+     */
+    @Nullable
+    public static <C, V> V getFieldValue(C classInstance, Field field)  {
+        try {
+            return (V) field.get(classInstance);
+        } catch (IllegalAccessException e) {
+            return null;
+        }
+    }
+}
@@ -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
@@ -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;
    }

@@ -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;
+    }
+}
@@ -18,6 +18,7 @@ import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
 import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent;
 import org.bukkit.Bukkit;
+import org.bukkit.GameRule;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
@@ -36,26 +37,25 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.Stack;
-import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;

 /**
 * Public facing API to add/remove Multiverse worlds.
 */
 public class WorldManager implements MVWorldManager {
    private final MultiverseCore plugin;
-    private final Pattern worldNamePattern = Pattern.compile("[a-zA-Z0-9/._-]+");
    private final WorldPurger worldPurger;
    private final Map<String, MultiverseWorld> worlds;
    private Map<String, WorldProperties> worldsFromTheConfig;
@@ -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!");
        }
    }

@@ -130,7 +130,7 @@ public class WorldManager implements MVWorldManager {
        }

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

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

@@ -244,7 +238,9 @@ public class WorldManager implements MVWorldManager {
            return false;
        }

-        if (!isValidWorldName(name)) {
+        if (!WorldNameChecker.isValidWorldName(name)) {
+            Logging.warning("Invalid world name '" + name + "'");
+            Logging.warning("World name should not contain spaces or special characters!");
            return false;
        }

@@ -290,7 +286,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 +359,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) {
@@ -391,14 +387,14 @@ public class WorldManager implements MVWorldManager {
            this.worldsFromTheConfig.get(name).cacheVirtualProperties();
            if (unloadBukkit && this.unloadWorldFromBukkit(name, true)) {
                this.worlds.remove(name);
-                Logging.info("World '%s' was unloaded from memory.", name);
+                Logging.info("World '%s' was unloaded from Bukkit.", name);
                return true;
            } else if (!unloadBukkit){
                this.worlds.remove(name);
-                Logging.info("World '%s' was unloaded from memory.", name);
+                Logging.info("World '%s' was unloaded from Multiverse.", name);
                return true;
            } else {
-                Logging.warning("World '%s' could not be unloaded. Is it a default world?", name);
+                Logging.warning("World '%s' could not be unloaded from Bukkit. Is it a default world?", name);
            }
        } else if (this.plugin.getServer().getWorld(name) != null) {
            Logging.warning("Hmm Multiverse does not know about this world but it's loaded in memory.");
@@ -430,31 +426,16 @@ public class WorldManager implements MVWorldManager {
        }
    }

-    /**
-     * Check if the world name is allowed
-     *
-     * @param name   Name of the world
-     * @return True if the world world name is valid based on regex
-     */
-    private boolean isValidWorldName(String name) {
-        if (!worldNamePattern.matcher(name).matches()) {
-            Logging.warning("Invalid world name '" + name + "'");
-            Logging.warning("World name should not contain spaces or special characters!");
-            return false;
-        }
-        return true;
-    }
-
    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 +475,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 +506,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 +523,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 +539,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;
@@ -629,6 +617,14 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public MultiverseWorld getMVWorld(String name) {
+        return this.getMVWorld(name, true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public MultiverseWorld getMVWorld(String name, boolean checkAliases) {
        if (name == null) {
            return null;
        }
@@ -636,7 +632,7 @@ public class WorldManager implements MVWorldManager {
        if (world != null) {
            return world;
        }
-        return this.getMVWorldByAlias(name);
+        return (checkAliases) ? this.getMVWorldByAlias(name) : null;
    }

    /**
@@ -645,7 +641,7 @@ public class WorldManager implements MVWorldManager {
    @Override
    public MultiverseWorld getMVWorld(World world) {
        if (world != null) {
-            return this.getMVWorld(world.getName());
+            return this.getMVWorld(world.getName(), false);
        }
        return null;
    }
@@ -670,7 +666,15 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean isMVWorld(final String name) {
-        return (this.worlds.containsKey(name) || isMVWorldAlias(name));
+        return this.isMVWorld(name, true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isMVWorld(final String name, boolean checkAliases) {
+        return this.worlds.containsKey(name) || (checkAliases && this.isMVWorldAlias(name));
    }

    /**
@@ -865,7 +869,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;
        }
    }
@@ -893,12 +897,23 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed) {
+        return regenWorld(name, useNewSeed, randomSeed, seed, false);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules) {
        MultiverseWorld world = this.getMVWorld(name);
-        if (world == null)
+        if (world == null) {
+            Logging.warning("Unable to regen a world that does not exist!");
            return false;
+        }

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

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

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

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

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

    /**
@@ -937,6 +997,9 @@ public class WorldManager implements MVWorldManager {
        return this.configWorlds;
    }

+    /**
+     * {@inheritDoc}
+     */
 	@Override
 	public boolean hasUnloadedWorld(String name, boolean includeLoaded) {
 		if (getMVWorld(name) != null) {
@@ -949,4 +1012,21 @@ public class WorldManager implements MVWorldManager {
 		}
 		return false;
 	}
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+	public Collection<String> getPotentialWorlds() {
+        File worldContainer = this.plugin.getServer().getWorldContainer();
+        if (worldContainer == null) {
+            return Collections.emptyList();
+        }
+        return Arrays.stream(worldContainer.listFiles())
+                .filter(File::isDirectory)
+                .filter(folder -> !this.isMVWorld(folder.getName(), false))
+                .filter(WorldNameChecker::isValidWorldFolder)
+                .map(File::getName)
+                .collect(Collectors.toList());
+    }
 }
@@ -0,0 +1,159 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * <p>Utility class in helping to check the status of a world name and it's associated world folder.</p>
+ *
+ * <p>Note this is for preliminary checks and better command output. A valid result will suggest but not
+ * 100% determine that a world name can be created, loaded or imported.</p>
+ */
+public class WorldNameChecker {
+
+    private static final Pattern WORLD_NAME_PATTERN = Pattern.compile("[a-zA-Z0-9/._-]+");
+    private static final Set<String> BLACKLIST_NAMES = Collections.unmodifiableSet(new HashSet<String>() {{
+        add("plugins");
+        add("logs");
+        add("cache");
+        add("crash-reports");
+    }});
+
+    /**
+     * Checks if a world name is valid.
+     *
+     * @param worldName The world name to check on.
+     * @return True if check result is valid, else false.
+     */
+    public static boolean isValidWorldName(@Nullable String worldName) {
+        return checkName(worldName) == NameStatus.VALID;
+    }
+
+    /**
+     * Checks the current validity status of a world name.
+     *
+     * @param worldName The world name to check on.
+     * @return The resulting name status.
+     */
+    @NotNull
+    public static NameStatus checkName(@Nullable String worldName) {
+        if (BLACKLIST_NAMES.contains(worldName)) {
+            return NameStatus.BLACKLISTED;
+        }
+        if (worldName == null || !WORLD_NAME_PATTERN.matcher(worldName).matches()) {
+            return NameStatus.INVALID_CHARS;
+        }
+        return NameStatus.VALID;
+    }
+
+    /**
+     * Checks if a world name has a valid world folder.
+     *
+     * @param worldName The world name to check on.
+     * @return True if check result is valid, else false.
+     */
+    public static boolean isValidWorldFolder(@Nullable String worldName) {
+        return checkFolder(worldName) == FolderStatus.VALID;
+    }
+
+    /**
+     * Checks if a world folder is valid.
+     *
+     * @param worldFolder   The world folder to check on.
+     * @return True if check result is valid, else false.
+     */
+    public static boolean isValidWorldFolder(@Nullable File worldFolder) {
+        return checkFolder(worldFolder) == FolderStatus.VALID;
+    }
+
+    /**
+     * Checks the current folder status for a world name.
+     *
+     * @param worldName The world name to check on.
+     * @return The resulting folder status.
+     */
+    @NotNull
+    public static FolderStatus checkFolder(@Nullable String worldName) {
+        if (worldName == null) {
+            return FolderStatus.DOES_NOT_EXIST;
+        }
+        File worldFolder = new File(Bukkit.getWorldContainer(), worldName);
+        return checkFolder(worldFolder);
+    }
+
+    /**
+     * Checks the current folder status.
+     *
+     * @param worldFolder   The world folder to check on.
+     * @return The resulting folder status.
+     */
+    @NotNull
+    public static FolderStatus checkFolder(@Nullable File worldFolder) {
+        if (worldFolder == null || !worldFolder.exists() || !worldFolder.isDirectory()) {
+            return FolderStatus.DOES_NOT_EXIST;
+        }
+        if (!folderHasDat(worldFolder)) {
+            return FolderStatus.NOT_A_WORLD;
+        }
+        return FolderStatus.VALID;
+    }
+
+    /**
+     * A very basic check to see if a folder has a level.dat file. If it does, we can safely assume
+     * it's a world folder.
+     *
+     * @param worldFolder   The File that may be a world.
+     * @return True if it looks like a world, else false.
+     */
+    private static boolean folderHasDat(@NotNull File worldFolder) {
+        File[] files = worldFolder.listFiles((file, name) -> name.toLowerCase().endsWith(".dat"));
+        return files != null && files.length > 0;
+    }
+
+    /**
+     * Result after checking validity of world name.
+     */
+    public enum NameStatus {
+        /**
+         * Name is valid.
+         */
+        VALID,
+
+        /**
+         * Name not valid as it contains invalid characters.
+         */
+        INVALID_CHARS,
+
+        /**
+         * Name not valid as it is deemed blacklisted.
+         */
+        BLACKLISTED
+    }
+
+    /**
+     * Result after checking validity of world folder.
+     */
+    public enum FolderStatus {
+        /**
+         * Folder is valid.
+         */
+        VALID,
+
+        /**
+         * Folder exist, but contents in it doesnt look like a world.
+         */
+        NOT_A_WORLD,
+
+        /**
+         * Folder does not exist.
+         */
+        DOES_NOT_EXIST
+    }
+}
@@ -1,11 +1,12 @@
 package com.onarandombox.MultiverseCore.utils.metrics;

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

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

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

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

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

 }
@@ -14,15 +14,9 @@ import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.io.File;

@@ -31,9 +25,6 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
-@PowerMockIgnore("javax.script.*")
 public class TestDebugMode {
    TestInstanceCreator creator;
    Server mockServer;
@@ -7,35 +7,29 @@ import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.World;
 import org.bukkit.WorldType;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Sheep;
 import org.bukkit.entity.Zombie;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

-import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
-@PowerMockIgnore("javax.script.*")
 public class TestEntitySpawnRules {
    TestInstanceCreator creator;
    MultiverseCore core;
@@ -157,6 +151,6 @@ public class TestEntitySpawnRules {
        when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
        when(zombie.getWorld()).thenReturn(this.cbworld);

-        when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie));
+        when(cbworld.getEntities()).thenReturn(Arrays.asList(sheep, zombie));
    }
 }
@@ -2,24 +2,17 @@ package com.onarandombox.MultiverseCore;

 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.Material;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.util.HashMap;
 import java.util.Map;

-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
-@PowerMockIgnore("javax.script.*")
 public class TestEntryFeeConversion {

    private TestInstanceCreator creator;
@@ -50,6 +43,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());
@@ -6,24 +6,16 @@ import org.bukkit.Server;
 import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

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

-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestModifyCommand {
    TestInstanceCreator creator;
    Server mockServer;
@@ -13,8 +13,6 @@ import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
 import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -36,33 +34,26 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
-import org.bukkit.permissions.Permission;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.internal.verification.VerificationModeFactory;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.io.File;

-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PluginManager.class, MultiverseCore.class, Permission.class, Bukkit.class,
-        WeatherChangeEvent.class, ThunderChangeEvent.class, AsyncPlayerChatEvent.class,
-        PlayerJoinEvent.class, PlayerRespawnEvent.class, EntityRegainHealthEvent.class,
-        FoodLevelChangeEvent.class, WorldManager.class, PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestWorldProperties {
    private TestInstanceCreator creator;
    private MultiverseCore core;
@@ -122,7 +113,7 @@ public class TestWorldProperties {
        String[] netherArgs = new String[] { "import", "world_nether", "nether" };
        core.onCommand(mockCommandSender, mockCommand, "", netherArgs);
        verify(mockCommandSender).sendMessage("Starting import of world 'world_nether'...");
-        verify(mockCommandSender, VerificationModeFactory.times(2)).sendMessage(
+        verify(mockCommandSender, times(2)).sendMessage(
                ChatColor.GREEN + "Complete!");

        assertEquals(core.getServer().getWorlds().size(), 2);
@@ -222,7 +213,7 @@ public class TestWorldProperties {
        assertTrue(mvWorld.setColor("BLACK"));
        assertFalse(mvWorld.setColor("INVALID COLOR"));
        assertEquals(ChatColor.BLACK, mvWorld.getColor());
-        assertEquals(ChatColor.BLACK.toString() + "alias" + ChatColor.WHITE.toString(), mvWorld.getColoredWorldString());
+        assertEquals(ChatColor.BLACK + "alias" + ChatColor.WHITE, mvWorld.getColoredWorldString());
        mvWorld.setPVPMode(false);
        assertEquals(false, mvWorld.isPVPEnabled());
        assertTrue(mvWorld.setScaling(2D));
@@ -329,7 +320,7 @@ public class TestWorldProperties {
        assertEquals(true, mvWorld.isHidden());
        assertEquals("alias", mvWorld.getAlias());
        assertEquals(ChatColor.GREEN, mvWorld.getColor());
-        assertEquals(ChatColor.GREEN.toString() + "alias" + ChatColor.WHITE.toString(), mvWorld.getColoredWorldString());
+        assertEquals(ChatColor.GREEN + "alias" + ChatColor.WHITE, mvWorld.getColoredWorldString());
        assertEquals(false, mvWorld.isPVPEnabled());
        assertEquals(2D, mvWorld.getScaling(), 0);
        assertSame(worldManager.getMVWorld("world_nether").getCBWorld(),
@@ -366,36 +357,36 @@ public class TestWorldProperties {
        when(mockPlayer.hasPlayedBefore()).thenReturn(true);
        when(mockPlayer.hasPermission("multiverse.access.world")).thenReturn(true);
        when(mockPlayer.getName()).thenReturn("MultiverseMan");
-        playerChatEvent = PowerMockito.mock(AsyncPlayerChatEvent.class);
+        playerChatEvent = mock(AsyncPlayerChatEvent.class);
        when(playerChatEvent.getPlayer()).thenReturn(mockPlayer);
        when(playerChatEvent.getFormat()).thenReturn("format");
        // player join
        mockNewPlayer = mock(Player.class);
        when(mockNewPlayer.hasPlayedBefore()).thenReturn(false);
-        playerJoinEvent = PowerMockito.mock(PlayerJoinEvent.class);
+        playerJoinEvent = mock(PlayerJoinEvent.class);
        when(playerJoinEvent.getPlayer()).thenReturn(mockPlayer);
-        playerNewJoinEvent = PowerMockito.mock(PlayerJoinEvent.class);
+        playerNewJoinEvent = mock(PlayerJoinEvent.class);
        when(playerNewJoinEvent.getPlayer()).thenReturn(mockNewPlayer);
        // player respawn
-        playerRespawnBed = PowerMockito.mock(PlayerRespawnEvent.class);
+        playerRespawnBed = mock(PlayerRespawnEvent.class);
        when(playerRespawnBed.getPlayer()).thenReturn(mockPlayer);
        when(playerRespawnBed.isBedSpawn()).thenReturn(true);
-        playerRespawnNormal = PowerMockito.mock(PlayerRespawnEvent.class);
+        playerRespawnNormal = mock(PlayerRespawnEvent.class);
        when(playerRespawnNormal.getPlayer()).thenReturn(mockPlayer);
        when(playerRespawnNormal.isBedSpawn()).thenReturn(false);
        //// Entity events
        mockHumanEntity = mock(HumanEntity.class);
        // entity regain health
-        entityRegainHealthEvent = PowerMockito.mock(EntityRegainHealthEvent.class);
+        entityRegainHealthEvent = mock(EntityRegainHealthEvent.class);
        when(entityRegainHealthEvent.getRegainReason()).thenReturn(RegainReason.REGEN);
        when(mockHumanEntity.getLocation()).thenReturn(new Location(world, 0, 0, 0));
        when(entityRegainHealthEvent.getEntity()).thenReturn(mockHumanEntity);
        // entity food level change event
-        entityFoodLevelChangeEvent = PowerMockito.mock(FoodLevelChangeEvent.class);
+        entityFoodLevelChangeEvent = mock(FoodLevelChangeEvent.class);
        // this won't do anything since we're not mocking a player,
        // but the plugin should be able to handle this!
        when(entityFoodLevelChangeEvent.getEntity()).thenReturn(mockHumanEntity);
-        entityFoodLevelRiseEvent = PowerMockito.mock(FoodLevelChangeEvent.class);
+        entityFoodLevelRiseEvent = mock(FoodLevelChangeEvent.class);
        when(mockPlayer.getFoodLevel()).thenReturn(2);
        when(entityFoodLevelRiseEvent.getEntity()).thenReturn(mockPlayer);
        when(entityFoodLevelRiseEvent.getFoodLevel()).thenReturn(3);
@@ -4,28 +4,21 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.World;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Sheep;
 import org.bukkit.entity.Zombie;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.util.Arrays;

 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestWorldPurger {
    TestInstanceCreator creator;
    MultiverseCore core;
@@ -121,6 +114,6 @@ public class TestWorldPurger {
        zombie = mock(Zombie.class);
        when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
        when(zombie.getWorld()).thenReturn(world);
-        when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie));
+        when(cbworld.getEntities()).thenReturn(Arrays.asList(sheep, zombie));
    }
 }
@@ -12,39 +12,30 @@ import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
 import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldCreatorMatcher;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Server;
 import org.bukkit.WorldCreator;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Matchers;
 import org.mockito.internal.verification.VerificationModeFactory;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;

 import java.io.File;

-import static junit.framework.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;

-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PluginManager.class, MultiverseCore.class, Permission.class, Bukkit.class, WorldManager.class,
-        PluginDescriptionFile.class, JavaPluginLoader.class })
-@PowerMockIgnore("javax.script.*")
 public class TestWorldStuff {

    private TestInstanceCreator creator;
@@ -1,7 +1,8 @@
 package com.onarandombox.MultiverseCore.utils;

-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;

 import java.io.IOException;
 import java.nio.file.Files;
@@ -10,10 +11,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

-import com.dumptruckman.minecraft.util.Logging;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;

 public class FileUtilsTest {

@@ -81,7 +80,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 +106,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 +128,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));
@@ -137,7 +136,7 @@ public class FileUtilsTest {
        assertTrue(Files.isRegularFile(targetChildDirFile));
    }

-    @Test()
+    @Test
    public void copyFolder_intoExistingFolder_whereFileExists() throws Exception {
        Path targetDir = Files.createDirectory(tempDir.resolve("target"));
        Path targetFile = Files.createFile(targetDir.resolve("parentDirFile.txt"));
@@ -145,6 +144,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()));
    }
 }
@@ -21,13 +21,17 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.WeakHashMap;
-import java.util.LinkedHashMap;

-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;

 public class MockWorldFactory {

@@ -27,13 +27,9 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.mockito.ArgumentMatchers;
+import org.mockito.internal.util.reflection.ReflectionMemberAccessor;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.MockGateway;
-import org.powermock.reflect.Whitebox;

 import java.io.File;
 import java.lang.reflect.Field;
@@ -44,15 +40,16 @@ import java.util.logging.Level;
 import java.util.logging.Logger;

 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;

 public class TestInstanceCreator {
    private MultiverseCore core;
@@ -64,32 +61,25 @@ public class TestInstanceCreator {
    public static final File worldsDirectory = new File("bin/test/server");

    public boolean setUp() {
+        TestingMode.enable();
        try {
            pluginDirectory.mkdirs();
            assertTrue(pluginDirectory.exists());

-            MockGateway.MOCK_STANDARD_METHODS = false;
-
            // Initialize the Mock server.
            mockServer = mock(Server.class);
-            JavaPluginLoader mockPluginLoader = PowerMock.createMock(JavaPluginLoader.class);
-            Whitebox.setInternalState(mockPluginLoader, "server", mockServer);
+            JavaPluginLoader mockPluginLoader = mock(JavaPluginLoader.class);
+            new ReflectionMemberAccessor().set(JavaPluginLoader.class.getDeclaredField("server"), mockPluginLoader, mockServer);
            when(mockServer.getName()).thenReturn("TestBukkit");
            Logger.getLogger("Minecraft").setParent(Util.logger);
            when(mockServer.getLogger()).thenReturn(Util.logger);
            when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);

            // Return a fake PDF file.
-            PluginDescriptionFile pdf = PowerMockito.spy(new PluginDescriptionFile("Multiverse-Core", "2.2-Test",
+            PluginDescriptionFile pdf = spy(new PluginDescriptionFile("Multiverse-Core", "2.2-Test",
                    "com.onarandombox.MultiverseCore.MultiverseCore"));
            when(pdf.getAuthors()).thenReturn(new ArrayList<String>());
-            core = PowerMockito.spy(new MultiverseCore(mockPluginLoader, pdf, pluginDirectory, new File(pluginDirectory, "testPluginFile")));
-            PowerMockito.doAnswer(new Answer<Void>() {
-                @Override
-                public Void answer(InvocationOnMock invocation) throws Throwable {
-                    return null; // don't run metrics in tests
-                }
-            }).when(core, "setupMetrics");
+            core = spy(new MultiverseCore(mockPluginLoader, pdf, pluginDirectory, new File(pluginDirectory, "testPluginFile")));

            // Let's let all MV files go to bin/test
            doReturn(pluginDirectory).when(core).getDataFolder();
@@ -102,7 +92,7 @@ public class TestInstanceCreator {
            JavaPlugin[] plugins = new JavaPlugin[] { core };

            // Mock the Plugin Manager
-            PluginManager mockPluginManager = PowerMockito.mock(PluginManager.class);
+            PluginManager mockPluginManager = mock(PluginManager.class);
            when(mockPluginManager.getPlugins()).thenReturn(plugins);
            when(mockPluginManager.getPlugin("Multiverse-Core")).thenReturn(core);
            when(mockPluginManager.getPermission(anyString())).thenReturn(null);
@@ -156,7 +146,7 @@ public class TestInstanceCreator {

            when(mockServer.getPluginManager()).thenReturn(mockPluginManager);

-            when(mockServer.createWorld(ArgumentMatchers.isA(WorldCreator.class))).thenAnswer(
+            when(mockServer.createWorld(isA(WorldCreator.class))).thenAnswer(
                    new Answer<World>() {
                        @Override
                        public World answer(InvocationOnMock invocation) throws Throwable {
@@ -213,32 +203,39 @@ 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 = 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));
+            WorldManager wm = spy(new WorldManager(core));
            Field worldmanagerfield = MultiverseCore.class.getDeclaredField("worldManager");
            worldmanagerfield.setAccessible(true);
            worldmanagerfield.set(core, wm);

            // Set playerListener
-            MVPlayerListener pl = PowerMockito.spy(new MVPlayerListener(core));
+            MVPlayerListener pl = spy(new MVPlayerListener(core));
            Field playerlistenerfield = MultiverseCore.class.getDeclaredField("playerListener");
            playerlistenerfield.setAccessible(true);
            playerlistenerfield.set(core, pl);

            // Set entityListener
-            MVEntityListener el = PowerMockito.spy(new MVEntityListener(core));
+            MVEntityListener el = spy(new MVEntityListener(core));
            Field entitylistenerfield = MultiverseCore.class.getDeclaredField("entityListener");
            entitylistenerfield.setAccessible(true);
            entitylistenerfield.set(core, el);

            // Set weatherListener
-            MVWeatherListener wl = PowerMockito.spy(new MVWeatherListener(core));
+            MVWeatherListener wl = spy(new MVWeatherListener(core));
            Field weatherlistenerfield = MultiverseCore.class.getDeclaredField("weatherListener");
            weatherlistenerfield.setAccessible(true);
            weatherlistenerfield.set(core, wl);
@@ -256,9 +253,9 @@ public class TestInstanceCreator {
            when(commandSender.getServer()).thenReturn(mockServer);
            when(commandSender.getName()).thenReturn("MockCommandSender");
            when(commandSender.isPermissionSet(anyString())).thenReturn(true);
-            when(commandSender.isPermissionSet(ArgumentMatchers.isA(Permission.class))).thenReturn(true);
+            when(commandSender.isPermissionSet(isA(Permission.class))).thenReturn(true);
            when(commandSender.hasPermission(anyString())).thenReturn(true);
-            when(commandSender.hasPermission(ArgumentMatchers.isA(Permission.class))).thenReturn(true);
+            when(commandSender.hasPermission(isA(Permission.class))).thenReturn(true);
            when(commandSender.addAttachment(core)).thenReturn(null);
            when(commandSender.isOp()).thenReturn(true);

@@ -10,8 +10,8 @@ package com.onarandombox.MultiverseCore.utils;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Handler;
 import java.util.logging.Level;
-import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+import java.util.logging.LogRecord;

 public class Util {
    private Util() {}
@@ -11,7 +11,7 @@ import org.bukkit.WorldCreator;
 import org.mockito.ArgumentMatcher;

 public class WorldCreatorMatcher implements ArgumentMatcher<WorldCreator> {
-    private WorldCreator worldCreator;
+    private final WorldCreator worldCreator;
    private boolean careAboutSeeds = false;
    private boolean careAboutGenerators = false;

@@ -0,0 +1 @@
+mock-maker-inline
Author	SHA1	Message	Date
Ben Woo	1211dfb057	Implement suggested improvements. * Use singleton pattern for DefaultContentFilter with getInstance method. * Have a default SendHandler. * Don't need streams for small dataset. * Private WorldListContentParser class to improve readability.	2021-08-17 16:29:31 +08:00
Ben Woo	562eed8255	Revamp content display API.	2021-08-17 00:26:57 +08:00
Ben Woo	1a8a97daf1	Merge pull request #2675 from Multiverse/replace_travis_badge Replace Travis Badge with Github Actions.	2021-07-22 10:12:35 +08:00
nicegamer7	d9dffa8e6d	replace travis badge	2021-07-21 22:11:09 -04:00
nicegamer7	973588defb	Merge pull request #2175 from JLLeitschuh/fix/JLL/use_https_to_resolve_dependencies [SECURITY] Use HTTPS to resolve dependencies in Maven Build	2021-07-19 20:14:17 -04:00
nicegamer7	c704c1ca3a	Merge branch 'main' into fix/JLL/use_https_to_resolve_dependencies	2021-07-19 20:12:25 -04:00
Ben Woo	c33a268b91	Merge pull request #2672 from Multiverse/fix_java16_tests Fix Tests on Java 16 and code cleanup.	2021-07-19 10:31:31 +08:00
Kermina Awad	9821f1d9c8	clean up test files	2021-07-18 13:51:53 -04:00
Kermina Awad	be6e0b67be	don't run tests in parallel	2021-07-18 13:22:04 -04:00
Kermina Awad	b9b1fa6164	remove PowerMockito	2021-07-18 13:17:15 -04:00
Kermina Awad	28585dd6f9	remove unnecessary stub	2021-07-18 13:12:09 -04:00
Ben Woo	47ca7b821b	Move to GitHub actions (#2671 ) * Remove use of travis. * Add basic github action maven build.	2021-07-17 09:31:20 +08:00
nicegamer7	9ce2dfd100	Merge pull request #2445 from benwoo1110/fix-help Fix issue where special chars cause PatternSyntaxException	2021-07-16 09:51:21 -04:00
Ben Woo	473ccd09d7	Don't need to toLowerCase filter.	2021-07-16 21:38:57 +08:00
Ben WooandJeremy Wood	cc2e1d44b2	Implement new content display system. (#2584 ) * Implement new content display system. * Add @FunctionalInterface annotation to displaytools interfaces. * Use static factory method to create Builder with contents. * Use T for generic type since it's static method. * Rename Builder#display to show and require CommandSender. * Rename package from displaytools to display. * Move DisplayHandler impls into their own package. * Overload ContentDisplay#forContent with defaults for list and map. * Pass CommandSender to send command. This system is much more versatile when a single ContentDisplay instance can be used for multiple players. * Rename ContentDisplay#send to #show. * Split DisplaySettings into separate classes. Co-authored-by: Jeremy Wood <farachan@gmail.com>	2021-07-07 10:25:07 +08:00
Jeremy Wood	2e8f159d38	Merge pull request #2666 from Multiverse/https Ensure https is used for repository.	2021-07-06 14:12:46 -04:00
Jeremy Wood	6581d16125	Merge pull request #2519 from Multiverse/readme-update Update readme with more project details	2021-07-06 13:59:35 -04:00
Jeremy Wood	562bc56e83	Merge pull request #2664 from ccuser44/main Create LICENSE.md	2021-07-06 13:56:16 -04:00
Ben Woo	4493cd7916	Ensure https is used for repository.	2021-07-06 23:27:53 +08:00
nicegamer7	1cd9e45915	Merge pull request #2663 from Multiverse/fix-portal-search Set defaultportalsearch to true by default.	2021-07-05 15:16:01 -04:00
ccuser44	acb6bc6dd6	Create LICENSE.md	2021-07-05 11:39:50 +03:00
Ben Woo	b7b17c5d21	Set defaultportalsearch to true by default.	2021-07-05 11:28:52 +08:00
Jeremy Wood	bbd9211845	Bump version to 4.3.1-SNAPSHOT for continued development.	2021-06-23 15:47:52 -04:00
Jeremy Wood	fc6796e20f	Release version 4.3.0.	2021-06-23 08:56:24 -04:00
Jeremy Wood	6040a27126	Merge pull request #2635 from Multiverse/fix/version_cmd_perms Change default permission for version command. Seriously wth.	2021-06-04 13:00:39 -04:00
Jeremy Wood	1c483148dc	Change default permission for version command. Seriously wth.	2021-06-04 13:00:04 -04:00
nicegamer7	128442c062	Merge pull request #2622 from Multiverse/queue-system-cleanup Queue system cleanup	2021-05-16 11:29:23 -04:00
Kermina Awad	141854f076	correct some javadoc typos	2021-05-16 11:21:20 -04:00
xSavior_of_God	f72cc6764b	Fix creation and import Exploit (#2353 ) Through this fix you can avoid deleting of important folders.	2021-05-16 12:56:14 +08:00
benwoo1110	d95ecfaa8e	Update some CommandQueueManager docs to be clearer.	2021-04-28 14:01:30 +08:00
benwoo1110	6c96f4e974	Ensure DummyCommandBlockSender isnt used for Op.	2021-04-28 13:58:43 +08:00
Ben Woo	28cee291c6	Merge pull request #2581 from Multiverse/regen-keep-gamerules Add ability to keep gamerules setting on world regen.	2021-04-28 10:43:09 +08:00
Ben Woo	155f32c00f	Add ability to keep gamerules on world regen.	2021-04-27 23:44:24 +08:00
Ben Woo	071ba05d81	Merge pull request #2585 from Multiverse/Revamp-queue-command- Implement new queue command system.	2021-04-27 23:10:59 +08:00
Ben Woo	2ee5aea06b	Merge pull request #2580 from Multiverse/per-search-and-reflect Improve portal search radius	2021-04-27 10:57:46 +08:00
Ben Woo	3bb8de6d33	Improve portal search radius. * Fix portal search radius not respected after travel agent removed. * Set portal search radius for entity entering portals.	2021-04-26 22:52:24 +08:00
Ben Woo	79ac01da34	Merge pull request #2619 from Multiverse/general_cleanup General Cleanup	2021-04-25 11:55:56 +08:00
Kermina Awad	6e4fbb0ece	correct a copy-paste error introduced in #2588	2021-04-24 14:51:24 -04:00
Kermina Awad	167ed5e0d3	update VaultAPI repo	2021-04-24 14:49:28 -04:00
Kermina Awad	91f3304f78	add to Buscript failed to load message	2021-04-24 14:13:40 -04:00
Kermina Awad	7928e73a32	enable minimizeJar for maven-shade-plugin	2021-04-24 14:08:25 -04:00
Kermina Awad	d61d186544	update bStats Metrics class	2021-04-24 14:08:09 -04:00
nicegamer7	dc356e88d0	Merge pull request #2582 from Multiverse/unload-message Update unload message logging.	2021-04-24 13:49:12 -04:00
Kermina Awad	d0d5574580	update unload message logging another time	2021-04-24 13:48:09 -04:00
Ben Woo	29617059b3	Merge pull request #2611 from Turbotailz/patch-1 Make prefixchat config option default to 'false'	2021-04-06 13:10:02 +08:00
Sam Goodger	bf05fc81dd	Make prefixchat config option default to 'false' This may seem like a really negligible change but having this option default to `true` actually causes a lot of pain for support in other plugins that deal with prefixes (LuckPerms and Essentials being the main victims). Users always come in guns blazing, screaming at us because they don't know how to remove the world name from their chat. It's such a simple solution, yet no one thinks that of all plugins, it would be Multiverse that is tainting their beloved chat format. Please consider updating this default setting. It will save a lot of us trouble in the future 🙏	2021-04-06 14:19:38 +10:00
nicegamer7	a2c5bf70f0	Merge pull request #2597 from Multiverse/cleanup Cleanup	2021-03-18 10:52:28 -04:00
benwoo1110	ea19006465	Fix selector log level.	2021-03-18 16:40:47 +08:00
benwoo1110	89f685ff9a	Add missing javadocs in DestinationFactory.	2021-03-10 17:45:39 +08:00
benwoo1110	ecc76033dc	Remove redundant line that was moved to WorldNameChecker.	2021-03-10 17:41:56 +08:00
Ben Woo	e843b0711d	Merge pull request #2590 from Multiverse/small-wm-updates Small WorldManager updates	2021-03-10 06:41:18 +08:00
Ben Woo	eddfaf7df0	Merge pull request #2593 from Multiverse/destination-id Add method to get registered destination identifiers.	2021-03-10 06:39:31 +08:00
nicegamer7	d1150ab5f8	Merge pull request #2591 from Multiverse/uuid-regex Make UUID regex less restrictive.	2021-03-09 09:46:33 -05:00
benwoo1110	cc3996ca76	Implement new queue command system.	2021-03-09 20:54:42 +08:00
benwoo1110	1965aecfba	Add method to get registered destination identifiers.	2021-03-09 20:05:23 +08:00
benwoo1110	ce34ae44d8	Make UUID regex less restrictive.	2021-03-09 11:48:26 +08:00
benwoo1110	f5a2d7bc47	Add getPotentialWorlds method to WorldManager.	2021-03-09 10:40:46 +08:00
benwoo1110	24295025ef	Add option to lookup mvworlds without checking for aliases.	2021-03-09 10:35:42 +08:00
Ben Woo	e3f56f6498	Merge pull request #2586 from Multiverse/reflect-helper Add ReflectHelper class to better facilitate various reflection actions.	2021-03-09 01:18:29 +08:00
Ben Woo	bd0c3cff3f	Merge pull request #2587 from Multiverse/player-desination Player destination	2021-03-09 00:32:20 +08:00
Ben Woo	7c4ab035a0	Merge pull request #2588 from Multiverse/world-name-check Implement new WorldNameChecker	2021-03-09 00:31:58 +08:00
Ben Woo	2593080f77	Merge pull request #2567 from Multiverse/player-utils Add support to find players based on name, UUID or selectors.	2021-03-09 00:29:22 +08:00
benwoo1110	0d4595d511	Implement new WorldNameChecker for better preliminary checks of world name.	2021-03-08 18:03:35 +08:00
benwoo1110	bf820c2c27	Add getPlayerAwareDestination to DestinationFactory.	2021-03-08 17:09:03 +08:00
benwoo1110	a12718d354	Add ReflectHelper class to better facilitate various reflection actions.	2021-03-08 16:25:33 +08:00
benwoo1110	b23c1ae606	Update unload message logging.	2021-03-04 16:00:53 +08:00
Ben Woo	7c59dcbcb9	Merge pull request #2494 from benwoo1110/property-fix Fix cannot remove block currency with mvm set command.	2021-03-04 15:32:34 +08:00
Ben Woo	15cacba7c9	Merge pull request #2573 from Multiverse/java-11 Fix compiling with Java 11+	2021-03-02 09:01:38 +08:00
Ben Woo	adbe88daa6	Merge pull request #2565 from Multiverse/fis-respawn-anchor Add respawn anchor support.	2021-03-02 00:36:43 +08:00
Kermina Awad	5350c012f7	fix compiling on java 15	2021-02-25 17:48:17 -05:00
benwoo1110	a91f377cf5	Fix compile on java 11.	2021-02-24 16:40:21 +08:00
Ben Woo	c3ae5ac210	Merge pull request #2539 from Multiverse/disable_buscript Add a Config Option to Disable Buscript	2021-02-24 14:12:35 +08:00
Ben Woo	f4ce740c06	Merge pull request #2568 from Multiverse/fullname-face-direction Add support for fullname face direction.	2021-02-24 14:09:56 +08:00
Kermina Awad	3ff8d34053	add config option to disable buscript	2021-02-23 14:38:54 -05:00
benwoo1110	f362f09380	Add support for fullname face direction. So we can do `w:world:north` on top of the current ``w:world:n`.	2021-02-21 17:19:18 +08:00
benwoo1110	62b789dff5	Add support to find players based on name, UUID or selectors.	2021-02-21 16:47:13 +08:00
benwoo1110	84a9db597a	Add respawn anchor support.	2021-02-19 00:57:19 +08:00
nicegamer7	89fd700e32	Merge pull request #2489 from benwoo1110/world-UID Adds world UID and generator details to /mvinfo command	2021-01-17 12:36:27 -05:00
benwoo1110	9741b1794c	Update readme with more project details	2020-12-31 00:42:22 +08:00
Ben Woo	001a6000f8	Merge pull request #2515 from Multiverse/update_bstats Update bStats Metrics Class	2020-12-20 12:10:52 +08:00
Kermina Awad	bf61069fed	update bStats Metrics class	2020-12-19 22:17:04 -05:00
Ben Woo	d93def8b5b	Merge pull request #2503 from Multiverse/getplayerexact Use getPlayerExact in favour of getPlayer.	2020-12-14 10:28:58 +08:00
nicegamer7	540394e266	Merge pull request #2505 from benwoo1110/logging Update to all use static logging.	2020-12-12 09:58:19 -05:00
benwoo1110	425b1c80cc	Update to all use static logging.	2020-12-12 10:49:49 +08:00
Kermina Awad	47ae6f5378	use getPlayerExact instead of getPlayer	2020-12-11 12:48:19 -05:00
benwoo1110	48601e4215	Fix cannot remove block currency with mvm set command. Setting currency to 0 is now considered as no currency value.	2020-11-27 21:14:27 +08:00
Alexander Krantz	ed80083fe8	Fix null location when teleporting to own playerbed destination. (#2487 ) * Fix teleporting to a the calling player's bed * Change name to my-bed to prevent collisions with player names * Re-add old player bed for backwards compatibility * Remove second bed destination name * Give constant more sensible name	2020-11-27 12:58:11 +08:00
Ben Woo	d041e0a8d1	Merge pull request #2490 from benwoo1110/fix-tags Update issue template with new tags.	2020-11-25 11:44:16 +08:00
benwoo1110	de85be5832	Update issue template with new tags.	2020-11-25 11:41:57 +08:00
Ben Woo	81d59d8bf5	Update issue template to use paste.gg (#2450 ) * Update issue template to use paste.gg * Update to show paste.gg as link	2020-10-27 11:56:18 -04:00
benwoo1110	5d3d732c25	Fix issue where special chars cause PatternSyntaxException Escape regex special chars for help command	2020-10-09 12:19:32 +08:00
Jeremy Wood	0c2d2f4e0a	One more test for the webhook...	2020-10-08 02:38:34 -04:00
Jeremy Wood	3d9108fb48	Minor change to test webhooks on new base branch.	2020-10-08 02:35:30 -04:00
Jeremy Wood	25c616bc32	Bumped version to 4.2.3-SNAPSHOT for continued development.	2020-10-08 02:21:13 -04:00
Jeremy Wood	148187025a	Release version 4.2.2.	2020-10-08 00:38:58 -04:00
Jeremy Wood	115b0dc078	Dump full version output in multifile pastes.	2020-10-07 23:52:43 -04:00
Jeremy Wood	78bf6ba3bf	Merge pull request #2442 from Multiverse/version_command_typo Correct a Typo in VersionCommand	2020-10-07 23:33:13 -04:00
Kermina Awad	e31c391af4	correct a typo in VersionCommand	2020-10-07 23:15:21 -04:00
Jeremy Wood	6ed4be9a64	Move back to '\n' line separators in version command.	2020-10-07 23:12:50 -04:00
Jeremy Wood	d626e7e4b1	Merge pull request #2429 from benwoo1110/green-warning More noticable warning for deprecated event	2020-10-07 22:41:54 -04:00
Jeremy Wood	e7dd4fee51	Merge pull request #2430 from benwoo1110/clone-cleanup Remove uneeded variables from clone method	2020-10-07 22:41:01 -04:00
Ben Woo	146075de69	Loads unloaded world before deleting (#2431 ) * Loads unload world before deleting Fixes issue where unloaded worlds can't be deleted. * Missing commit line smh	2020-10-07 22:38:45 -04:00
Jeremy Wood	9fce6c54f6	Merge pull request #2435 from Multiverse/webpaste Fix Double Prefix when Logging Version Info	2020-10-07 22:37:22 -04:00
Ben Woo	f189eb3b7e	Fix issue template label (#2437 ) * Fix issue template label * Remove "type: " from label	2020-10-07 22:32:32 -04:00
benwoo1110	ed77cacb1a	Adds generator detail to /mvinfo command	2020-10-07 21:00:40 +08:00
Kermina Awad	2d4fe301cf	fix double prefix when logging version info	2020-10-06 16:26:20 -04:00
Jeremy Wood	e5fe1fe565	Bump version to 4.2.2-SNAPSHOT for continued development.	2020-10-06 15:46:37 -04:00
Jeremy Wood	83010f1a28	Release version 4.2.1.	2020-10-06 15:08:13 -04:00
Jeremy Wood	864e50e38c	Add TestingMode util.	2020-10-06 15:07:56 -04:00
Jeremy Wood	0a99258f3e	Bump version to 4.2.1-SNAPSHOT for continued development.	2020-10-06 15:01:42 -04:00
benwoo1110	cfae997de4	Adds world UID to /mvinfo command	2020-10-07 00:39:08 +08:00
benwoo1110	b345baf20e	Remove uneeded variables from clone method	2020-10-06 21:12:18 +08:00
benwoo1110	d532052c7b	More noticable warning for deprecated event Add green color to the warning	2020-10-06 20:47:41 +08:00
Jonathan Leitschuh	59b6522d59	Use HTTPS instead of HTTP to resolve dependencies This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>	2020-02-11 09:04:52 -05:00