Release version 4.3.0.

Change default permission for version command. Seriously wth.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 ​Multiverse Discord Server
+    url: https://discord.gg/NZtfKky
+    about: Need help with using Multiverse-Core or just want to chat with the devs? Join the Multiverse Discord Server for help!

.github/ISSUE_TEMPLATE/help.md

@@ -0,0 +1,56 @@
+---
+name: ❓ Help!
+about: Encountered a problem with Multiverse-Core? Not sure how to fix it?
+title: ''
+labels: 'Type: Assistance'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core help guide
+
+Don't write inside the arrows as they will be hidden when you post your issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you need help other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+Or come join our Discord server to get help sooner: https://discord.gg/NZtfKky
+
+If you're happy to wait (or you were sent here from Discord), read on:
+
+1.  Check the Usage and FAQ pages to see if it answers your queries:
+      https://github.com/Multiverse/Multiverse-Core/wiki/Basics
+      https://github.com/Multiverse/Multiverse-Core/wiki/FAQ
+
+2.  Fill out the template.
+      This will help us understand what problem you've encountered and help us
+      find a solution.
+
+3.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/ or other similar service.
+
+4.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+* **Server version:** <!-- Insert output of `/version` command -->
+
+* **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/ -->
+
+### Help request
+
+**Problem**
+<!-- What problem did you encounter? -->
+
+**What I have tried**
+<!-- What have you tried so far? -->
+
+**Screenshots**
+<!-- If relevant, include any screenshots here. -->

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

@@ -0,0 +1,59 @@
+---
+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: 'Bug: Unconfirmed'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core bug reporting guide
+
+Don't put anything inside this block, as it won't be included in the issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you are having issues with other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+If you are reporting a bug, please follow the following steps:
+
+1.  Fill out the template in full.
+      Run the commands in the console. Don't just put "latest" as a version,
+      or we will ignore it.
+
+2.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/, then paste a
+      link to them in the relevant parts of the template.
+      **DO NOT drag files into this box!**
+
+3.  Make sure not to write between the arrows, as anything there will be
+    hidden.
+
+4.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+* **Server version:** <!-- Insert output of `/version` command -->
+
+* **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/ -->
+
+### Details
+I was **`<able / not able>`** to reproduce my issue on a freshly setup and up-to-date server with the latest version of Multiverse plugins with no other plugins and with no kinds of other server or client mods.
+
+**Description**  
+<!-- Replace this with a brief summary of the bug. -->
+
+**Steps to reproduce**  
+<!-- Replace this with exactly what you did to cause the bug. -->
+
+**Expected behavior**  
+<!-- Replace this with what you expected to happen. -->
+
+**Screenshots**  
+<!-- Replace this with screenshots, if necessary. -->

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

@@ -0,0 +1,54 @@
+---
+name: 💡 Request a Feature
+about: Suggest a feature you want to see in Multiverse-Core!
+title: ''
+labels: 'Type: Idea'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core feature request guide
+
+Fill out the template. Don't write inside the arrows as they will be hidden
+when you post your issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you are look for other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+Not sure if your feature fits in Multiverse-Core? Feel free to ask on our Discord
+server: https://discord.gg/NZtfKky
+
+If you have a feature suggestion for Multiverse-Core, read the following tips:
+
+1.  Fill out the template.
+      This will help us understand what you're requesting and why you want us
+      to add it.
+
+2.  Keep it simple.
+      Make sure it's easy to understand what you're requesting. A good way is
+      to keep it to one request per GitHub issue, as we can then easily track
+      feature requests.
+
+3.  Check whether it has already been asked or added.
+      You can search the issue tracker to see if your feature has already been
+      requested at https://github.com/Multiverse/Multiverse-Core/issues.
+
+4.  Ask yourself: "Does this belong in Multiverse-Core?"
+      There are lots of features that we reject because most servers won't
+      need or use them. If your feature is very specific or already exists in
+      another plugin, it might not be a good fit for Multiverse-Core.
+
+5.  Delete this line and all above lines before posting your issue!       -->
+
+### Feature request
+
+**Feature description**
+<!-- What feature are you suggesting? -->
+
+**How the feature is useful**
+<!-- How is the feature useful to players, server owners and/or developers? -->

.gitignore

@@ -12,6 +12,7 @@
 
 # maven
 /target
+dependency-reduced-pom.xml
 
 # vim
 .*.sw[a-p]

.travis.yml

@@ -1,7 +1,6 @@
-language: java
-jdk:
-  - openjdk6
-notifications:
-  email: false
-before_install:
-  - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
+language: java
+jdk:
+  - oraclejdk8
+notifications:
+  email: false
+dist: trusty

README.md

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

config/mv_checks.xml

@@ -115,7 +115,6 @@
             <property name="ignoreNumbers" value="-1, 0, 0.5, 1, 2, 3"/>
         </module>
         <module name="MissingSwitchDefault"/>
-        <module name="RedundantThrows"/>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
         <!-- Don't like errors for `final` missing

pom.xml

@@ -3,20 +3,21 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>2.5</version>
+    <version>4.3.0</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.number>UNKNOWN</project.build.number>
+        <project.bitly-access-token>bitly-access-token</project.bitly-access-token>
     </properties>
 
     <repositories>
       <!-- Spigot -->
-    <repository>
-        <id>spigot-repo</id>
-        <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-    </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
         <repository>
             <id>onarandombox</id>
             <url>http://repo.onarandombox.com/content/groups/public</url>
@@ -26,8 +27,12 @@
             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
         <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.theyeticave.net/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>
     </repositories>
 
@@ -61,6 +66,17 @@
                 <project.build.number>${env.BUILD_NUMBER}</project.build.number>
             </properties>
         </profile>
+        <profile>
+            <id>bitly</id>
+            <activation>
+                <property>
+                    <name>env.BITLY_ACCESS_TOKEN</name>
+                </property>
+            </activation>
+            <properties>
+                <project.bitly-access-token>${env.BITLY_ACCESS_TOKEN}</project.bitly-access-token>
+            </properties>
+        </profile>
     </profiles>
 
     <build>
@@ -70,39 +86,62 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.7.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.1</version>
                 <executions>
                     <execution>
+                        <id>replace-bitly-access-token</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                        <configuration>
+                            <basedir>${project.build.sourceDirectory}</basedir>
+                            <includes>
+                                <include>com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>bitly-access-token</token>
+                                    <value>${project.bitly-access-token}</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>replace-maven-version-number</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>replace</goal>
                         </goals>
+                        <configuration>
+                            <basedir>${project.build.directory}/classes</basedir>
+                            <includes>
+                                <include>plugin.yml</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>maven-version-number</token>
+                                    <value>${project.version}-b${project.build.number}</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <file>target/classes/plugin.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}-b${project.build.number}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
             </plugin>
             <!-- Jar Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.0.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -113,7 +152,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.11</version>
+                <version>3.0.0-M3</version>
                 <configuration>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
@@ -126,14 +165,14 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit47</artifactId>
-                        <version>2.11</version>
+                        <version>3.0.0-M3</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.17</version>
                 <configuration>
                     <enableRulesSummary>true</enableRulesSummary>
                     <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
@@ -142,7 +181,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -155,7 +194,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>2.10.4</version>
                 <executions>
                     <execution>
                         <id>javadoc-jar</id>
@@ -163,13 +202,16 @@
                         <goals>
                             <goal>jar</goal>
                         </goals>
+                        <configuration>
+                            <failOnError>false</failOnError>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.5</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -177,31 +219,23 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>me.main__.util:SerializationConfig</include>
-                                    <include>com.pneumaticraft.commandhandler:CommandHandler</include>
-                                    <include>com.dumptruckman.minecraft:buscript</include>
-                                    <include>org.mcstats.bukkit:metrics</include>
-                                    <include>com.dumptruckman.minecraft:Logging</include>
-                                </includes>
-                            </artifactSet>
+                            <minimizeJar>true</minimizeJar>
                             <relocations>
                                 <relocation>
                                     <pattern>me.main__.util</pattern>
-                                    <shadedPattern>me.main__.util.multiverse</shadedPattern>
+                                    <shadedPattern>com.onarandombox.serializationconfig</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.pneumaticraft.commandhandler</pattern>
-                                    <shadedPattern>com.pneumaticraft.commandhandler.multiverse</shadedPattern>
+                                    <shadedPattern>com.onarandombox.commandhandler</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>buscript</pattern>
-                                    <shadedPattern>buscript.multiverse</shadedPattern>
+                                    <shadedPattern>com.onarandombox.buscript</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.mcstats</pattern>
-                                    <shadedPattern>org.mcstats.multiverse</shadedPattern>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>com.onarandombox.bstats</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
@@ -211,28 +245,34 @@
                                     <pattern>com.dumptruckman.minecraft.util.DebugLog</pattern>
                                     <shadedPattern>com.onarandombox.MultiverseCore.utils.DebugFileLogger</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.codehaus.jettison</pattern>
+                                    <shadedPattern>com.onarandombox.jettison</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>de.themoep.idconverter</pattern>
+                                    <shadedPattern>com.onarandombox.idconverter</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>se.eris</groupId>
+                <artifactId>notnull-instrumenter-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
                     <execution>
-                        <id>apache-commons-io</id>
-                        <phase>package</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>instrument</goal>
+                            <goal>tests-instrument</goal>
                         </goals>
                         <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>commons-io:commons-io</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.apache.commons</pattern>
-                                    <shadedPattern>org.apache.commons.multiverse</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <minimizeJar>true</minimizeJar>
+                            <notNull>
+                                <param>org.jetbrains.annotations.NotNull</param>
+                                <param>javax.validation.constraints.NotNull</param>
+                            </notNull>
                         </configuration>
                     </execution>
                 </executions>
@@ -242,70 +282,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    <!--Spigot API-->
-    <dependency>
-           <groupId>org.spigotmc</groupId>
-           <artifactId>spigot-api</artifactId>
-           <version>1.8.8-R0.1-SNAPSHOT</version>
+           <groupId>org.bukkit</groupId>
+           <artifactId>bukkit</artifactId>
+           <version>1.13.2-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
-    </dependency>
-        <!--Spigot API-->
-        <!-- Start of Spout (disabled because we aren't using it)
-        <dependency>
-            <groupId>org.getspout</groupId>
-            <artifactId>spoutpluginapi</artifactId>
-            <version>dev-SNAPSHOT</version>
         </dependency>
-             End of Spout -->
         <!-- SerializationConfig Dependency -->
         <dependency>
             <groupId>me.main__.util</groupId>
             <artifactId>SerializationConfig</artifactId>
             <version>1.7</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of SerializationConfig Dependency -->
-        <!-- Start of Economy Dependency -->
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.5</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Economy Dependency -->
-        <!-- Start of CommandHandler Dependency -->
-        <dependency>
-            <groupId>com.pneumaticraft.commandhandler</groupId>
-            <artifactId>CommandHandler</artifactId>
-            <version>8</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of CommandHandler Dependency -->
-        <!-- Start of Buscript Dependency -->
-        <dependency>
-            <groupId>com.dumptruckman.minecraft</groupId>
-            <artifactId>buscript</artifactId>
-            <version>1.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Buscript Dependency -->
-        <!-- Start of Metrics Dependency -->
-        <dependency>
-            <groupId>org.mcstats.bukkit</groupId>
-            <artifactId>metrics</artifactId>
-            <version>R6</version>
-            <type>jar</type>
-            <scope>compile</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -313,61 +299,96 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- End of Metrics Dependency -->
-        <!-- Start of Logging Dependency -->
+        <!-- End of SerializationConfig Dependency -->
+        <!-- Start of Economy Dependency -->
+        <dependency>
+            <groupId>com.github.MilkBowl</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- End of Economy Dependency -->
+        <!-- Start of CommandHandler Dependency -->
+        <dependency>
+            <groupId>com.pneumaticraft.commandhandler</groupId>
+            <artifactId>CommandHandler</artifactId>
+            <version>11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>buscript</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>2.2.1</version>
+        </dependency>
         <dependency>
             <groupId>com.dumptruckman.minecraft</groupId>
             <artifactId>Logging</artifactId>
-            <version>1.0.9</version>
-            <type>jar</type>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>craftbukkit</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.1.1</version>
         </dependency>
-        <!-- End of Logging Dependency -->
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>de.themoep.idconverter</groupId>
+            <artifactId>mappings</artifactId>
+            <version>1.2-SNAPSHOT</version>
+        </dependency>
+
         <!-- Start of Test Dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.12</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.4.9</version>
+            <version>2.0.9</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-easymock</artifactId>
-            <version>1.4.9</version>
+            <version>2.0.9</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.4.9</version>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.9</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>3.0</version>
+            <version>4.0.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
             <scope>test</scope>
         </dependency>
-        <!-- End of Test Dependencies -->
     </dependencies>
     <distributionManagement>
         <repository>
             <id>OnARandomBox</id>
             <url>http://repo.onarandombox.com/content/repositories/multiverse</url>
         </repository>
+        <snapshotRepository>
+            <id>OnARandomBox</id>
+            <url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+        </snapshotRepository>
     </distributionManagement>
 </project>

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

@@ -12,6 +12,7 @@ import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
+import com.onarandombox.MultiverseCore.configuration.SpawnSettings;
 import com.onarandombox.MultiverseCore.configuration.WorldPropertyValidator;
 import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
 import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
@@ -23,6 +24,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldType;
@@ -32,6 +34,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 import org.json.simple.JSONObject;
 
 import java.util.Collections;
@@ -184,14 +187,22 @@ public class MVWorld implements MultiverseWorld {
         //this.props.validate();
     }
 
+    /**
+     * This method is here to provide a stopgap until the add/remove/clear methods are implemented with
+     * SerializationConfig.
+     */
+    public void validateEntitySpawns() {
+        setAllowAnimalSpawn(canAnimalsSpawn());
+        setAllowMonsterSpawn(canMonstersSpawn());
+    }
+
     private void validateProperties() {
         setPVPMode(isPVPEnabled());
         setDifficulty(getDifficulty());
         setKeepSpawnInMemory(isKeepingSpawnInMemory());
         setScaling(getScaling());
         setRespawnToWorld(this.props.getRespawnToWorld());
-        setAllowAnimalSpawn(canAnimalsSpawn());
-        setAllowMonsterSpawn(canMonstersSpawn());
+        validateEntitySpawns();
         setGameMode(getGameMode());
     }
 
@@ -203,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);
@@ -246,10 +257,10 @@ public class MVWorld implements MultiverseWorld {
     /**
      * Used to apply the spawning-property.
      */
-    private final class SpawningPropertyValidator extends WorldPropertyValidator<Boolean> {
+    private final class SpawningPropertyValidator extends WorldPropertyValidator<SpawnSettings> {
         @Override
-        public Boolean validateChange(String property, Boolean newValue, Boolean oldValue,
-                MVWorld object) throws ChangeDeniedException {
+        public SpawnSettings validateChange(String property, SpawnSettings newValue, SpawnSettings oldValue,
+                                      MVWorld object) throws ChangeDeniedException {
             boolean allowMonsters, allowAnimals;
             if (getAnimalList().isEmpty()) {
                 allowAnimals = canAnimalsSpawn();
@@ -271,7 +282,9 @@ public class MVWorld implements MultiverseWorld {
                 }
                 world.setSpawnFlags(allowMonsters, allowAnimals);
             }
-            plugin.getMVWorldManager().getTheWorldPurger().purgeWorld(MVWorld.this);
+            if (MultiverseCoreConfiguration.getInstance().isAutoPurgeEnabled()) {
+                plugin.getMVWorldManager().getTheWorldPurger().purgeWorld(MVWorld.this);
+            }
             return super.validateChange(property, newValue, oldValue, object);
         }
     }
@@ -284,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);
             }
@@ -306,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);
@@ -398,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);
         }
     }
 
@@ -409,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.
@@ -437,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!!!");
                 }
             }
         }
@@ -542,6 +555,7 @@ public class MVWorld implements MultiverseWorld {
         if (list == null)
             return false;
         list.clear();
+        validateEntitySpawns();
         return true;
     }
 
@@ -557,6 +571,7 @@ public class MVWorld implements MultiverseWorld {
         if (list == null)
             return false;
         list.add(value);
+        validateEntitySpawns();
         return true;
     }
 
@@ -572,6 +587,7 @@ public class MVWorld implements MultiverseWorld {
         if (list == null)
             return false;
         list.remove(value);
+        validateEntitySpawns();
         return true;
     }
 
@@ -589,29 +605,6 @@ public class MVWorld implements MultiverseWorld {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated This is deprecated.
-     */
-    @Override
-    @Deprecated
-    public <T> com.onarandombox.MultiverseCore.configuration.MVConfigProperty<T> getProperty(String property,
-            Class<T> expected) throws PropertyDoesNotExistException {
-        throw new UnsupportedOperationException("'MVConfigProperty<T> getProperty(String,Class<T>)' is no longer supported!");
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated This is deprecated.
-     */
-    @Override
-    @Deprecated
-    public boolean setProperty(String name, String value, CommandSender sender) throws PropertyDoesNotExistException {
-        return this.setPropertyValue(name, value);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -931,7 +924,7 @@ public class MVWorld implements MultiverseWorld {
      * {@inheritDoc}
      */
     @Override
-    public int getCurrency() {
+    public Material getCurrency() {
         return this.props.getCurrency();
     }
 
@@ -939,7 +932,7 @@ public class MVWorld implements MultiverseWorld {
      * {@inheritDoc}
      */
     @Override
-    public void setCurrency(int currency) {
+    public void setCurrency(@Nullable Material currency) {
         this.props.setCurrency(currency);
     }
 

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

@@ -7,6 +7,21 @@
 
 package com.onarandombox.MultiverseCore;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+
 import buscript.Buscript;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
@@ -17,7 +32,6 @@ import com.onarandombox.MultiverseCore.api.MVPlugin;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.commands.AnchorCommand;
 import com.onarandombox.MultiverseCore.commands.CheckCommand;
@@ -54,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;
@@ -61,6 +76,7 @@ import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.ExactDestination;
 import com.onarandombox.MultiverseCore.destination.PlayerDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
+import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
 import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVChatListener;
@@ -73,10 +89,14 @@ 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;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
@@ -90,8 +110,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
@@ -101,29 +119,15 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginLoader;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.mcstats.Metrics;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
+import org.bukkit.plugin.java.JavaPluginLoader;
 
 /**
  * The implementation of the Multiverse-{@link Core}.
  */
 public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
-    private static final int PROTOCOL = 20;
+    private static final int PROTOCOL = 24;
     // TODO: Investigate if this one is really needed to be static.
     // Doubt it. -- FernFerret
     private static Map<String, String> teleportQueue = new HashMap<String, String>();
@@ -138,11 +142,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     /**
      * This is for unit testing.
-     * @deprecated
+     * @param loader The PluginLoader to use.
+     * @param description The Description file to use.
+     * @param dataFolder The folder that other datafiles can be found in.
+     * @param file The location of the plugin.
      */
-    @Deprecated
-    public MultiverseCore(PluginLoader loader, Server server, PluginDescriptionFile description, File dataFolder, File file) {
-        super(loader, server, description, dataFolder, file);
+    public MultiverseCore(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
+        super(loader, description, dataFolder, file);
     }
 
     /**
@@ -170,11 +176,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         teleportQueue.put(teleportee, teleporter);
     }
 
-    @Override
-    public String toString() {
-        return "The Multiverse-Core Plugin";
-    }
-
     /**
      * {@inheritDoc}
      * @deprecated This is now deprecated, nobody needs it any longer.
@@ -204,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]";
 
@@ -229,7 +231,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     private Buscript buscript;
     private int pluginCount;
     private DestinationFactory destFactory;
-    //private SpoutInterface spoutInterface = null;
     private MultiverseMessaging messaging;
     private BlockSafety blockSafety;
     private LocationManipulation locationManipulation;
@@ -256,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();
     }
 
 
@@ -287,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();
 
@@ -304,12 +308,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         // Setup & Load our Configuration files.
         loadConfigs();
         if (this.multiverseConfig != null) {
-            Logging.setDebugLevel(getMVConfig().getGlobalDebug());
             Logging.setShowingConfig(!getMVConfig().getSilentStart());
             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();
 
@@ -333,118 +336,41 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.chatListener = new MVPlayerChatListener(this, this.playerListener);
         }
         getServer().getPluginManager().registerEvents(this.chatListener, this);
-        /*
-        // Check to see if spout was already loaded (most likely):
-        if (this.getServer().getPluginManager().getPlugin("Spout") != null) {
-            this.setSpout();
-            this.log(Level.INFO, "Spout integration enabled.");
-        }
-        */
 
         this.initializeBuscript();
         this.setupMetrics();
 
         // Output a little snippet to show it's enabled.
         Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), PROTOCOL, getAuthors());
+
+        if (getMVConfig().isShowingDonateMessage()) {
+            getLogger().config("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
+            getLogger().config("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
+        }
+    }
+
+    private void setupMetrics() {
+        if (TestingMode.isDisabled()) {
+            MetricsConfigurator.configureMetrics(this);
+        }
     }
 
     /**
      * Initializes the buscript javascript library.
      */
     private void initializeBuscript() {
-        buscript = new Buscript(this);
-        // Add global variable "multiverse" to javascript environment
-        buscript.getGlobalScope().put("multiverse", buscript.getGlobalScope(), this);
-    }
+        buscript = null;
 
-    /**
-     * Plotter for Environment-Values.
-     */
-    private static final class EnvironmentPlotter extends Metrics.Plotter {
-        private MultiverseCore core;
-        private final Environment env;
-
-        public EnvironmentPlotter(MultiverseCore core, Environment env) {
-            super(envToString(env));
-            this.core = core;
-            this.env = env;
-        }
-
-        private static String envToString(Environment env) {
-            return new StringBuilder().append(env.name().toUpperCase().charAt(0))
-                    .append(env.name().toLowerCase().substring(1)).toString();
-        }
-
-        @Override
-        public int getValue() {
-            int count = 0;
-            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
-                if (w.getEnvironment() == env)
-                    count++;
-            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, env));
-            return count;
-        }
-    }
-
-    /**
-     * Plotter for Generator-Values.
-     */
-    private static final class GeneratorPlotter extends Metrics.Plotter {
-        private MultiverseCore core;
-        private final String gen;
-
-        public GeneratorPlotter(MultiverseCore core, String gen) {
-            super(gen);
-            this.core = core;
-            this.gen = gen;
-        }
-
-        @Override
-        public int getValue() {
-            int count = 0;
-            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
-                if (gen.equals(w.getGenerator()))
-                    count++;
-            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, gen));
-            return count;
-        }
-    }
-
-    private void setupMetrics() {
-        try {
-            Metrics m = new Metrics(this);
-
-            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
-            for (Environment env : Environment.values())
-                envGraph.addPlotter(new EnvironmentPlotter(this, env));
-
-            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
-                @Override
-                public int getValue() {
-                    return getMVWorldManager().getMVWorlds().size();
-                }
-            });
-            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
-                @Override
-                public int getValue() {
-                    return getMVWorldManager().getMVWorlds().size()
-                            + getMVWorldManager().getUnloadedWorlds().size();
-                }
-            });
-
-            Set<String> gens = new HashSet<String>();
-            for (MultiverseWorld w : this.getMVWorldManager().getMVWorlds())
-                gens.add(w.getGenerator());
-            gens.remove(null);
-            gens.remove("null");
-            Metrics.Graph genGraph = m.createGraph("custom_gens");
-            for (String gen : gens)
-                genGraph.addPlotter(new GeneratorPlotter(this, gen));
-
-            m.start();
-            log(Level.FINE, "Metrics have run!");
-        } catch (IOException e) {
-            log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
+        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.");
+            }
         }
     }
 
@@ -468,6 +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);
+        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);
     }
@@ -479,8 +406,19 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     public void loadConfigs() {
         // Now grab the Configuration Files.
         this.multiverseConfig = YamlConfiguration.loadConfiguration(new File(getDataFolder(), "config.yml"));
-        Configuration coreDefaults = YamlConfiguration.loadConfiguration(this.getClass().getResourceAsStream("/defaults/config.yml"));
-        this.multiverseConfig.setDefaults(coreDefaults);
+        InputStream resourceURL = this.getClass().getResourceAsStream("/defaults/config.yml");
+
+        // Read in our default config with UTF-8 now
+        Configuration coreDefaults;
+        try {
+            coreDefaults = YamlConfiguration.loadConfiguration(new BufferedReader(new InputStreamReader(resourceURL, "UTF-8")));
+            this.multiverseConfig.setDefaults(coreDefaults);
+        } catch (UnsupportedEncodingException e) {
+            Logging.severe("Couldn't load default config with UTF-8 encoding. Details follow:");
+            e.printStackTrace();
+            Logging.severe("Default configs NOT loaded.");
+        }
+
         this.multiverseConfig.options().copyDefaults(false);
         this.multiverseConfig.options().copyHeader(true);
 
@@ -504,6 +442,12 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         // Old Config Format
         this.migrate22Values();
         this.saveMVConfigs();
+
+        int level = Logging.getDebugLevel();
+        Logging.setDebugLevel(getMVConfig().getGlobalDebug());
+        if (level != Logging.getDebugLevel()) {
+            getServer().getPluginManager().callEvent(new MVDebugModeEvent(level));
+        }
     }
 
     /**
@@ -569,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;
         }
 
@@ -588,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();
@@ -624,8 +568,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 // migrate entryfee
                 if (section.isConfigurationSection("entryfee")) {
                     ConfigurationSection feeSection = section.getConfigurationSection("entryfee");
-                    if (feeSection.isInt("currency"))
-                        world.setCurrency(feeSection.getInt("currency"));
+                    if (feeSection.isInt("currency")) {
+                        world.setCurrency(MaterialConverter.convertConfigType(feeSection, "currency"));
+                    }
 
                     if (feeSection.isDouble("amount"))
                         world.setPrice(feeSection.getDouble("amount"));
@@ -753,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) {
@@ -771,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;
             }
@@ -871,17 +816,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated This is deprecated.
-     */
-    @Override
-    @Deprecated
-    public com.onarandombox.MultiverseCore.utils.SafeTTeleporter getTeleporter() {
-        return new com.onarandombox.MultiverseCore.utils.SafeTTeleporter(this);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -916,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);
     }
@@ -984,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.
      *
@@ -1081,25 +1028,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         this.serverFolder = newServerFolder;
     }
 
-    /*
-    /**
-     * Initializes Spout.
-     * /
-    public void setSpout() {
-        this.spoutInterface = new SpoutInterface();
-        this.commandHandler.registerCommand(new SpoutCommand(this));
-    }
-
-    /**
-     * Gets our {@link SpoutInterface}.
-     *
-     * @return The {@link SpoutInterface} we're using.
-     * /
-    public SpoutInterface getSpout() {
-        return this.spoutInterface;
-    }
-    */
-
     /**
      * {@inheritDoc}
      */
@@ -1155,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;
         }
     }
@@ -1203,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);
     }
 
     /**

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

@@ -1,10 +1,14 @@
 package com.onarandombox.MultiverseCore;
 
-import com.dumptruckman.minecraft.util.*;
-import com.onarandombox.MultiverseCore.api.*;
-import me.main__.util.SerializationConfig.*;
+import java.util.Map;
 
-import java.util.*;
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
+import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
+import me.main__.util.SerializationConfig.NoSuchPropertyException;
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+import org.bukkit.Bukkit;
 
 /**
  * Our configuration.
@@ -52,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;
@@ -67,6 +73,10 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     private volatile boolean defaultportalsearch;
     @Property
     private volatile int portalsearchradius;
+    @Property
+    private volatile boolean autopurge;
+    @Property
+    private volatile boolean idonotwanttodonate;
 
     public MultiverseCoreConfiguration() {
         super();
@@ -86,11 +96,12 @@ 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;
@@ -98,6 +109,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         silentstart = false;
         defaultportalsearch = false;
         portalsearchradius = 128;
+        autopurge = true;
+        idonotwanttodonate = false;
         // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
     }
 
@@ -203,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}
      */
@@ -226,6 +255,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     public void setGlobalDebug(int globalDebug) {
         this.globaldebug = globalDebug;
         Logging.setDebugLevel(globalDebug);
+        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
     }
 
     /**
@@ -332,4 +362,24 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     public int getPortalSearchRadius() {
         return portalsearchradius;
     }
+
+    @Override
+    public boolean isAutoPurgeEnabled() {
+        return autopurge;
+    }
+
+    @Override
+    public void setAutoPurgeEnabled(boolean autopurge) {
+        this.autopurge = autopurge;
+    }
+
+    @Override
+    public boolean isShowingDonateMessage() {
+        return !idonotwanttodonate;
+    }
+
+    @Override
+    public void setShowDonateMessage(boolean showDonateMessage) {
+        this.idonotwanttodonate = !showDonateMessage;
+    }
 }

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

@@ -18,8 +18,10 @@ import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World.Environment;
 import org.bukkit.configuration.serialization.SerializableAs;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -261,7 +263,7 @@ public class WorldProperties extends SerializationConfig {
     @Property(description = "Sorry, 'animals' must either be: true or false.")
     private volatile SpawnSettings spawning;
     @Property
-    private volatile EntryFee entryfee;
+    volatile EntryFee entryfee;
     @Property(description = "Sorry, 'hunger' must either be: true or false.")
     private volatile boolean hunger;
     @Property(description = "Sorry, 'autoheal' must either be: true or false.")
@@ -496,11 +498,11 @@ public class WorldProperties extends SerializationConfig {
         return this.setPropertyValueUnchecked("respawnWorld", respawnToWorld);
     }
 
-    public int getCurrency() {
+    public Material getCurrency() {
         return this.entryfee.getCurrency();
     }
 
-    public void setCurrency(int currency) {
+    public void setCurrency(@Nullable Material currency) {
         this.setPropertyValueUnchecked("entryfee.currency", currency);
     }
 

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

@@ -8,6 +8,7 @@
 package com.onarandombox.MultiverseCore.api;
 
 import buscript.Buscript;
+import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
@@ -70,17 +71,6 @@ public interface Core {
      */
     MVPlayerSession getPlayerSession(Player player);
 
-    /**
-     * Gets the instantiated Safe-T-Teleporter for performing
-     * safe teleports.
-     *
-     * @return A non-null {@link SafeTTeleporter}.
-     *
-     * @deprecated Use {@link #getSafeTTeleporter()} instead.
-     */
-    @Deprecated
-    com.onarandombox.MultiverseCore.utils.SafeTTeleporter getTeleporter();
-
     /**
      * Multiverse uses an advanced permissions setup, this object
      * simplifies getting/setting permissions.
@@ -97,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.
@@ -127,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.
      */

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

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

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

@@ -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}.
      *
@@ -199,7 +220,7 @@ public interface MVWorldManager {
     boolean isMVWorld(World world);
 
     /**
-     * Load the Worlds & Settings from the configuration file.
+     * Load the Worlds & Settings from the configuration file.
      *
      * @param forceLoad If set to true, this will perform a total
      *                  reset and not just load new worlds.
@@ -207,7 +228,7 @@ public interface MVWorldManager {
     void loadWorlds(boolean forceLoad);
 
     /**
-     * Loads the Worlds & Settings for any worlds that bukkit loaded before us.
+     * Loads the Worlds & Settings for any worlds that bukkit loaded before us.
      * <p>
      * This way people will _always_ have some worlds in the list.
      */
@@ -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();
 }

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

@@ -86,6 +86,18 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      */
     boolean getDisplayPermErrors();
 
+    /**
+     * Sets enableBuscript.
+     * @param enableBuscript The new value.
+     */
+    void setEnableBuscript(boolean enableBuscript);
+
+    /**
+     * Gets enableBuscript.
+     * @return enableBuscript.
+     */
+    boolean getEnableBuscript();
+
     /**
      * Sets firstSpawnOverride.
      * @param firstSpawnOverride The new value.
@@ -199,4 +211,32 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      * @return The portal search radius.
      */
     int getPortalSearchRadius();
+
+    /**
+     * Gets whether or not the automatic purge of entities is enabled.
+     *
+     * @return True if automatic purge is enabled.
+     */
+    boolean isAutoPurgeEnabled();
+
+    /**
+     * Sets whether or not the automatic purge of entities is enabled.
+     *
+     * @param autopurge True if automatic purge should be enabled.
+     */
+    void setAutoPurgeEnabled(boolean autopurge);
+
+    /**
+     * Gets whether or not the donation/patreon messages are shown.
+     *
+     * @return True if donation/patreon messages should be shown.
+     */
+    boolean isShowingDonateMessage();
+
+    /**
+     * Sets whether or not the donation/patreon messages are shown.
+     *
+     * @param idonotwanttodonate True if donation/patreon messages should be shown.
+     */
+    void setShowDonateMessage(boolean idonotwanttodonate);
 }

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

@@ -13,10 +13,12 @@ import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.WorldType;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -153,37 +155,6 @@ public interface MultiverseWorld {
      */
     boolean setPropertyValue(String property, String value) throws PropertyDoesNotExistException;
 
-    /**
-     * Gets the actual MVConfigProperty from this world.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
-     *
-     * @param property The name of a world property to get.
-     * @param expected The type of the expected property. Use Object.class if this doesn't matter for you.
-     * @param <T> The type of the expected property.
-     *
-     * @return A valid MVWorldProperty.
-     *
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     * @deprecated We don't use {@link com.onarandombox.MultiverseCore.configuration.MVConfigProperty} any longer!
-     */
-    @Deprecated
-    <T> com.onarandombox.MultiverseCore.configuration.MVConfigProperty<T> getProperty(String property, Class<T> expected) throws PropertyDoesNotExistException;
-
-    // old config
-    /**
-     * Adds the property to the given value.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
-     *
-     * @param property The name of a world property to set.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @param sender   The sender who wants this value to be set.
-     * @return True if the value was set, false if not.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     * @deprecated Use {@link #setPropertyValue(String, String)} instead.
-     */
-    @Deprecated
-    boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException;
-
     /**
      * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
      *
@@ -504,26 +475,28 @@ public interface MultiverseWorld {
     /**
      * Sets the price for entry to this world.
      * You can think of this like an amount.
-     * The type can be set with {@link #setCurrency(int)}
+     * The type can be set with {@link #setCurrency(Material)}
      *
      * @param price The Amount of money/item to enter the world.
      */
     void setPrice(double price);
 
     /**
-     * Gets the Type of currency that will be used when users enter this world.
+     * Gets the type of currency that will be used when users enter this world. A value of null indicates a non-item
+     * based currency is used.
      *
-     * @return The Type of currency that will be used when users enter this world.
+     * @return The type of currency that will be used when users enter this world.
      */
-    int getCurrency();
+    @Nullable
+    Material getCurrency();
 
     /**
      * Sets the type of item that will be required given the price is not 0.
-     * Use -1 to use an AllPay economy, or any valid itemid
+     * Use a value of null to specify a non-item based currency.
      *
      * @param item The Type of currency that will be used when users enter this world.
      */
-    void setCurrency(int item);
+    void setCurrency(@Nullable Material item);
 
     /**
      * Gets the world players will respawn in if they die in this one.

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

@@ -17,7 +17,7 @@ public interface WorldPurger {
     void purgeWorlds(List<MultiverseWorld> worlds);
 
     /**
-     * Convenience method for {@link #purgeWorld(CommandSender, MultiverseWorld, List, boolean, boolean)} that takes the settings from the world-config.
+     * Convenience method for {@link #purgeWorld(MultiverseWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
      *
      * @param world The {@link MultiverseWorld}.
      */

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

@@ -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?");

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

@@ -33,7 +33,7 @@ public class ConfirmCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.getCommandHandler().confirmQueuedCommand(sender);
+        this.plugin.getCommandQueueManager().runQueuedCommand(sender);
     }
 
 }

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

@@ -62,7 +62,7 @@ public class CoordCommand extends MultiverseCommand {
             df.setMaximumFractionDigits(2);
             p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + plugin.getLocationManipulation().strCoords(p.getLocation()));
             p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + plugin.getLocationManipulation().getDirection(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + Material.getMaterial(world.getBlockTypeIdAt(p.getLocation())));
+            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + world.getBlockAt(p.getLocation()).getType());
         } else {
             sender.sendMessage("This command needs to be used from a Player.");
         }

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

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

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

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

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

@@ -8,9 +8,11 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,9 +35,26 @@ public class DeleteCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        Class<?>[] paramTypes = {String.class};
-        List<Object> objectArgs = new ArrayList<Object>(args);
-        this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
-                paramTypes, ChatColor.GREEN + "World Deleted!", ChatColor.RED + "World could NOT be deleted!");
+        String worldName = args.get(0);
+
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                deleteRunnable(sender, worldName),
+                String.format("Are you sure you want to delete world '%s'? You cannot undo this action.", worldName)
+        ));
+    }
+
+    private Runnable deleteRunnable(@NotNull CommandSender sender,
+                                    @NotNull String worldName) {
+
+        return () -> {
+            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
+            if (this.plugin.getMVWorldManager().deleteWorld(worldName)) {
+                sender.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
+                return;
+            }
+            sender.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.",
+                    ChatColor.RED, worldName));
+        };
     }
 }

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

@@ -10,6 +10,7 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -55,21 +56,61 @@ public class GameruleCommand extends MultiverseCommand {
             return;
         }
 
-        final String gameRule = args.get(0);
+        final GameRule gameRule = GameRule.getByName(args.get(0));
         final String value = args.get(1);
         final World world;
         if (args.size() == 2) {
             world = p.getWorld();
         } else {
             world = Bukkit.getWorld(args.get(2));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(2)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
+            }
         }
 
-        if (world.setGameRuleValue(gameRule, value)) {
-            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
-                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+        if (gameRule == null) {
+            sender.sendMessage(ChatColor.RED + "Failure! " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE
+                    + " is not a valid gamerule.");
         } else {
-            sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
-                    + ChatColor.WHITE + " cannot be set to " + ChatColor.RED + value);
+            if (gameRule.getType() == Boolean.class) {
+                boolean booleanValue;
+                if (value.equalsIgnoreCase("true")) {
+                    booleanValue = true;
+                } else if (value.equalsIgnoreCase("false")) {
+                    booleanValue = false;
+                } else {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to true or false.");
+                    return;
+                }
+
+                if (!world.setGameRule(gameRule, booleanValue)) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "something went wrong.");
+                    return;
+                }
+            } else if (gameRule.getType() == Integer.class) {
+                try {
+                    if (!world.setGameRule(gameRule, Integer.parseInt(value))) {
+                        throw new NumberFormatException();
+                    }
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to a positive integer.");
+                    return;
+                }
+            } else {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                        + ChatColor.WHITE + " isn't supported yet, please let us know about it.");
+                return;
+            }
+
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value + ChatColor.WHITE + ".");
         }
     }
+
+    private String getErrorMessage(String gameRule, String value) {
+        return ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                + ChatColor.WHITE + " could not be set to " + ChatColor.RED + value + ChatColor.WHITE + ", ";
+    }
 }

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

@@ -10,6 +10,7 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -60,6 +61,11 @@ public class GamerulesCommand extends MultiverseCommand {
             world = p.getWorld();
         } else {
             world = Bukkit.getWorld(args.get(0));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
+            }
         }
 
         final StringBuilder gameRules = new StringBuilder();
@@ -68,7 +74,7 @@ public class GamerulesCommand extends MultiverseCommand {
                 gameRules.append(ChatColor.WHITE).append(", ");
             }
             gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
-            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(gameRule));
+            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(GameRule.getByName(gameRule)));
         }
         sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
         sender.sendMessage(gameRules.toString());

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

@@ -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,63 +43,30 @@ 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.equalsIgnoreCase("level.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) {
+        // 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));
 
         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);
@@ -112,10 +77,16 @@ public class ImportCommand extends MultiverseCommand {
         }
         // Since we made an exception for the list, we have to make sure they have at least 2 params:
         // Note the exception is --list, which is covered above.
-        if (args.size() == 1) {
+        if (args.size() == 1 || worldName.length() < 1) {
             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)) {
@@ -142,21 +113,25 @@ public class ImportCommand extends MultiverseCommand {
             return;
         }
 
-        if (worldFile.exists() && env != null) {
-            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
-            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
-                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
-            else
-                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
+        if (!worldFile.exists()) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            String worldList = this.getPotentialWorldStrings();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
+        } 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));
         } else if (env == null) {
             sender.sendMessage(ChatColor.RED + "FAILED.");
             sender.sendMessage("That world environment did not exist.");
             sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
         } else {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            String worldList = this.getPotentialWorlds();
-            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
-            sender.sendMessage(worldList);
+            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
+            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
+                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
+            else
+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
         }
     }
-}
+}

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

@@ -115,6 +115,7 @@ public class InfoCommand extends MultiverseCommand {
         FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
         message.add(new FancyHeader("General Info", colors));
         message.add(new FancyMessage("World Name: ", world.getName(), colors));
+        message.add(new FancyMessage("World UID: ", world.getCBWorld().getUID().toString(), colors));
         message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
         message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
         message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
@@ -151,6 +152,7 @@ public class InfoCommand extends MultiverseCommand {
         message = new ArrayList<FancyText>();
         message.add(new FancyHeader("More World Settings", colors));
         message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Generator: ", world.getGenerator(), colors));
         message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
         message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
         message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
@@ -181,8 +183,8 @@ public class InfoCommand extends MultiverseCommand {
         message.add(new FancyHeader("Animal Settings", colors));
         message.add(new FancyMessage("Multiverse Setting: ", world.canAnimalsSpawn() + "", colors));
         message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowAnimals() + "", colors));
-        if (world.getMonsterList().size() > 0) {
-            if (world.canMonstersSpawn()) {
+        if (world.getAnimalList().size() > 0) {
+            if (world.canAnimalsSpawn()) {
                 message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT "
                         + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
             } else {

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

@@ -26,7 +26,7 @@ public class ListCommand extends PaginatedCoreCommand<String> {
     public ListCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("World Listing");
-        this.setCommandUsage("/mv list");
+        this.setCommandUsage("/mv list [page]");
         this.setArgRange(0, 2);
         this.addKey("mvlist");
         this.addKey("mvl");

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

@@ -77,7 +77,7 @@ public class ModifyAddCommand extends MultiverseCommand {
 
         if (!ModifyCommand.validateAction(Action.Add, property)) {
             sender.sendMessage("Sorry, you can't ADD to " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
             return;
         }
 

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

@@ -72,7 +72,7 @@ public class ModifyClearCommand extends MultiverseCommand {
 
         if (!ModifyCommand.validateAction(Action.Clear, property)) {
             sender.sendMessage("Sorry, you can't use CLEAR with " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/cgB2B");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/q1h01S");
             return;
         }
         // TODO fix this

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

@@ -78,7 +78,7 @@ public class ModifyRemoveCommand extends MultiverseCommand {
 
         if (!ModifyCommand.validateAction(Action.Remove, property)) {
             sender.sendMessage("Sorry, you can't REMOVE anything from" + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
             return;
         }
         // TODO fix this

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

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

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

@@ -27,6 +27,7 @@ public class ReloadCommand extends MultiverseCommand {
         this.setCommandUsage("/mv reload");
         this.setArgRange(0, 0);
         this.addKey("mvreload");
+        this.addKey("mvr");
         this.addKey("mv reload");
         this.addCommandExample("/mv reload");
         this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);

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

@@ -35,6 +35,10 @@ public class ScriptCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
+        if (plugin.getScriptAPI() == null) {
+            sender.sendMessage("Buscript failed to load while the server was starting. Scripts cannot be run.");
+            return;
+        }
         File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
         if (!file.exists()) {
             sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");

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

@@ -18,6 +18,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 
 import java.util.List;
+import org.bukkit.Bukkit;
 
 /**
  * Sets the spawn for a world.
@@ -27,8 +28,9 @@ public class SetSpawnCommand extends MultiverseCommand {
         super(plugin);
         this.setName("Set World Spawn");
         this.setCommandUsage("/mv setspawn");
-        this.setArgRange(0, 0);
+        this.setArgRange(0, 6);
         this.addKey("mvsetspawn");
+        this.addKey("mvsets");
         this.addKey("mvss");
         this.addKey("mv set spawn");
         this.addKey("mv setspawn");
@@ -37,43 +39,110 @@ public class SetSpawnCommand extends MultiverseCommand {
         this.setPermission("multiverse.core.spawn.set", "Sets the spawn for the current world.", PermissionDefault.OP);
     }
 
+    /**
+     * Dispatches the user's command depending on the number of parameters
+     * @param sender The player who executes the command, may be console as well.
+     * @param args Command line parameters
+     */
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        setWorldSpawn(sender);
+        if (args.isEmpty()) {
+            setWorldSpawn(sender);
+        } else if (args.size() == 4) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3));
+        } else if (args.size() == 6) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3), args.get(4), args.get(5));
+        } else {
+            sender.sendMessage("Use no arguments for your current location, or world/x/y/z, or world/x/y/z/yaw/pitch!");
+        }
     }
 
     /**
-     * Does the actual spawn-setting-work.
-     *
-     * @param sender The {@link CommandSender} that's setting the spawn.
+     * Set the world spawn when no parameters are given
+     * @param sender The {@link CommandSender} who executes the command. 
+     *               Everything not a {@link Player}, e.g. console, gets rejected, as we can't get coordinates from there.
      */
     protected void setWorldSpawn(CommandSender sender) {
         if (sender instanceof Player) {
             Player p = (Player) sender;
             Location l = p.getLocation();
             World w = p.getWorld();
-            MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
-            if (foundWorld != null) {
-                foundWorld.setSpawnLocation(p.getLocation());
-                BlockSafety bs = this.plugin.getBlockSafety();
-                if (!bs.playerCanSpawnHereSafely(p.getLocation()) && foundWorld.getAdjustSpawn()) {
-                    sender.sendMessage("It looks like that location would normally be unsafe. But I trust you.");
-                    sender.sendMessage("I'm turning off the Safe-T-Teleporter for spawns to this world.");
-                    sender.sendMessage("If you want this turned back on just do:");
-                    sender.sendMessage(ChatColor.AQUA + "/mvm set adjustspawn true " + foundWorld.getAlias());
-                    foundWorld.setAdjustSpawn(false);
-                }
-                sender.sendMessage("Spawn was set to: " + plugin.getLocationManipulation().strCoords(p.getLocation()));
-                if (!plugin.saveWorldConfig()) {
-                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-                }
-            } else {
-                w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
-                sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");
-            }
-
+            setWorldSpawn(sender, w, l);
         } else {
-            sender.sendMessage("You cannot use this command from the console.");
+            sender.sendMessage("You need to give coordinates to use this command from the console!");
+        }
+    }
+    
+    /**
+     * Set the world spawn when 4 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z) {
+        setWorldSpawn(sender, world, x, y, z, "0", "0");
+    }
+
+    /**
+     * Set the world spawn when 6 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param yaw Yaw a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     * @param pitch Pitch a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z, String yaw, String pitch) {
+        double dx, dy, dz;
+        float fpitch, fyaw;
+        World bukkitWorld = Bukkit.getWorld(world);
+        if (bukkitWorld == null) {
+            sender.sendMessage("World " + world + " is unknown!");
+            return;
+        }
+        try {
+            dx = Double.parseDouble(x);
+            dy = Double.parseDouble(y);
+            dz = Double.parseDouble(z);
+            fpitch = Float.parseFloat(pitch);
+            fyaw = Float.parseFloat(yaw);
+        } catch (NumberFormatException ex) {
+            sender.sendMessage("All coordinates must be numeric");
+            return;
+        }
+        Location l = new Location(bukkitWorld, dx, dy, dz, fyaw, fpitch);
+        setWorldSpawn(sender, bukkitWorld, l);
+    }
+
+    /**
+     * Does the actual spawn-setting-work.
+     *
+     * @param sender The {@link CommandSender} that's setting the spawn.
+     * @param w The {@link World} to set the spawn in
+     * @param l The {@link Location} to set the spawn to
+     */
+    private void setWorldSpawn(CommandSender sender, World w, Location l) {
+        MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
+        if (foundWorld != null) {
+            foundWorld.setSpawnLocation(l);
+            BlockSafety bs = this.plugin.getBlockSafety();
+            if (!bs.playerCanSpawnHereSafely(l) && foundWorld.getAdjustSpawn()) {
+                sender.sendMessage("It looks like that location would normally be unsafe. But I trust you.");
+                sender.sendMessage("I'm turning off the Safe-T-Teleporter for spawns to this world.");
+                sender.sendMessage("If you want this turned back on just do:");
+                sender.sendMessage(ChatColor.AQUA + "/mvm set adjustspawn true " + foundWorld.getAlias());
+                foundWorld.setAdjustSpawn(false);
+            }
+            sender.sendMessage("Spawn was set to: " + plugin.getLocationManipulation().strCoords(l));
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
+            sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");
         }
     }
 }

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

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

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

@@ -1,66 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-/*
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-import org.getspout.spoutapi.gui.GenericButton;
-import org.getspout.spoutapi.gui.GenericPopup;
-import org.getspout.spoutapi.gui.PopupScreen;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import java.util.List;
-
-/**
- * Edit a world with spout.
- * /
-public class SpoutCommand extends MultiverseCommand {
-
-    public SpoutCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Edit World with Spout");
-        this.setCommandUsage("/mv spout");
-        this.setArgRange(0, 0);
-        this.addKey("mv spout");
-        this.setPermission("multiverse.core.spout", "Edit a world with spout.", PermissionDefault.OP);
-        this.addCommandExample("/mv spout");
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(ChatColor.RED + "This command must be run as a player!");
-            return;
-        }
-        if (plugin.getSpout() == null) {
-            sender.sendMessage(ChatColor.RED + "You need spout installed on this server to use it with Multiverse!");
-            return;
-        }
-        SpoutPlayer p = (SpoutPlayer) sender;
-        if (!p.isSpoutCraftEnabled()) {
-            sender.sendMessage(ChatColor.RED + p.getName() + "You need to be using the Spoutcraft client to run this command!");
-            return;
-        }
-        PopupScreen pop = new GenericPopup();
-        GenericButton button = new GenericButton("Fish");
-        // TO-DO maybe use constants for these
-        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        button.setX(50);
-        button.setY(50);
-        button.setWidth(100);
-        button.setHeight(40);
-        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        pop.attachWidget(this.plugin, button);
-        sender.sendMessage(ChatColor.GREEN + "YAY!");
-        p.getMainScreen().attachPopupScreen(pop);
-    }
-}
-*/

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

@@ -7,9 +7,11 @@
 
 package com.onarandombox.MultiverseCore.commands;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
@@ -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.
@@ -40,7 +42,7 @@ public class TeleportCommand extends MultiverseCommand {
         Permission menu = new Permission("multiverse.teleport.*", "Allows you to display the teleport menu.", PermissionDefault.OP);
 
         this.setName("Teleport");
-        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {WORLD}");
+        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {DESTINATION}");
         this.setArgRange(1, 2);
         this.addKey("mvtp");
         this.addKey("mv tp");
@@ -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)) {

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

@@ -10,35 +10,119 @@ package com.onarandombox.MultiverseCore.commands;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.utils.webpaste.BitlyURLShortener;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
 import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerFactory;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerType;
+import com.pneumaticraft.commandhandler.CommandHandler;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.scheduler.BukkitRunnable;
 
+import java.io.File;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Dumps version info to the console.
  */
 public class VersionCommand extends MultiverseCommand {
-    private static final URLShortener SHORTENER = new BitlyURLShortener();
+    private static final URLShortener SHORTENER = URLShortenerFactory.getService(URLShortenerType.BITLY);
 
     public VersionCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[pb]");
-        this.setArgRange(0, 1);
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "[-b|-h|-p] [--include-plugin-list]");
+        this.setArgRange(0, 2);
         this.addKey("mv version");
+        this.addKey("mvver");
         this.addKey("mvv");
         this.addKey("mvversion");
-        this.setPermission("multiverse.core.version",
-                "Dumps version info to the console, optionally to pastie.org with -p or pastebin.com with a -b.", 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() + '\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" + '\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) {
+        // add the legacy version info
+        event.appendVersionInfo(this.getLegacyString());
+
+        // add the legacy file, but as markdown so it's readable
+        // 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("multiverse-core/config.yml", configFile);
+
+        // add worlds.yml
+        File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
+        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
     }
 
     @Override
@@ -48,71 +132,94 @@ public class VersionCommand extends MultiverseCommand {
             sender.sendMessage("Version info dumped to console. Please check your server logs.");
         }
 
-        StringBuilder buffer = new StringBuilder();
-        buffer.append("[Multiverse-Core] Multiverse-Core Version: ").append(this.plugin.getDescription().getVersion()).append('\n');
-        buffer.append("[Multiverse-Core] Bukkit Version: ").append(this.plugin.getServer().getVersion()).append('\n');
-        buffer.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds()).append('\n');
-        buffer.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
-        buffer.append("[Multiverse-Core] Economy being used: ").append(plugin.getEconomist().getEconomyName()).append('\n');
-        buffer.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
-        buffer.append("[Multiverse-Core] Dumping Config Values: (version ")
-                .append(this.plugin.getMVConfig().getVersion()).append(")").append('\n');
-        buffer.append("[Multiverse-Core]  messagecooldown: ").append(plugin.getMessaging().getCooldown()).append('\n');
-        buffer.append("[Multiverse-Core]  teleportcooldown: ").append(plugin.getMVConfig().getTeleportCooldown()).append('\n');
-        buffer.append("[Multiverse-Core]  worldnameprefix: ").append(plugin.getMVConfig().getPrefixChat()).append('\n');
-        buffer.append("[Multiverse-Core]  worldnameprefixFormat: ").append(plugin.getMVConfig().getPrefixChatFormat()).append('\n');
-        buffer.append("[Multiverse-Core]  enforceaccess: ").append(plugin.getMVConfig().getEnforceAccess()).append('\n');
-        buffer.append("[Multiverse-Core]  displaypermerrors: ").append(plugin.getMVConfig().getDisplayPermErrors()).append('\n');
-        buffer.append("[Multiverse-Core]  teleportintercept: ").append(plugin.getMVConfig().getTeleportIntercept()).append('\n');
-        buffer.append("[Multiverse-Core]  firstspawnoverride: ").append(plugin.getMVConfig().getFirstSpawnOverride()).append('\n');
-        buffer.append("[Multiverse-Core]  firstspawnworld: ").append(plugin.getMVConfig().getFirstSpawnWorld()).append('\n');
-        buffer.append("[Multiverse-Core]  debug: ").append(plugin.getMVConfig().getGlobalDebug()).append('\n');
-        buffer.append("[Multiverse-Core] Special Code: FRN002").append('\n');
+        MVVersionEvent versionEvent = new MVVersionEvent();
 
-        MVVersionEvent versionEvent = new MVVersionEvent(buffer.toString());
+        this.addVersionInfoToEvent(versionEvent);
         this.plugin.getServer().getPluginManager().callEvent(versionEvent);
 
-        // log to console
-        final String data = versionEvent.getVersionInfo();
-        String[] lines = data.split("\n");
-        for (String line : lines) {
-            Logging.info(line);
+        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
+            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
+            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
         }
 
-        this.plugin.getServer().getScheduler().scheduleAsyncDelayedTask(this.plugin, new Runnable() {
+        final String versionInfo = versionEvent.getVersionInfo();
+        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
+
+        final Map<String, String> files = versionEvent.getDetailedVersionInfo();
+
+        // log to console
+        String[] lines = versionInfo.split("\\r?\\n");
+        for (String line : lines) {
+            if (!line.isEmpty()) {
+                this.plugin.getServer().getLogger().info(line);
+            }
+        }
+
+        BukkitRunnable logPoster = new BukkitRunnable() {
             @Override
             public void run() {
-                if (args.size() == 1) {
+                if (args.size() > 0) {
                     String pasteUrl;
-                    if (args.get(0).equalsIgnoreCase("-p")) {
-                        pasteUrl = postToService(PasteServiceType.PASTIE, true, data); // private post to pastie
-                    } else if (args.get(0).equalsIgnoreCase("-b")) {
-                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data); // private post to pastie
+                    if (CommandHandler.hasFlag("-b", args)) {
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-g", args)) {
+                        // private post to github
+                        pasteUrl = postToService(PasteServiceType.GITHUB, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-h", args)) {
+                        // private post to hastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-p", args)) {
+                        // private post to paste.gg
+                        pasteUrl = postToService(PasteServiceType.PASTEGG, true, versionInfo, files);
                     } else {
                         return;
                     }
 
-                    sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+                    if (!(sender instanceof ConsoleCommandSender)) {
+                        sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+                    }
                     Logging.info("Version info dumped here: %s", pasteUrl);
                 }
             }
-        });
+        };
+
+        // Run the log posting operation asynchronously, since we don't know how long it will take.
+        logPoster.runTaskAsynchronously(this.plugin);
     }
 
     /**
      * Send the current contents of this.pasteBinBuffer to a web service.
      *
-     * @param type      Service type to send to
-     * @param isPrivate Should the paste be marked as private.
+     * @param type       Service type to send paste data to.
+     * @param isPrivate  Should the paste be marked as private.
+     * @param pasteData  Legacy string only data to post to a service.
+     * @param pasteFiles Map of filenames/contents of debug info.
      * @return URL of visible paste
      */
-    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData) {
+    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData, Map<String, String> pasteFiles) {
         PasteService ps = PasteServiceFactory.getService(type, isPrivate);
+
         try {
-            return SHORTENER.shorten(ps.postData(ps.encodeData(pasteData), ps.getPostURL()));
+            String result;
+            if (ps.supportsMultiFile()) {
+                result = ps.postData(pasteFiles);
+            } else {
+                result = ps.postData(pasteData);
+            }
+
+            if (SHORTENER != null) return SHORTENER.shorten(result);
+            return result;
         } catch (PasteFailedException e) {
-            System.out.print(e);
-            return "Error posting to service";
+            e.printStackTrace();
+            return "Error posting to service.";
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return "That service isn't supported yet.";
         }
     }
+
+    private String getPluginList() {
+        return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
+    }
 }

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

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

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

@@ -0,0 +1,104 @@
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+/**
+ * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
+ */
+class DummyCommandBlockSender implements CommandSender {
+
+    @Override
+    public void sendMessage(@NotNull String message) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void sendMessage(@NotNull String[] messages) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Server getServer() {
+        return Bukkit.getServer();
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return "DummyCommandBlockSender";
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void removeAttachment(@NotNull PermissionAttachment attachment) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void recalculatePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Set<PermissionAttachmentInfo> getEffectivePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isOp() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setOp(boolean value) {
+        throw new UnsupportedOperationException();
+    }
+}

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

@@ -0,0 +1,86 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
+ * dangerous action.
+ */
+public class QueuedCommand {
+
+    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
+    private static final int DEFAULT_VALID_TIME = 10;
+
+    private final CommandSender sender;
+    private final Runnable action;
+    private final String prompt;
+    private final int validDuration;
+    private BukkitTask expireTask;
+
+    public QueuedCommand(CommandSender sender, Runnable action) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
+        this(sender, action, prompt, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
+    }
+
+    /**
+     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
+     *
+     * @param sender        The sender that ran the command needed for confirmation.
+     * @param action        The logic to execute upon confirming.
+     * @param prompt        Question to ask sender to confirm.
+     * @param validDuration Duration in which the command is valid for confirm in seconds.
+     */
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
+        this.sender = sender;
+        this.action = action;
+        this.prompt = prompt;
+        this.validDuration = validDuration;
+    }
+
+    @NotNull
+    CommandSender getSender() {
+        return sender;
+    }
+
+    @NotNull
+    String getPrompt() {
+        return prompt;
+    }
+
+    int getValidDuration() {
+        return validDuration;
+    }
+
+    @NotNull
+    Runnable getAction() {
+        return action;
+    }
+
+    @NotNull
+    BukkitTask getExpireTask() {
+        return expireTask;
+    }
+
+    void setExpireTask(@NotNull BukkitTask expireTask) {
+        if (this.expireTask != null) {
+            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
+        }
+        this.expireTask = expireTask;
+    }
+}

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

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

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

@@ -2,10 +2,14 @@ package com.onarandombox.MultiverseCore.configuration;
 
 import java.util.Map;
 
+import com.onarandombox.MultiverseCore.utils.MaterialConverter;
 import me.main__.util.SerializationConfig.Property;
 import me.main__.util.SerializationConfig.SerializationConfig;
 
+import me.main__.util.SerializationConfig.Serializor;
+import org.bukkit.Material;
 import org.bukkit.configuration.serialization.SerializableAs;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Entryfee-settings.
@@ -14,8 +18,11 @@ import org.bukkit.configuration.serialization.SerializableAs;
 public class EntryFee extends SerializationConfig {
     @Property
     private double amount;
-    @Property
-    private int currency;
+    @Property(serializor = EntryFeeCurrencySerializor.class)
+    @Nullable
+    private Material currency;
+
+    private final Material DISABLED_MATERIAL = Material.AIR;
 
     public EntryFee() {
         super();
@@ -31,7 +38,7 @@ public class EntryFee extends SerializationConfig {
     @Override
     protected void setDefaults() {
         amount = 0D;
-        currency = -1;
+        currency = null;
     }
 
     /**
@@ -44,7 +51,11 @@ public class EntryFee extends SerializationConfig {
     /**
      * @return the currency
      */
-    public int getCurrency() {
+    @Nullable
+    public Material getCurrency() {
+        if (currency == null || currency.equals(DISABLED_MATERIAL)) {
+            return null;
+        }
         return currency;
     }
 
@@ -60,7 +71,19 @@ public class EntryFee extends SerializationConfig {
      * Sets the currency.
      * @param currency The new value.
      */
-    public void setCurrency(int currency) {
+    public void setCurrency(@Nullable Material currency) {
         this.currency = currency;
     }
+
+    public static final class EntryFeeCurrencySerializor implements Serializor<Material, Object> {
+        @Override
+        public String serialize(Material material) {
+            return material.toString();
+        }
+
+        @Override
+        public Material deserialize(Object o, Class<Material> aClass) {
+            return MaterialConverter.convertTypeString(o.toString());
+        }
+    }
 }

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

@@ -1,37 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2012.                       *
- * 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.configuration;
-
-/**
- * An "active" {@link MVConfigProperty} that uses the specified method to be "actually" set.
- * @param <T> The type of the config-property.
- * @deprecated This is deprecated.
- * @see MVConfigProperty
- */
-@Deprecated
-public interface MVActiveConfigProperty<T> extends MVConfigProperty<T> {
-    /**
-     * Gets the method that will be executed.
-     *
-     * @return The name of the method in MVWorld to be called.
-     */
-    String getMethod();
-
-    /**
-     * Sets the method that will be executed.
-     *
-     * @param methodName The name of the method in MVWorld to be called.
-     */
-    void setMethod(String methodName);
-
-    /**
-     * Returns the class of the object we're looking at.
-     * @return the class of the object we're looking at.
-     */
-    Class<?> getPropertyClass();
-}

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

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-/**
- * A generic config-property.
- *
- * @param <T> The type of the config-property.
- * @deprecated This is deprecated.
- */
-@Deprecated
-public interface MVConfigProperty<T> {
-    /**
-     * Gets the name of this property.
-     *
-     * @return The name of this property.
-     */
-    String getName();
-
-    /**
-     * Gets the value of this property.
-     *
-     * @return The value of this property.
-     */
-    T getValue();
-
-    /**
-     * Gets the string representation of this value.
-     *
-     * @return The value of this property as a string.
-     */
-    String toString();
-
-    /**
-     * Gets the help string for this.
-     *
-     * @return The value of this property as a string.
-     */
-    String getHelp();
-
-    /**
-     * Sets the value of this property.
-     *
-     * @param value The T representation of this value.
-     * @return True the value was successfully set.
-     */
-    boolean setValue(T value);
-
-    /**
-     * This parseValue should be used with strings.
-     *
-     * @param value The string representation of the value to set.
-     *
-     * @return True if the value was set, false if not.
-     */
-    boolean parseValue(String value);
-
-    /**
-     * Gets the name of the config-node that this {@link MVConfigProperty} is saved as.
-     *
-     * @return The name of the config-node that this {@link MVConfigProperty} is saved as.
-     */
-    String getConfigNode();
-}

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

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

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

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

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

@@ -21,9 +21,10 @@ import java.util.List;
  * An exact {@link MVDestination}.
  */
 public class ExactDestination implements MVDestination {
-    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
+    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~)";
     private boolean isValid;
     private Location location;
+    private boolean relativeX, relativeY, relativeZ;
 
     /**
      * {@inheritDoc}
@@ -88,7 +89,20 @@ public class ExactDestination implements MVDestination {
      */
     @Override
     public Location getLocation(Entity e) {
-        return this.location;
+        Location loc = this.location.clone();
+        if (relativeX || relativeY || relativeZ) {
+            Location eLoc = e.getLocation();
+            loc.add(relativeX ? eLoc.getX() : 0, relativeY ? eLoc.getY() : 0, relativeZ ? eLoc.getZ() : 0);
+            // Since the location is relative, it makes sense to use the entity's pitch and yaw unless those were
+            // specified in the destination.
+            if (loc.getPitch() == 0) {
+                loc.setPitch(eLoc.getPitch());
+            }
+            if (loc.getYaw() == 0) {
+                loc.setYaw(eLoc.getYaw());
+            }
+        }
+        return loc;
     }
 
     /**
@@ -134,11 +148,42 @@ public class ExactDestination implements MVDestination {
         double[] coords = new double[3];
         String[] coordString = parsed.get(2).split(",");
         for (int i = 0; i < 3; i++) {
-            try {
-                coords[i] = Double.parseDouble(coordString[i]);
-            } catch (NumberFormatException e) {
-                this.isValid = false;
-                return;
+            String[] relSplit = coordString[i].split("~");
+            boolean relative = false;
+            if (relSplit.length == 0) {
+                // coord is "~" form
+                relative = true;
+                coords[i] = 0;
+            } else if (relSplit.length == 1) {
+                // coord is "123" form
+                try {
+                    coords[i] = Double.parseDouble(relSplit[0]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            } else {
+                // coord is "~123" form
+                relative = true;
+                try {
+                    coords[i] = Double.parseDouble(relSplit[1]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            }
+            if (relative) {
+                switch (i) {
+                    case 0:
+                        relativeX = true;
+                        break;
+                    case 1:
+                        relativeY = true;
+                        break;
+                    case 2:
+                        relativeZ = true;
+                        break;
+                }
             }
         }
         this.location.setX(coords[0]);

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

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

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

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

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

@@ -0,0 +1,43 @@
+package com.onarandombox.MultiverseCore.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Called when Core's debug level is changed.
+ */
+public class MVDebugModeEvent extends Event {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    private final int level;
+
+    public MVDebugModeEvent(int level) {
+        this.level = level;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
+    /**
+     * Returns the current debug level of Core.
+     *
+     * @return the current debug level of Core.
+     */
+    public int getLevel() {
+        return level;
+    }
+}

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

@@ -1,17 +1,29 @@
 package com.onarandombox.MultiverseCore.event;
 
+import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Called when somebody requests version information about Multiverse.
  */
 public class MVVersionEvent extends Event {
 
     private final StringBuilder versionInfoBuilder;
+    private final Map<String, String> detailedVersionInfo;
 
-    public MVVersionEvent(String versionInfo) {
-        this.versionInfoBuilder = new StringBuilder(versionInfo);
+    public MVVersionEvent() {
+        versionInfoBuilder = new StringBuilder();
+        detailedVersionInfo = new HashMap<>();
     }
 
     private static final HandlerList HANDLERS = new HandlerList();
@@ -40,6 +52,21 @@ public class MVVersionEvent extends Event {
         return this.versionInfoBuilder.toString();
     }
 
+    /**
+     * Gets the key/value pair of the detailed version info.
+     *
+     * This information is used for advanced paste services that would prefer
+     * to get the information as several files. Examples include config.yml or
+     * portals.yml. Note that the map returned is immutable.
+     *
+     * The keys are filenames, the values are the contents of the files.
+     *
+     * @return The immutable key value mapping of files and the contents of those files.
+     */
+    public Map<String, String> getDetailedVersionInfo() {
+        return Collections.unmodifiableMap(this.detailedVersionInfo);
+    }
+
     /**
      * Appends more version-info to the version-info currently saved in this event.
      * @param moreVersionInfo The version-info to add. Should end with '\n'.
@@ -47,4 +74,46 @@ public class MVVersionEvent extends Event {
     public void appendVersionInfo(String moreVersionInfo) {
         this.versionInfoBuilder.append(moreVersionInfo);
     }
+
+    private String readFile(final String filename) {
+        StringBuilder result;
+
+        try {
+            FileReader reader = new FileReader(filename);
+            BufferedReader bufferedReader = new BufferedReader(reader);
+            String line;
+            result = new StringBuilder();
+            while ((line = bufferedReader.readLine()) != null) {
+                result.append(line).append("\n");
+            }
+        } catch (FileNotFoundException e) {
+            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
+        } catch (IOException e) {
+            Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
+        }
+
+        return result.toString();
+    }
+
+    /**
+     * Adds a file to to the detailed version-info currently saved in this event.
+     * @param fileName The name of the file.
+     * @param contents The contents of the file.
+     */
+    public void putDetailedVersionInfo(String fileName, String contents) {
+        this.detailedVersionInfo.put(fileName, contents);
+    }
+
+    /**
+     * Adds a file to to the detailed version-info currently saved in this event.
+     * @param filename The name of the file.
+     * @param file     The file.
+     */
+    public void putDetailedVersionInfo(String filename, File file) {
+        this.putDetailedVersionInfo(filename, readFile(file.getAbsolutePath()));
+    }
 }

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

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

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

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

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

@@ -29,7 +29,7 @@ public class MVMapListener implements Listener {
     public void mapInitialize(final MapInitializeEvent event) {
         for (final Player player : Bukkit.getOnlinePlayers()) {
             if ((player.getItemInHand().getType() == Material.MAP
-                    || player.getItemInHand().getType() == Material.EMPTY_MAP)
+                    || player.getItemInHand().getType() == Material.FILLED_MAP)
                     && player.getItemInHand().getDurability() == event.getMap().getId()) {
                 final Location playerLoc = player.getLocation();
                 final MapView map = event.getMap();

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

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

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

@@ -11,7 +11,9 @@ import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.RespawnType;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
+import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -31,7 +33,6 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
 
 /**
  * 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 + "'.");
     }
 
@@ -252,7 +260,7 @@ public class MVPlayerListener implements Listener {
 
         // REMEMBER! getTo MAY be NULL HERE!!!
         // If the player was actually outside of the portal, adjust the from location
-        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.PORTAL) {
+        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.NETHER_PORTAL) {
             Location newloc = this.plugin.getSafeTTeleporter().findPortalBlockNextTo(event.getFrom());
             // TODO: Fix this. Currently, we only check for PORTAL blocks. I'll have to figure out what
             // TODO: we want to do here.
@@ -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,17 +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() && event.getPortalTravelAgent() != null) {
-            event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
+        if (!this.plugin.getMVConfig().isUsingDefaultPortalSearch()) {
+            CompatibilityLayer.setPortalSearchRadius(event, this.plugin.getMVConfig().getPortalSearchRadius());
         }
     }
 
@@ -327,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.");
         }
     }
@@ -368,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);

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

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

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

@@ -74,7 +74,7 @@ public class AnchorManager {
             this.anchorConfig.save(new File(this.plugin.getDataFolder(), "anchors.yml"));
             return true;
         } catch (IOException e) {
-            this.plugin.log(Level.SEVERE, "Failed to save anchors.yml. Please check your file permissions.");
+            Logging.severe("Failed to save anchors.yml. Please check your file permissions.");
             return false;
         }
     }
@@ -140,8 +140,17 @@ public class AnchorManager {
             if (ancLoc == null) {
                 continue;
             }
-            if (p.hasPermission("multiverse.access." + ancLoc.getWorld().getName())) {
+            String worldPerm = "multiverse.access." + ancLoc.getWorld().getName();
+            // Add to the list if we're not enforcing access
+            // OR
+            // We are enforcing access and the user has the permission.
+            if (!this.plugin.getMVConfig().getEnforceAccess() ||
+                    (this.plugin.getMVConfig().getEnforceAccess() && p.hasPermission(worldPerm))) {
                 myAnchors.add(anchor);
+            } else {
+                Logging.finer(String.format("Not adding anchor %s to the list, user %s doesn't have the %s " +
+                        "permission and 'enforceaccess' is enabled!",
+                        anchor, p.getName(), worldPerm));
             }
         }
         return Collections.unmodifiableSet(myAnchors);

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

@@ -1,281 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.utils;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Vehicle;
-
-/**
- * Used to determine block/location-related facts.
- *
- * @deprecated Use instead: {@link com.onarandombox.MultiverseCore.api.BlockSafety} and {@link SimpleBlockSafety}.
- */
-@Deprecated
-public class BlockSafety {
-
-    /**
-     * This function checks whether the block at the given coordinates are above air or not.
-     * @param l The {@link Location} of the block.
-     * @return True if the block at that {@link Location} is above air.
-     */
-    public boolean isBlockAboveAir(Location l) {
-        Location downOne = l.clone();
-        downOne.setY(downOne.getY() - 1);
-        return (downOne.getBlock().getType() == Material.AIR);
-    }
-
-    // TODO maybe remove this?
-    private boolean blockIsNotSafe(World world, double x, double y, double z) {
-        return !playerCanSpawnHereSafely(world, x, y, z);
-    }
-
-    /**
-     * Checks if a player can spawn safely at the given coordinates.
-     * @param world The {@link World}.
-     * @param x The x-coordinate.
-     * @param y The y-coordinate.
-     * @param z The z-coordinate.
-     * @return True if a player can spawn safely at the given coordinates.
-     */
-    public boolean playerCanSpawnHereSafely(World world, double x, double y, double z) {
-        Location l = new Location(world, x, y, z);
-        return playerCanSpawnHereSafely(l);
-    }
-
-    /**
-     * This function checks whether the block at the coordinates given is safe or not by checking for Lava/Fire/Air
-     * etc. This also ensures there is enough space for a player to spawn!
-     *
-     * @param l The {@link Location}
-     * @return Whether the player can spawn safely at the given {@link Location}
-     */
-    public boolean playerCanSpawnHereSafely(Location l) {
-        if (l == null) {
-            // Can't safely spawn at a null location!
-            return false;
-        }
-
-        World world = l.getWorld();
-        Location actual = l.clone();
-        Location upOne = l.clone();
-        Location downOne = l.clone();
-        upOne.setY(upOne.getY() + 1);
-        downOne.setY(downOne.getY() - 1);
-
-        if (this.isSolidBlock(world.getBlockAt(actual).getType())
-                || this.isSolidBlock(upOne.getBlock().getType())) {
-            Logging.finest("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
-                    this.isSolidBlock(actual.getBlock().getType()));
-            Logging.finest("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
-                    this.isSolidBlock(upOne.getBlock().getType()));
-            return false;
-        }
-
-        if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            Logging.finest("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(),
-                    this.isSolidBlock(downOne.getBlock().getType()));
-            return false;
-        }
-
-        if (downOne.getBlock().getType() == Material.FIRE) {
-            Logging.finest("There's fire below! (%s)[%s]", actual.getBlock().getType(),
-                    this.isSolidBlock(actual.getBlock().getType()));
-            return false;
-        }
-
-        if (isBlockAboveAir(actual)) {
-            Logging.finest("Is block above air [%s]", isBlockAboveAir(actual));
-            Logging.finest("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
-            return this.hasTwoBlocksofWaterBelow(actual);
-        }
-        return true;
-    }
-
-    /**
-     * Gets the location of the top block at the specified {@link Location}.
-     * @param l Any {@link Location}.
-     * @return The {@link Location} of the top-block.
-     */
-    public Location getTopBlock(Location l) {
-        Location check = l.clone();
-        check.setY(127); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-        while (check.getY() > 0) {
-            if (this.playerCanSpawnHereSafely(check)) {
-                return check;
-            }
-            check.setY(check.getY() - 1);
-        }
-        return null;
-    }
-
-    /**
-     * Gets the location of the top block at the specified {@link Location}.
-     * @param l Any {@link Location}.
-     * @return The {@link Location} of the top-block.
-     */
-    public Location getBottomBlock(Location l) {
-        Location check = l.clone();
-        check.setY(0);
-        while (check.getY() < 127) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
-            if (this.playerCanSpawnHereSafely(check)) {
-                return check;
-            }
-            check.setY(check.getY() + 1);
-        }
-        return null;
-    }
-
-    /*
-     * If someone has a better way of this... Please either tell us, or submit a pull request!
-     */
-    private boolean isSolidBlock(Material type) {
-        switch (type) {
-            case AIR:
-                return false;
-            case SNOW:
-                return false;
-            case TRAP_DOOR:
-                return false;
-            case TORCH:
-                return false;
-            case YELLOW_FLOWER:
-                return false;
-            case RED_ROSE:
-                return false;
-            case RED_MUSHROOM:
-                return false;
-            case BROWN_MUSHROOM:
-                return false;
-            case REDSTONE:
-                return false;
-            case REDSTONE_WIRE:
-                return false;
-            case RAILS:
-                return false;
-            case POWERED_RAIL:
-                return false;
-            case REDSTONE_TORCH_ON:
-                return false;
-            case REDSTONE_TORCH_OFF:
-                return false;
-            case DEAD_BUSH:
-                return false;
-            case SAPLING:
-                return false;
-            case STONE_BUTTON:
-                return false;
-            case LEVER:
-                return false;
-            case LONG_GRASS:
-                return false;
-            case PORTAL:
-                return false;
-            case STONE_PLATE:
-                return false;
-            case WOOD_PLATE:
-                return false;
-            case SEEDS:
-                return false;
-            case SUGAR_CANE_BLOCK:
-                return false;
-            case WALL_SIGN:
-                return false;
-            case SIGN_POST:
-                return false;
-            case WOODEN_DOOR:
-                return false;
-            case STATIONARY_WATER:
-                return false;
-            case WATER:
-                return false;
-            default:
-                return true;
-        }
-    }
-
-    /**
-     * Checks if an entity would be on track at the specified {@link Location}.
-     * @param l The {@link Location}.
-     * @return True if an entity would be on tracks at the specified {@link Location}.
-     */
-    public boolean isEntitiyOnTrack(Location l) {
-        Material currentBlock = l.getBlock().getType();
-        return (currentBlock == Material.POWERED_RAIL || currentBlock == Material.DETECTOR_RAIL || currentBlock == Material.RAILS);
-    }
-
-    // TODO maybe remove this?
-    private void showDangers(Location l) {
-        Location actual = new Location(l.getWorld(), l.getX(), l.getY(), l.getZ());
-        Location upOne = new Location(l.getWorld(), l.getX(), l.getY(), l.getZ());
-        Location downOne = new Location(l.getWorld(), l.getX(), l.getY(), l.getZ());
-        upOne.setY(upOne.getY() + 1);
-        downOne.setY(downOne.getY() - 1);
-
-        System.out.print("Location Up:   " + upOne.getBlock().getType());
-        System.out.print("               " + upOne);
-        System.out.print("Location:      " + actual.getBlock().getType());
-        System.out.print("               " + actual);
-        System.out.print("Location Down: " + downOne.getBlock().getType());
-        System.out.print("               " + downOne);
-    }
-
-    /**
-     * Checks recursively below a {@link Location} for 2 blocks of water.
-     *
-     * @param l The {@link Location}
-     * @return Whether there are 2 blocks of water
-     */
-    private boolean hasTwoBlocksofWaterBelow(Location l) {
-        if (l.getBlockY() < 0) {
-            return false;
-        }
-        Location oneBelow = l.clone();
-        oneBelow.subtract(0, 1, 0);
-        if (oneBelow.getBlock().getType() == Material.WATER || oneBelow.getBlock().getType() == Material.STATIONARY_WATER) {
-            Location twoBelow = oneBelow.clone();
-            twoBelow.subtract(0, 1, 0);
-            return (oneBelow.getBlock().getType() == Material.WATER || oneBelow.getBlock().getType() == Material.STATIONARY_WATER);
-        }
-        if (oneBelow.getBlock().getType() != Material.AIR) {
-            return false;
-        }
-        return hasTwoBlocksofWaterBelow(oneBelow);
-    }
-
-    /**
-     * Checks if the specified {@link Minecart} can spawn safely.
-     * @param cart The {@link Minecart}.
-     * @return True if the minecart can spawn safely.
-     */
-    public boolean canSpawnCartSafely(Minecart cart) {
-        if (this.isBlockAboveAir(cart.getLocation())) {
-            return true;
-        }
-        if (this.isEntitiyOnTrack(LocationManipulation.getNextBlock(cart))) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Checks if the specified {@link Vehicle} can spawn safely.
-     * @param vehicle The {@link Vehicle}.
-     * @return True if the vehicle can spawn safely.
-     */
-    public boolean canSpawnVehicleSafely(Vehicle vehicle) {
-        if (this.isBlockAboveAir(vehicle.getLocation())) {
-            return true;
-        }
-        return false;
-    }
-
-}

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

@@ -0,0 +1,111 @@
+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;
+import org.bukkit.TravelAgent;
+import org.bukkit.event.player.PlayerPortalEvent;
+
+public class BukkitTravelAgent implements TravelAgent {
+    private final MVTravelAgent agent;
+
+    public BukkitTravelAgent(MVTravelAgent agent) {
+        this.agent = agent;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public BukkitTravelAgent setSearchRadius(int radius) {
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getSearchRadius() {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public BukkitTravelAgent setCreationRadius(int radius) {
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getCreationRadius() {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getCanCreatePortal() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setCanCreatePortal(boolean create) {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location findOrCreate(Location location) {
+        return this.getSafeLocation();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location findPortal(Location location) {
+        return this.getSafeLocation();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean createPortal(Location location) {
+        return false;
+    }
+
+    private Location getSafeLocation() {
+        // At this time, these can never use the velocity.
+        if (agent.destination instanceof CannonDestination) {
+            Logging.fine("Using Stock TP method. This cannon will have 0 velocity");
+        }
+        SafeTTeleporter teleporter = agent.core.getSafeTTeleporter();
+        Location newLoc = agent.destination.getLocation(agent.player);
+        if (agent.destination.useSafeTeleporter()) {
+            newLoc = teleporter.getSafeLocation(agent.player, agent.destination);
+        }
+        if (newLoc == null) {
+            return agent.player.getLocation();
+        }
+        return newLoc;
+
+    }
+
+    public void setPortalEventTravelAgent(PlayerPortalEvent event) {
+        event.setPortalTravelAgent(this);
+        event.useTravelAgent(true);
+    }
+}

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

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

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

@@ -22,9 +22,9 @@ public class FancyMessage implements FancyText {
      * Allows easy creation of an alternating colored list.
      * TODO: Documentation! Why does CheckStyle just ignore this?
      *
-     * @param title
-     * @param message
-     * @param scheme
+     * @param title The title.
+     * @param message The body of the message.
+     * @param scheme The color scheme to use for easy styling.
      */
     public FancyMessage(String title, String message, FancyColorScheme scheme) {
         this.title = title;

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

@@ -7,11 +7,23 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
+import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import com.dumptruckman.minecraft.util.Logging;
 
 /**
  * File-utilities.
@@ -28,8 +40,8 @@ public class FileUtils {
      * @return true if the folder was successfully deleted.
      */
     public static boolean deleteFolder(File file) {
-        try {
-            org.apache.commons.io.FileUtils.deleteDirectory(file);
+        try (Stream<Path> files = Files.walk(file.toPath())) {
+            files.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
             return true;
         } catch (IOException e) {
             Logging.warning(e.getMessage());
@@ -44,8 +56,11 @@ public class FileUtils {
      * @return true if the contents were successfully deleted
      */
     public static boolean deleteFolderContents(File file) {
-        try {
-            org.apache.commons.io.FileUtils.cleanDirectory(file);
+        try (Stream<Path> files = Files.walk(file.toPath())){
+            files.sorted(Comparator.reverseOrder())
+                    .map(Path::toFile)
+                    .filter(f -> !f.equals(file))
+                    .forEach(File::delete);
             return true;
         } catch (IOException e) {
             Logging.warning(e.getMessage());
@@ -53,23 +68,68 @@ public class FileUtils {
         }
     }
 
-    private static final int COPY_BLOCK_SIZE = 1024;
+    /**
+     * Helper method to copy the world-folder.
+     * @param source Source-File
+     * @param target Target-File
+     *
+     * @return true if it had success
+     */
+    public static boolean copyFolder(File source, File target) {
+        return copyFolder(source, target, null);
+    }
 
     /**
      * Helper method to copy the world-folder.
      * @param source Source-File
      * @param target Target-File
-     * @param log A logger that logs the operation
+     * @param excludeFiles files to ignore and not copy over to Target-File
      *
-     * @return if it had success
+     * @return true if it had success
      */
-    public static boolean copyFolder(File source, File target, Logger log) {
+    public static boolean copyFolder(File source, File target, List<String> excludeFiles) {
+        Path sourceDir = source.toPath();
+        Path targetDir = target.toPath();
+
         try {
-            org.apache.commons.io.FileUtils.copyDirectory(source, target);
+            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir, excludeFiles));
             return true;
         } catch (IOException e) {
-            log.warning(e.getMessage());
+            Logging.warning("Unable to copy directory", e);
             return false;
         }
     }
-}
+
+    private static class CopyDirFileVisitor extends SimpleFileVisitor<Path> {
+
+        private final Path sourceDir;
+        private final Path targetDir;
+        private final List<String> excludeFiles;
+
+        private CopyDirFileVisitor(Path sourceDir, Path targetDir, List<String> excludeFiles) {
+            this.sourceDir = sourceDir;
+            this.targetDir = targetDir;
+            this.excludeFiles = excludeFiles;
+        }
+
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+            Path newDir = targetDir.resolve(sourceDir.relativize(dir));
+            if (!Files.isDirectory(newDir)) {
+                Files.createDirectory(newDir);
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+            // Pass files that are set to ignore
+            if (excludeFiles != null && excludeFiles.contains(file.getFileName().toString()))
+                return FileVisitResult.CONTINUE;
+            // Copy the files
+            Path targetFile = targetDir.resolve(sourceDir.relativize(file));
+            Files.copy(file, targetFile, COPY_ATTRIBUTES);
+            return FileVisitResult.CONTINUE;
+        }
+    }
+}

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

@@ -1,284 +1,285 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
-
-import java.util.HashMap;
-
-/**
- * Multiverse's Friendly Economist. This is used to deal with external economies and also item costs for stuff in MV.
- */
-public class MVEconomist {
-
-    private final VaultHandler vaultHandler;
-
-    public MVEconomist(Plugin plugin) {
-        vaultHandler = new VaultHandler(plugin);
-    }
-
-    private boolean isUsingVault(int currency) {
-        return !isItemCurrency(currency) && getVaultHandler().hasEconomy();
-    }
-
-    /**
-     * Checks if an economy plugin is in use.
-     *
-     * @return true if an economy plugin is detected by Vault.
-     */
-    public boolean isUsingEconomyPlugin() {
-        return getVaultHandler().hasEconomy();
-    }
-
-    /**
-     * Formats the amount to a human readable currency string.
-     *
-     * @param amount the amount of currency.
-     * @param currency the type of currency. A value greater than -1 indicates the material type used for currency.
-     * @return the human readable currency string.
-     */
-    public String formatPrice(double amount, int currency) {
-        if (isUsingVault(currency)) {
-            return getVaultHandler().getEconomy().format(amount);
-        } else {
-            return ItemEconomy.getFormattedPrice(amount, currency);
-        }
-    }
-
-    /**
-     * Returns the name of the economy in use.
-     *
-     * @return the name of the economy in use.
-     */
-    public String getEconomyName() {
-        if (getVaultHandler().hasEconomy()) {
-            return getVaultHandler().getEconomy().getName();
-        } else {
-            return ItemEconomy.getName();
-        }
-    }
-
-    /**
-     * Determines if a player has enough of a given currency.
-     * @param player the player to check for currency.
-     * @param amount the amount of currency.
-     * @param currency the type of currency. A value greater than -1 indicates the material type used for currency.
-     * @return true if the player has enough of the given currency or the amount is 0 or less.
-     */
-    public boolean isPlayerWealthyEnough(Player player, double amount, int currency) {
-        if (amount <= 0D) {
-            return true;
-        } else if (isUsingVault(currency)) {
-            return getVaultHandler().getEconomy().has(player, amount);
-        } else {
-            return ItemEconomy.hasEnough(player, amount, currency);
-        }
-    }
-
-    /**
-     * Formats a message for a player indicating they don't have enough currency.
-     *
-     * @param currency the type of currency. A value greater than -1 indicates the material type used for currency.
-     * @param message The more specific message to append to the generic message of not having enough.
-     * @return the formatted insufficient funds message.
-     */
-    public String getNSFMessage(int currency, String message) {
-        return "Sorry, you don't have enough " + (isItemCurrency(currency) ? "items" : "funds") + ". " + message;
-    }
-
-    /**
-     * Deposits a given amount of currency either into the player's economy account or inventory if the currency
-     * represents an item.
-     *
-     * @param player the player to give currency to.
-     * @param amount the amount to give.
-     * @param currency the type of currency. A value greater than -1 indicates the material type used for currency.
-     */
-    public void deposit(Player player, double amount, int currency) {
-        if (isUsingVault(currency)) {
-            getVaultHandler().getEconomy().depositPlayer(player, amount);
-        } else {
-            ItemEconomy.deposit(player, amount, currency);
-        }
-    }
-
-    /**
-     * Withdraws a given amount of currency either from the player's economy account or inventory if the currency
-     * represents an item.
-     *
-     * @param player the player to take currency from.
-     * @param amount the amount to take.
-     * @param currency the type of currency. A value greater than -1 indicates the material type used for currency.
-     */
-    public void withdraw(Player player, double amount, int currency) {
-        if (isUsingVault(currency)) {
-            getVaultHandler().getEconomy().withdrawPlayer(player, amount);
-        } else {
-            ItemEconomy.withdraw(player, amount, currency);
-        }
-    }
-
-    /**
-     * Returns the economy balance of the given player.
-     *
-     * @param player the player to get the balance for.
-     * @return the economy balance of the given player.
-     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
-     */
-    public double getBalance(Player player) throws IllegalStateException {
-        return getBalance(player, null);
-    }
-
-    /**
-     * Returns the economy balance of the given player in the given world. If the economy plugin does not have world
-     * specific balances then the global balance will be returned.
-     *
-     * @param player the player to get the balance for.
-     * @param world the world to get the balance for.
-     * @return the economy balance of the given player in the given world.
-     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
-     */
-    public double getBalance(Player player, World world) throws IllegalStateException {
-        if (!isUsingEconomyPlugin()) {
-            throw new IllegalStateException("getBalance is only available when using an economy plugin with Vault");
-        }
-        if (world != null) {
-            return getVaultHandler().getEconomy().getBalance(player, world.getName());
-        } else {
-            return getVaultHandler().getEconomy().getBalance(player);
-        }
-    }
-
-    /**
-     * Sets the economy balance for the given player.
-     *
-     * @param player the player to set the balance for.
-     * @param amount the amount to set the player's balance to.
-     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
-     */
-    public void setBalance(Player player, double amount) throws IllegalStateException {
-        setBalance(player, null, amount);
-    }
-
-    /**
-     * Sets the economy balance for the given player in the given world. If the economy plugin does not have world
-     * specific balances then the global balance will be set.
-     *
-     * @param player the player to set the balance for.
-     * @param world the world to get the balance for.
-     * @param amount the amount to set the player's balance to.
-     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
-     */
-    public void setBalance(Player player, World world, double amount) throws IllegalStateException {
-        if (!isUsingEconomyPlugin()) {
-            throw new IllegalStateException("getBalance is only available when using an economy plugin with Vault");
-        }
-        if (world != null) {
-            getVaultHandler().getEconomy().withdrawPlayer(player, world.getName(), getBalance(player, world));
-            getVaultHandler().getEconomy().depositPlayer(player, world.getName(), amount);
-        } else {
-            getVaultHandler().getEconomy().withdrawPlayer(player, getBalance(player));
-            getVaultHandler().getEconomy().depositPlayer(player, amount);
-        }
-    }
-
-    /**
-     * This method is public for backwards compatibility.
-     *
-     * @return the old VaultHandler.
-     * @deprecated just use the other methods in this class for economy stuff.
-     */
-    // TODO make private
-    @Deprecated
-    public VaultHandler getVaultHandler() {
-        return vaultHandler;
-    }
-
-    /**
-     * Determines if the currency type given represents an item currency.
-     *
-     * @param currency the type of currency. A value greater than -1 indicates the material type used for currency.
-     * @return true if currency is greater than -1.
-     */
-    public static boolean isItemCurrency(int currency) {
-        return currency >= 0;
-    }
-
-    private static class ItemEconomy {
-
-        private static final String ECONOMY_NAME = "Simple Item Economy";
-
-        private static String getFormattedPrice(double amount, int currency) {
-            if (isItemCurrency(currency)) {
-                Material m = Material.getMaterial(currency);
-                return m != null ? amount + " " + m.toString() : "NO ITEM FOUND";
-            } else {
-                return "";
-            }
-        }
-
-        private static String getName() {
-            return ECONOMY_NAME;
-        }
-
-        private static boolean hasEnough(Player player, double amount, int currency) {
-            if (isItemCurrency(currency)) {
-                return player.getInventory().contains(currency, (int) amount);
-            } else {
-                return true;
-            }
-        }
-
-        private static void deposit(Player player, double amount, int currency) {
-            if (isItemCurrency(currency)) {
-                giveItem(player, amount, currency);
-            }
-        }
-
-        private static void withdraw(Player player, double amount, int currency) {
-            if (isItemCurrency(currency)) {
-                takeItem(player, amount, currency);
-            }
-        }
-
-        private static void giveItem(Player player, double amount, int type) {
-            ItemStack item = new ItemStack(type, (int) amount);
-            player.getInventory().addItem(item);
-            showReceipt(player, (amount * -1), type);
-        }
-
-        private static void takeItem(Player player, double amount, int type) {
-            int removed = 0;
-            HashMap<Integer, ItemStack> items = (HashMap<Integer, ItemStack>) player.getInventory().all(type);
-            for (int i : items.keySet()) {
-                if (removed >= amount) {
-                    break;
-                }
-                int diff = (int) (amount - removed);
-                int amt = player.getInventory().getItem(i).getAmount();
-                if (amt - diff > 0) {
-                    player.getInventory().getItem(i).setAmount(amt - diff);
-                    break;
-                } else {
-                    removed += amt;
-                    player.getInventory().clear(i);
-                }
-            }
-            showReceipt(player, amount, type);
-        }
-
-        private static void showReceipt(Player player, double price, int item) {
-            if (price > 0D) {
-                player.sendMessage(String.format("%s%s%s %s",
-                        ChatColor.WHITE, "You have been charged", ChatColor.GREEN, getFormattedPrice(price, item)));
-            } else if (price < 0D) {
-                player.sendMessage(String.format("%s%s%s %s",
-                        ChatColor.DARK_GREEN, getFormattedPrice((price * -1), item),
-                        ChatColor.WHITE, "has been added to your inventory."));
-            }
-        }
-    }
-}
+package com.onarandombox.MultiverseCore.utils;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+
+/**
+ * Multiverse's Friendly Economist. This is used to deal with external economies and also item costs for stuff in MV.
+ */
+public class MVEconomist {
+
+    private final VaultHandler vaultHandler;
+
+    public MVEconomist(Plugin plugin) {
+        vaultHandler = new VaultHandler(plugin);
+    }
+
+    private boolean isUsingVault(Material currency) {
+        return !isItemCurrency(currency) && getVaultHandler().hasEconomy();
+    }
+
+    /**
+     * Checks if an economy plugin is in use.
+     *
+     * @return true if an economy plugin is detected by Vault.
+     */
+    public boolean isUsingEconomyPlugin() {
+        return getVaultHandler().hasEconomy();
+    }
+
+    /**
+     * Formats the amount to a human readable currency string.
+     *
+     * @param amount the amount of currency.
+     * @param currency the type of currency. Null indicates a non-item currency is used.
+     * @return the human readable currency string.
+     */
+    public String formatPrice(double amount, @Nullable Material currency) {
+        if (isUsingVault(currency)) {
+            return getVaultHandler().getEconomy().format(amount);
+        } else {
+            return ItemEconomy.getFormattedPrice(amount, currency);
+        }
+    }
+
+    /**
+     * Returns the name of the economy in use.
+     *
+     * @return the name of the economy in use.
+     */
+    public String getEconomyName() {
+        if (getVaultHandler().hasEconomy()) {
+            return getVaultHandler().getEconomy().getName();
+        } else {
+            return ItemEconomy.getName();
+        }
+    }
+
+    /**
+     * Determines if a player has enough of a given currency.
+     *
+     * @param player the player to check for currency.
+     * @param amount the amount of currency.
+     * @param currency the type of currency. Null indicates non-item currency is used.
+     * @return true if the player has enough of the given currency or the amount is 0 or less.
+     */
+    public boolean isPlayerWealthyEnough(Player player, double amount, Material currency) {
+        if (amount <= 0D) {
+            return true;
+        } else if (isUsingVault(currency)) {
+            return getVaultHandler().getEconomy().has(player, amount);
+        } else {
+            return ItemEconomy.hasEnough(player, amount, currency);
+        }
+    }
+
+    /**
+     * Formats a message for a player indicating they don't have enough currency.
+     *
+     * @param currency the type of currency. Null indicates a non-item currency is used.
+     * @param message The more specific message to append to the generic message of not having enough.
+     * @return the formatted insufficient funds message.
+     */
+    public String getNSFMessage(Material currency, String message) {
+        return "Sorry, you don't have enough " + (isItemCurrency(currency) ? "items" : "funds") + ". " + message;
+    }
+
+    /**
+     * Deposits a given amount of currency either into the player's economy account or inventory if the currency
+     * is not null.
+     *
+     * @param player the player to give currency to.
+     * @param amount the amount to give.
+     * @param currency the type of currency.
+     */
+    public void deposit(Player player, double amount, @Nullable Material currency) {
+        if (isUsingVault(currency)) {
+            getVaultHandler().getEconomy().depositPlayer(player, amount);
+        } else {
+            ItemEconomy.deposit(player, amount, currency);
+        }
+    }
+
+    /**
+     * Withdraws a given amount of currency either from the player's economy account or inventory if the currency
+     * is not null.
+     *
+     * @param player the player to take currency from.
+     * @param amount the amount to take.
+     * @param currency the type of currency.
+     */
+    public void withdraw(Player player, double amount, @Nullable Material currency) {
+        if (isUsingVault(currency)) {
+            getVaultHandler().getEconomy().withdrawPlayer(player, amount);
+        } else {
+            ItemEconomy.withdraw(player, amount, currency);
+        }
+    }
+
+    /**
+     * Returns the economy balance of the given player.
+     *
+     * @param player the player to get the balance for.
+     * @return the economy balance of the given player.
+     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
+     */
+    public double getBalance(Player player) throws IllegalStateException {
+        return getBalance(player, null);
+    }
+
+    /**
+     * Returns the economy balance of the given player in the given world. If the economy plugin does not have world
+     * specific balances then the global balance will be returned.
+     *
+     * @param player the player to get the balance for.
+     * @param world the world to get the balance for.
+     * @return the economy balance of the given player in the given world.
+     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
+     */
+    public double getBalance(Player player, World world) throws IllegalStateException {
+        if (!isUsingEconomyPlugin()) {
+            throw new IllegalStateException("getBalance is only available when using an economy plugin with Vault");
+        }
+        if (world != null) {
+            return getVaultHandler().getEconomy().getBalance(player, world.getName());
+        } else {
+            return getVaultHandler().getEconomy().getBalance(player);
+        }
+    }
+
+    /**
+     * Sets the economy balance for the given player.
+     *
+     * @param player the player to set the balance for.
+     * @param amount the amount to set the player's balance to.
+     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
+     */
+    public void setBalance(Player player, double amount) throws IllegalStateException {
+        setBalance(player, null, amount);
+    }
+
+    /**
+     * Sets the economy balance for the given player in the given world. If the economy plugin does not have world
+     * specific balances then the global balance will be set.
+     *
+     * @param player the player to set the balance for.
+     * @param world the world to get the balance for.
+     * @param amount the amount to set the player's balance to.
+     * @throws IllegalStateException thrown if this is used when no economy plugin is available.
+     */
+    public void setBalance(Player player, World world, double amount) throws IllegalStateException {
+        if (!isUsingEconomyPlugin()) {
+            throw new IllegalStateException("getBalance is only available when using an economy plugin with Vault");
+        }
+        if (world != null) {
+            getVaultHandler().getEconomy().withdrawPlayer(player, world.getName(), getBalance(player, world));
+            getVaultHandler().getEconomy().depositPlayer(player, world.getName(), amount);
+        } else {
+            getVaultHandler().getEconomy().withdrawPlayer(player, getBalance(player));
+            getVaultHandler().getEconomy().depositPlayer(player, amount);
+        }
+    }
+
+    /**
+     * This method is public for backwards compatibility.
+     *
+     * @return the old VaultHandler.
+     * @deprecated just use the other methods in this class for economy stuff.
+     */
+    // TODO make private
+    @Deprecated
+    public VaultHandler getVaultHandler() {
+        return vaultHandler;
+    }
+
+    /**
+     * Determines if the currency type string given represents an item currency.
+     *
+     * @param currency the type of currency.
+     * @return true if currency string matches a valid material.
+     */
+    public static boolean isItemCurrency(Material currency) {
+        return currency != null;
+    }
+
+    private static class ItemEconomy {
+
+        private static final String ECONOMY_NAME = "Simple Item Economy";
+
+        private static String getFormattedPrice(double amount, Material currency) {
+            if (isItemCurrency(currency)) {
+                return amount + " " + currency.toString();
+            } else {
+                return "";
+            }
+        }
+
+        private static String getName() {
+            return ECONOMY_NAME;
+        }
+
+        private static boolean hasEnough(Player player, double amount, Material currency) {
+            if (currency != null) {
+                return player.getInventory().contains(currency, (int) amount);
+            } else {
+                return true;
+            }
+        }
+
+        private static void deposit(Player player, double amount, Material currency) {
+            if (isItemCurrency(currency)) {
+                giveItem(player, amount, currency);
+            }
+        }
+
+        private static void withdraw(Player player, double amount, Material currency) {
+            if (isItemCurrency(currency)) {
+                takeItem(player, amount, currency);
+            }
+        }
+
+        private static void giveItem(Player player, double amount, Material type) {
+            ItemStack item = new ItemStack(type, (int) amount);
+            player.getInventory().addItem(item);
+            showReceipt(player, (amount * -1), type);
+        }
+
+        private static void takeItem(Player player, double amount, Material type) {
+            int removed = 0;
+            HashMap<Integer, ItemStack> items = (HashMap<Integer, ItemStack>) player.getInventory().all(type);
+            for (int i : items.keySet()) {
+                if (removed >= amount) {
+                    break;
+                }
+                int diff = (int) (amount - removed);
+                int amt = player.getInventory().getItem(i).getAmount();
+                if (amt - diff > 0) {
+                    player.getInventory().getItem(i).setAmount(amt - diff);
+                    break;
+                } else {
+                    removed += amt;
+                    player.getInventory().clear(i);
+                }
+            }
+            showReceipt(player, amount, type);
+        }
+
+        private static void showReceipt(Player player, double price, Material item) {
+            if (price > 0D) {
+                player.sendMessage(String.format("%s%s%s %s",
+                        ChatColor.WHITE, "You have been charged", ChatColor.GREEN, getFormattedPrice(price, item)));
+            } else if (price < 0D) {
+                player.sendMessage(String.format("%s%s%s %s",
+                        ChatColor.DARK_GREEN, getFormattedPrice((price * -1), item),
+                        ChatColor.WHITE, "has been added to your inventory."));
+            }
+        }
+    }
+}

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

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -100,7 +101,7 @@ public class MVPermissions implements PermissionsInterface {
     public boolean canEnterWorld(Player p, MultiverseWorld w) {
         // If we're not enforcing access, anyone can enter.
         if (!plugin.getMVConfig().getEnforceAccess()) {
-            this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
+            Logging.finest("EnforceAccess is OFF. Player was allowed in " + w.getAlias());
             return true;
         }
         return this.hasPermission(p, "multiverse.access." + w.getName(), false);
@@ -230,7 +231,7 @@ public class MVPermissions implements PermissionsInterface {
      *
      * @param sender       Who is requesting the permission.
      * @param node         The permission node in string format; multiverse.core.list.worlds for example.
-     * @param isOpRequired @Deprecated. This is not used for anything anymore.
+     * @param isOpRequired deprecated This is not used for anything anymore.
      * @return True if they have that permission or any parent.
      */
     @Override
@@ -257,14 +258,14 @@ public class MVPermissions implements PermissionsInterface {
 
         boolean hasPermission = sender.hasPermission(node);
         if (!sender.isPermissionSet(node)) {
-            this.plugin.log(Level.FINER, String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
+            Logging.finer(String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
                     ChatColor.RED, node, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA,
                     player.getDisplayName(), ChatColor.WHITE));
         }
         if (hasPermission) {
-            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
+            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
         } else {
-            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
+            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
         }
         return hasPermission;
     }

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

@@ -9,114 +9,19 @@ package com.onarandombox.MultiverseCore.utils;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.destination.CannonDestination;
-import org.bukkit.Location;
-import org.bukkit.TravelAgent;
 import org.bukkit.entity.Player;
 
-import java.util.logging.Level;
-
 /**
- * The Multiverse-{@link TravelAgent}.
+ * The Multiverse TravelAgent.
  */
-public class MVTravelAgent implements TravelAgent {
-    private MVDestination destination;
-    private MultiverseCore core;
-    private Player player;
+public class MVTravelAgent {
+    protected MVDestination destination;
+    protected MultiverseCore core;
+    protected Player player;
 
     public MVTravelAgent(MultiverseCore multiverseCore, MVDestination d, Player p) {
         this.destination = d;
         this.core = multiverseCore;
         this.player = p;
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public TravelAgent setSearchRadius(int radius) {
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getSearchRadius() {
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public TravelAgent setCreationRadius(int radius) {
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getCreationRadius() {
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getCanCreatePortal() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setCanCreatePortal(boolean create) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location findOrCreate(Location location) {
-        return this.getSafeLocation();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location findPortal(Location location) {
-        return this.getSafeLocation();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean createPortal(Location location) {
-        return false;
-    }
-
-    private Location getSafeLocation() {
-        // At this time, these can never use the velocity.
-        if (this.destination instanceof CannonDestination) {
-            this.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
-        }
-        SafeTTeleporter teleporter = this.core.getSafeTTeleporter();
-        Location newLoc = this.destination.getLocation(this.player);
-        if (this.destination.useSafeTeleporter()) {
-            newLoc = teleporter.getSafeLocation(this.player, this.destination);
-        }
-        if (newLoc == null) {
-            return this.player.getLocation();
-        }
-        return newLoc;
-
-    }
-
 }

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

@@ -0,0 +1,42 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import de.themoep.idconverter.IdMappings;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A tool for converting values which may be an old type ID to a Material.
+ */
+public class MaterialConverter {
+
+    /**
+     * Converts the value in the given config at the given path from a numeric id or flattened material name to a
+     * Material.
+     *
+     * @param config The config with the value to convert.
+     * @param path The path of the value in the config.
+     * @return The converted Material type or null if no matching type.
+     */
+    @Nullable
+    public static Material convertConfigType(@NotNull ConfigurationSection config, @NotNull String path) {
+        return convertTypeString(config.getString(path));
+    }
+
+    /**
+     * Converts a string representing a numeric id or flattened material name to a Material.
+     *
+     * @param value The value to convert.
+     * @return The converted Material type or null if no matching type.
+     */
+    @Nullable
+    public static Material convertTypeString(@Nullable String value) {
+        IdMappings.Mapping mapping = IdMappings.getById(value != null ? value : "");
+        if (mapping != null) {
+            return Material.matchMaterial(mapping.getFlatteningType());
+        } else {
+            return Material.matchMaterial(value != null ? value : "");
+        }
+    }
+}

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

@@ -7,8 +7,10 @@
 
 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;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
@@ -145,7 +147,7 @@ public class PermissionTools {
             }
 
             final MVEconomist economist = plugin.getEconomist();
-            final int currency = toWorld.getCurrency();
+            final Material currency = toWorld.getCurrency();
             final String formattedAmount = economist.formatPrice(price, currency);
 
             if (economist.isPlayerWealthyEnough(teleporterPlayer, price, currency)) {
@@ -171,7 +173,7 @@ public class PermissionTools {
         return true;
     }
 
-    private void sendTeleportPaymentMessage (MVEconomist economist, Player teleporterPlayer, Player teleportee, String toWorld, double price, int currency) {
+    private void sendTeleportPaymentMessage (MVEconomist economist, Player teleporterPlayer, Player teleportee, String toWorld, double price, Material currency) {
         price = Math.abs(price);
         if (teleporterPlayer.equals(teleportee)) {
             teleporterPlayer.sendMessage("You were " + (price > 0D ? "charged " : "given ") + economist.formatPrice(price, currency) + " for teleporting to " + toWorld);
@@ -194,7 +196,7 @@ public class PermissionTools {
      * @return True if they can't go to the world, False if they can.
      */
     public boolean playerCanGoFromTo(MultiverseWorld fromWorld, MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
-        this.plugin.log(Level.FINEST, "Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
+        Logging.finest("Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
 
         Player teleporterPlayer;
         if (plugin.getMVConfig().getTeleportIntercept()) {

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

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

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

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

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

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

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

@@ -1,358 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.utils;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.BlockSafety;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.enums.TeleportResult;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.util.Vector;
-
-import java.util.logging.Level;
-
-/**
- * The {@link SafeTTeleporter}.
- *
- * @deprecated Use instead: {@link com.onarandombox.MultiverseCore.api.SafeTTeleporter} and {@link SimpleSafeTTeleporter}.
- */
-@Deprecated
-public class SafeTTeleporter {
-
-    private MultiverseCore plugin;
-    private BlockSafety bs;
-
-    public SafeTTeleporter(MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.bs = plugin.getBlockSafety();
-    }
-
-    private static final int DEFAULT_TOLERANCE = 6;
-    private static final int DEFAULT_RADIUS = 9;
-
-    /**
-     * Gets the next safe location around the given location.
-     * @param l A {@link Location}.
-     * @return A safe {@link Location}.
-     */
-    public Location getSafeLocation(Location l) {
-        return this.getSafeLocation(l, DEFAULT_TOLERANCE, DEFAULT_RADIUS);
-    }
-
-    /**
-     * Gets the next safe location around the given location.
-     * @param l A {@link Location}.
-     * @param tolerance The tolerance.
-     * @param radius The radius.
-     * @return A safe {@link Location}.
-     */
-    public Location getSafeLocation(Location l, int tolerance, int radius) {
-        // Check around the player first in a configurable radius:
-        Location safe = checkAboveAndBelowLocation(l, tolerance, radius);
-        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));
-        } else {
-            this.plugin.log(Level.FINE, "Uh oh! No safe place found!");
-        }
-        return safe;
-    }
-
-    private Location checkAboveAndBelowLocation(Location l, int tolerance, int radius) {
-        // Tolerance must be an even number:
-        if (tolerance % 2 != 0) {
-            tolerance += 1;
-        }
-        // 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);
-
-        // For now this will just do a straight up block.
-        Location locToCheck = l.clone();
-        // Check the main level
-        Location safe = this.checkAroundLocation(locToCheck, radius);
-        if (safe != null) {
-            return safe;
-        }
-        // We've already checked zero right above this.
-        int currentLevel = 1;
-        while (currentLevel <= tolerance) {
-            // Check above
-            locToCheck = l.clone();
-            locToCheck.add(0, currentLevel, 0);
-            safe = this.checkAroundLocation(locToCheck, radius);
-            if (safe != null) {
-                return safe;
-            }
-
-            // Check below
-            locToCheck = l.clone();
-            locToCheck.subtract(0, currentLevel, 0);
-            safe = this.checkAroundLocation(locToCheck, radius);
-            if (safe != null) {
-                return safe;
-            }
-            currentLevel++;
-        }
-
-        return null;
-    }
-
-    /*
-     * For my crappy algorithm, radius MUST be odd.
-     */
-    private Location checkAroundLocation(Location l, int diameter) {
-        if (diameter % 2 == 0) {
-            diameter += 1;
-        }
-        Location checkLoc = l.clone();
-
-        // Start at 3, the min diameter around a block
-        int loopcounter = 3;
-        while (loopcounter <= diameter) {
-            boolean foundSafeArea = checkAroundSpecificDiameter(checkLoc, loopcounter);
-            // If a safe area was found:
-            if (foundSafeArea) {
-                // Return the checkLoc, it is the safe location.
-                return checkLoc;
-            }
-            // Otherwise, let's reset our location
-            checkLoc = l.clone();
-            // And increment the radius
-            loopcounter += 2;
-        }
-        return null;
-    }
-
-    private boolean checkAroundSpecificDiameter(Location checkLoc, int circle) {
-        // Adjust the circle to get how many blocks to step out.
-        // A radius of 3 makes the block step 1
-        // A radius of 5 makes the block step 2
-        // A radius of 7 makes the block step 3
-        // ...
-        int adjustedCircle = ((circle - 1) / 2);
-        checkLoc.add(adjustedCircle, 0, 0);
-        if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-            return true;
-        }
-        // Now we go to the right that adjustedCircle many
-        for (int i = 0; i < adjustedCircle; i++) {
-            checkLoc.add(0, 0, 1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then down adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(-1, 0, 0);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then left adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(0, 0, -1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then up Then left adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(1, 0, 0);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then finish up by doing adjustedCircle - 1
-        for (int i = 0; i < adjustedCircle - 1; i++) {
-            checkLoc.add(0, 0, 1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Safely teleport the entity to the MVDestination. This will perform checks to see if the place is safe, and if
-     * it's not, will adjust the final destination accordingly.
-     *
-     * @param teleporter Person who performed the teleport command.
-     * @param teleportee Entity to teleport
-     * @param d          Destination to teleport them to
-     * @return true for success, false for failure
-     */
-    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");
-            return TeleportResult.FAIL_INVALID;
-        }
-        Player teleporteePlayer = null;
-        if (teleportee instanceof Player) {
-            teleporteePlayer = ((Player) teleportee);
-        } else if (teleportee.getPassenger() instanceof Player) {
-            teleporteePlayer = ((Player) teleportee.getPassenger());
-        }
-
-        if (teleporteePlayer == null) {
-            return TeleportResult.FAIL_INVALID;
-        }
-        MultiverseCore.addPlayerToTeleportQueue(teleporter.getName(), teleporteePlayer.getName());
-
-        Location safeLoc = d.getLocation(teleportee);
-        if (d.useSafeTeleporter()) {
-            safeLoc = this.getSafeLocation(teleportee, d);
-        }
-
-        if (safeLoc != null) {
-            if (teleportee.teleport(safeLoc)) {
-                if (!d.getVelocity().equals(new Vector(0, 0, 0))) {
-                    teleportee.setVelocity(d.getVelocity());
-                }
-                return TeleportResult.SUCCESS;
-            }
-            return TeleportResult.FAIL_OTHER;
-        }
-        return TeleportResult.FAIL_UNSAFE;
-    }
-
-    /**
-     * Safely teleport the entity to the Location. This may perform checks to
-     * see if the place is safe, and if
-     * it's not, will adjust the final destination accordingly.
-     *
-     * @param teleporter Person who issued the teleport command.
-     * @param teleportee Entity to teleport.
-     * @param location   Location to teleport them to.
-     * @param safely     Should the destination be checked for safety before teleport?
-     * @return true for success, false for failure.
-     */
-    public TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, Location location, boolean safely) {
-        if (safely) {
-            location = this.getSafeLocation(location);
-        }
-
-        if (location != null) {
-            if (teleportee.teleport(location)) {
-                return TeleportResult.SUCCESS;
-            }
-            return TeleportResult.FAIL_OTHER;
-        }
-        return TeleportResult.FAIL_UNSAFE;
-    }
-
-    /**
-     * Returns a safe location for the entity to spawn at.
-     *
-     * @param e The entity to spawn
-     * @param d The MVDestination to take the entity to.
-     * @return A new location to spawn the entity at.
-     */
-    public Location getSafeLocation(Entity e, MVDestination d) {
-        Location l = d.getLocation(e);
-        if (this.bs.playerCanSpawnHereSafely(l)) {
-            plugin.log(Level.FINE, "The first location you gave me was safe.");
-            return l;
-        }
-        if (e instanceof Minecart) {
-            Minecart m = (Minecart) e;
-            if (!this.bs.canSpawnCartSafely(m)) {
-                return null;
-            }
-        } else if (e instanceof Vehicle) {
-            Vehicle v = (Vehicle) e;
-            if (!this.bs.canSpawnVehicleSafely(v)) {
-                return null;
-            }
-        }
-        Location safeLocation = this.getSafeLocation(l);
-        if (safeLocation != null) {
-            // Add offset to account for a vehicle on dry land!
-            if (e instanceof Minecart && !this.bs.isEntitiyOnTrack(safeLocation)) {
-                safeLocation.setY(safeLocation.getBlockY() + .5);
-                this.plugin.log(Level.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!");
-            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());
-        } 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());
-        }
-        this.plugin.log(Level.FINE, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
-        return null;
-    }
-
-    /**
-     * Finds a portal-block next to the specified {@link Location}.
-     * @param l The {@link Location}
-     * @return The next portal-block's {@link Location}.
-     */
-    public static Location findPortalBlockNextTo(Location l) {
-        Block b = l.getWorld().getBlockAt(l);
-        Location foundLocation = null;
-        if (b.getType() == Material.PORTAL) {
-            return l;
-        }
-        if (b.getRelative(BlockFace.NORTH).getType() == Material.PORTAL) {
-            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.NORTH).getLocation(), foundLocation);
-        }
-        if (b.getRelative(BlockFace.SOUTH).getType() == Material.PORTAL) {
-            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.SOUTH).getLocation(), foundLocation);
-        }
-        if (b.getRelative(BlockFace.EAST).getType() == Material.PORTAL) {
-            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.EAST).getLocation(), foundLocation);
-        }
-        if (b.getRelative(BlockFace.WEST).getType() == Material.PORTAL) {
-            foundLocation = getCloserBlock(l, b.getRelative(BlockFace.WEST).getLocation(), foundLocation);
-        }
-        return foundLocation;
-    }
-
-    private static Location getCloserBlock(Location source, Location blockA, Location blockB) {
-        // If B wasn't given, return a.
-        if (blockB == null) {
-            return blockA;
-        }
-        // Center our calculations
-        blockA.add(.5, 0, .5);
-        blockB.add(.5, 0, .5);
-
-        // Retrieve the distance to the normalized blocks
-        double testA = source.distance(blockA);
-        double testB = source.distance(blockB);
-
-        // Compare and return
-        if (testA <= testB) {
-            return blockA;
-        }
-        return blockB;
-    }
-
-}

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

@@ -14,9 +14,10 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Bed;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
-import org.bukkit.material.Bed;
 
 import java.util.EnumSet;
 import java.util.Iterator;
@@ -89,7 +90,7 @@ public class SimpleBlockSafety implements BlockSafety {
             return false;
         }
 
-        if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
+        if (downOne.getBlock().getType() == Material.LAVA) {
             Logging.finer("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(), isSolidBlock(downOne.getBlock().getType()));
             return false;
         }
@@ -151,12 +152,13 @@ public class SimpleBlockSafety implements BlockSafety {
      * @return The location of the other bed piece, or null if it was a jacked up bed.
      */
     private Location findOtherBedPiece(Location checkLoc) {
-        if (checkLoc.getBlock().getType() != Material.BED_BLOCK) {
+        BlockData data = checkLoc.getBlock().getBlockData();
+        if (!(data instanceof Bed)) {
             return null;
         }
-        // Construct a bed object at this location
-        final Bed b = new Bed(Material.BED_BLOCK, checkLoc.getBlock().getData());
-        if (b.isHeadOfBed()) {
+        Bed b = (Bed) data;
+
+        if (b.getPart() == Bed.Part.HEAD) {
             return checkLoc.getBlock().getRelative(b.getFacing().getOppositeFace()).getLocation();
         }
         // We shouldn't ever be looking at the foot, but here's the code for it.
@@ -199,69 +201,8 @@ public class SimpleBlockSafety implements BlockSafety {
     /*
      * If someone has a better way of this... Please either tell us, or submit a pull request!
      */
-    private static boolean isSolidBlock(Material type) {
-        switch (type) {
-            case AIR:
-                return false;
-            case SNOW:
-                return false;
-            case TRAP_DOOR:
-                return false;
-            case TORCH:
-                return false;
-            case YELLOW_FLOWER:
-                return false;
-            case RED_ROSE:
-                return false;
-            case RED_MUSHROOM:
-                return false;
-            case BROWN_MUSHROOM:
-                return false;
-            case REDSTONE:
-                return false;
-            case REDSTONE_WIRE:
-                return false;
-            case RAILS:
-                return false;
-            case POWERED_RAIL:
-                return false;
-            case REDSTONE_TORCH_ON:
-                return false;
-            case REDSTONE_TORCH_OFF:
-                return false;
-            case DEAD_BUSH:
-                return false;
-            case SAPLING:
-                return false;
-            case STONE_BUTTON:
-                return false;
-            case LEVER:
-                return false;
-            case LONG_GRASS:
-                return false;
-            case PORTAL:
-                return false;
-            case STONE_PLATE:
-                return false;
-            case WOOD_PLATE:
-                return false;
-            case SEEDS:
-                return false;
-            case SUGAR_CANE_BLOCK:
-                return false;
-            case WALL_SIGN:
-                return false;
-            case SIGN_POST:
-                return false;
-            case WOODEN_DOOR:
-                return false;
-            case STATIONARY_WATER:
-                return false;
-            case WATER:
-                return false;
-            default:
-                return true;
-        }
+    public static boolean isSolidBlock(Material type) {
+        return type.isSolid();
     }
 
     /**
@@ -270,7 +211,10 @@ public class SimpleBlockSafety implements BlockSafety {
     @Override
     public boolean isEntitiyOnTrack(Location l) {
         Material currentBlock = l.getBlock().getType();
-        return (currentBlock == Material.POWERED_RAIL || currentBlock == Material.DETECTOR_RAIL || currentBlock == Material.RAILS);
+        return (currentBlock == Material.POWERED_RAIL
+                || currentBlock == Material.DETECTOR_RAIL
+                || currentBlock == Material.RAIL
+                || currentBlock == Material.ACTIVATOR_RAIL);
     }
 
     /**
@@ -285,10 +229,10 @@ public class SimpleBlockSafety implements BlockSafety {
         }
         Location oneBelow = l.clone();
         oneBelow.subtract(0, 1, 0);
-        if (oneBelow.getBlock().getType() == Material.WATER || oneBelow.getBlock().getType() == Material.STATIONARY_WATER) {
+        if (oneBelow.getBlock().getType() == Material.WATER) {
             Location twoBelow = oneBelow.clone();
             twoBelow.subtract(0, 1, 0);
-            return (oneBelow.getBlock().getType() == Material.WATER || oneBelow.getBlock().getType() == Material.STATIONARY_WATER);
+            return (oneBelow.getBlock().getType() == Material.WATER);
         }
         if (oneBelow.getBlock().getType() != Material.AIR) {
             return false;

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

@@ -19,6 +19,7 @@ import com.onarandombox.MultiverseCore.api.LocationManipulation;
 import java.text.DecimalFormat;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -39,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
@@ -52,7 +62,7 @@ public class SimpleLocationManipulation implements LocationManipulation {
         if (location == null) {
             return "";
         }
-        return String.format("%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
+        return String.format(Locale.ENGLISH, "%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
                 location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
     }
 

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

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

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

@@ -20,6 +20,7 @@ import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Golem;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
+import org.bukkit.entity.Phantom;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
 import org.bukkit.entity.Squid;
@@ -148,7 +149,7 @@ public class SimpleWorldPurger implements WorldPurger {
             if (specifiedAnimals)
                 specified = true;
             negate = negateAnimals;
-        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
+        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime || e instanceof Phantom) {
             // it's a monster
             if (specifiedMonsters && !negateMonsters) {
                 Logging.finest("Removing an entity because I was told to remove all monsters in world %s: %s", e.getWorld().getName(), e);

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

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-/*
-package com.onarandombox.MultiverseCore.utils;
-
-import org.getspout.spoutapi.SpoutManager;
-
-/**
- * A helper-class holding the {@link SpoutManager}.
- * /
-public class SpoutInterface {
-    private SpoutManager spoutManager;
-
-    public SpoutInterface() {
-        this.spoutManager = SpoutManager.getInstance();
-    }
-
-    /**
-     * Gets the {@link SpoutManager}.
-     * @return The {@link SpoutManager}.
-     * /
-    public SpoutManager getManager() {
-        return this.spoutManager;
-    }
-}
-*/

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

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

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

@@ -7,21 +7,18 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-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.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MVWorld;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
+import com.onarandombox.MultiverseCore.WorldProperties;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+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,15 +33,23 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
 
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.WorldProperties;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.api.WorldPurger;
-import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent;
+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.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * Public facing API to add/remove Multiverse worlds.
@@ -86,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!");
         }
     }
 
@@ -124,12 +129,18 @@ public class WorldManager implements MVWorldManager {
             return false;
         }
 
+        // Check for valid world name
+        if (!(WorldNameChecker.isValidWorldName(oldName) && WorldNameChecker.isValidWorldName(newName))) {
+            return false;
+        }
+
         final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
         final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
+        final List<String> ignoreFiles = new ArrayList<>(Arrays.asList("session.lock", "uid.dat"));
 
         // 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;
         }
 
@@ -151,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);
@@ -176,32 +181,40 @@ public class WorldManager implements MVWorldManager {
             oldWorld.getCBWorld().save();
         }
         Logging.config("Copying files for world '%s'", oldName);
-        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, Logging.getLogger())) {
+        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, ignoreFiles)) {
             Logging.warning("Failed to copy files for world '%s', see the log info", newName);
             return false;
         }
         if (oldWorld != null && wasAutoSave) {
             oldWorld.getCBWorld().setAutoSave(true);
         }
+        
+        if (newWorldFile.exists()) {
+            Logging.fine("Succeeded at copying files");
 
-        File uidFile = new File(newWorldFile, "uid.dat");
-        if (uidFile.exists() && !uidFile.delete()) {
-            Logging.warning("Failed to delete unique ID file for world '%s'", newName);
+            // initialize new properties with old ones
+            WorldProperties newProps = new WorldProperties();
+            newProps.copyValues(this.worldsFromTheConfig.get(oldName));
+            // don't keep the alias the same -- that would be useless
+            newProps.setAlias("");
+            // store the new properties in worlds config map
+            this.worldsFromTheConfig.put(newName, newProps);
+
+            // save the worlds config to disk (worlds.yml)
+            if (!saveWorldsConfig()) {
+                Logging.severe("Failed to save worlds.yml");
+                return false;
+            }
+
+            // actually load the world
+            if (doLoad(newName)) {
+               Logging.fine("Succeeded at loading cloned world '" + newName + "'");
+               return true;
+            }
+            Logging.severe("Failed to load the cloned world '" + newName + "'");
             return false;
         }
 
-        if (newWorldFile.exists()) {
-            Logging.fine("Succeeded at copying files");
-            if (this.addWorld(newName, environment, seedString, worldType, generateStructures, generator, useSpawnAdjust)) {
-                // getMVWorld() doesn't actually return an MVWorld
-                Logging.fine("Succeeded at importing world");
-                MVWorld newWorld = (MVWorld) this.getMVWorld(newName);
-                newWorld.copyValues(this.worldsFromTheConfig.get(oldName));
-                // don't keep the alias the same -- that would be useless
-                newWorld.setAlias(null);
-                return true;
-            }
-        }
         Logging.warning("Failed to copy files for world '%s', see the log info", newName);
         return false;
     }
@@ -221,6 +234,16 @@ public class WorldManager implements MVWorldManager {
     @Override
     public boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
                             String generator, boolean useSpawnAdjust) {
+        if (name.equalsIgnoreCase("plugins") || name.equalsIgnoreCase("logs")) {
+            return false;
+        }
+
+        if (!WorldNameChecker.isValidWorldName(name)) {
+            Logging.warning("Invalid world name '" + name + "'");
+            Logging.warning("World name should not contain spaces or special characters!");
+            return false;
+        }
+
         Long seed = null;
         WorldCreator c = new WorldCreator(name);
         if (seedString != null && seedString.length() > 0) {
@@ -263,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;
         }
 
@@ -336,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) {
@@ -364,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.");
@@ -404,9 +427,15 @@ public class WorldManager implements MVWorldManager {
     }
 
     private void brokenWorld(String name) {
-        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
-        this.plugin.log(Level.SEVERE, "Try using Minecraft Region Fixer to repair your world! '" + name + "'");
-        this.plugin.log(Level.SEVERE, "https://github.com/Fenixin/Minecraft-Region-Fixer");
+        Logging.severe("The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
+        Logging.severe("Try using Minecraft Region Fixer to repair your world! '" + name + "'");
+        Logging.severe("https://github.com/Fenixin/Minecraft-Region-Fixer");
+    }
+
+    private void nullWorld(String name) {
+        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) {
@@ -446,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;
         }
 
@@ -460,8 +489,14 @@ public class WorldManager implements MVWorldManager {
             brokenWorld(worldName);
             return false;
         }
+        if (cbworld == null) {
+            nullWorld(worldName);
+            return false;
+        }
         MVWorld world = new MVWorld(plugin, cbworld, mvworld);
-        this.worldPurger.purgeWorld(world);
+        if (MultiverseCoreConfiguration.getInstance().isAutoPurgeEnabled()) {
+            this.worldPurger.purgeWorld(world);
+        }
         this.worlds.put(worldName, world);
         return true;
     }
@@ -471,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
@@ -481,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;
         }
 
@@ -497,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;
@@ -575,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;
         }
@@ -582,7 +632,7 @@ public class WorldManager implements MVWorldManager {
         if (world != null) {
             return world;
         }
-        return this.getMVWorldByAlias(name);
+        return (checkAliases) ? this.getMVWorldByAlias(name) : null;
     }
 
     /**
@@ -591,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;
     }
@@ -616,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));
     }
 
     /**
@@ -811,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;
         }
     }
@@ -839,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;
 
@@ -860,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;
+        }
     }
 
     /**
@@ -883,6 +997,9 @@ public class WorldManager implements MVWorldManager {
         return this.configWorlds;
     }
 
+    /**
+     * {@inheritDoc}
+     */
 	@Override
 	public boolean hasUnloadedWorld(String name, boolean includeLoaded) {
 		if (getMVWorld(name) != null) {
@@ -895,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());
+    }
 }

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

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

src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsConfigurator.java

@@ -0,0 +1,95 @@
+package com.onarandombox.MultiverseCore.utils.metrics;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.apache.commons.lang.WordUtils;
+import org.bstats.bukkit.Metrics;
+import org.bukkit.World;
+
+public class MetricsConfigurator {
+
+    private static final int PLUGIN_ID = 7765;
+    private static final String NO_GENERATOR_NAME = "N/A";
+
+    public static void configureMetrics(MultiverseCore plugin) {
+        MetricsConfigurator configurator = new MetricsConfigurator(plugin);
+        configurator.initMetrics();
+    }
+
+    private final MultiverseCore plugin;
+    private final Metrics metrics;
+
+    private MetricsConfigurator(MultiverseCore plugin) {
+        this.plugin = plugin;
+        this.metrics = new Metrics(plugin, PLUGIN_ID);
+    }
+
+    private MVWorldManager getWorldManager() {
+        return plugin.getMVWorldManager();
+    }
+
+    private Collection<MultiverseWorld> getMVWorlds() {
+        return getWorldManager().getMVWorlds();
+    }
+
+    private void initMetrics() {
+        try {
+            addCustomGeneratorsMetric();
+            addEnvironmentsMetric();
+            addWorldCountMetric();
+
+            Logging.fine("Metrics enabled.");
+        } catch (Exception e) {
+            Logging.warning("There was an issue while enabling metrics:");
+            e.printStackTrace();
+        }
+    }
+
+    private void addCustomGeneratorsMetric() {
+        addAdvancedPieMetric("custom_generators", map -> {
+            for (MultiverseWorld w : getMVWorlds()) {
+                MetricsHelper.incrementCount(map, getGeneratorName(w));
+            }
+        });
+    }
+
+    private String getGeneratorName(MultiverseWorld world) {
+        String gen = world.getGenerator();
+        return (gen != null && !gen.equalsIgnoreCase("null")) ? gen.split(":")[0] : NO_GENERATOR_NAME;
+    }
+
+    private void addEnvironmentsMetric() {
+        addAdvancedPieMetric("environments", map -> {
+            for (MultiverseWorld w : getMVWorlds()) {
+                MetricsHelper.incrementCount(map, titleCaseEnv(w.getEnvironment()));
+            }
+        });
+    }
+
+    private String titleCaseEnv(World.Environment env) {
+        String envName = env.name().replaceAll("_+", " ");
+        return WordUtils.capitalizeFully(envName);
+    }
+
+    private void addWorldCountMetric() {
+        addMultiLineMetric("world_count", map -> {
+            int loadedWorldsCount = getMVWorlds().size();
+            map.put("Loaded worlds", loadedWorldsCount);
+            map.put("Total number of worlds", loadedWorldsCount + getWorldManager().getUnloadedWorlds().size());
+        });
+    }
+
+    private void addAdvancedPieMetric(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
+        metrics.addCustomChart(MetricsHelper.createAdvancedPieChart(chartId, metricsFunc));
+    }
+
+    private void addMultiLineMetric(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
+        metrics.addCustomChart(MetricsHelper.createMultiLineChart(chartId, metricsFunc));
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsHelper.java

@@ -0,0 +1,33 @@
+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;
+
+enum MetricsHelper {
+    ;
+
+    /**
+     * Adds one to the value in the given map with the given key. If the key does not exist in the map, it will be added with a value of 1.
+     */
+    static void incrementCount(Map<String, Integer> map, String key) {
+        Integer count = map.getOrDefault(key, 0);
+        map.put(key, count + 1);
+    }
+
+    static AdvancedPie createAdvancedPieChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
+        Map<String, Integer> map = new HashMap<>();
+        metricsFunc.accept(map);
+        return new AdvancedPie(chartId, () -> map);
+    }
+
+    static MultiLineChart createMultiLineChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
+        Map<String, Integer> map = new HashMap<>();
+        metricsFunc.accept(map);
+        return new MultiLineChart(chartId, () -> map);
+    }
+
+}

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java

@@ -1,19 +1,43 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
 import java.io.IOException;
+import java.util.Map;
 
 /**
- * An {@link URLShortener} using {@code bit.ly}.
+ * A {@link URLShortener} using {@code bit.ly}. Requires an access token.
  */
-public class BitlyURLShortener extends HttpAPIClient implements URLShortener {
-    private static final String GENERIC_BITLY_REQUEST_FORMAT = "https://api-ssl.bitly.com/v3/shorten?format=txt&apiKey=%s&login=%s&longUrl=%s";
+class BitlyURLShortener extends URLShortener {
+    private static final String ACCESS_TOKEN = "Bearer bitly-access-token";
+    private static final String BITLY_POST_REQUEST = "https://api-ssl.bitly.com/v4/shorten";
 
-    // I think it's no problem that these are public
-    private static final String USERNAME = "multiverse2";
-    private static final String API_KEY = "R_9dbff4862a3bc0c4218a7d78cc10d0e0";
+    BitlyURLShortener() {
+        super(BITLY_POST_REQUEST, ACCESS_TOKEN);
+        if (ACCESS_TOKEN.endsWith("access-token")) {
+            throw new UnsupportedOperationException();
+        }
+    }
 
-    public BitlyURLShortener() {
-        super(String.format(GENERIC_BITLY_REQUEST_FORMAT, API_KEY, USERNAME, "%s"));
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(String data) {
+        JSONObject json = new JSONObject();
+        json.put("domain", "j.mp");
+        json.put("long_url", data);
+        return json.toJSONString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(Map<String, String> data) {
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -22,13 +46,11 @@ public class BitlyURLShortener extends HttpAPIClient implements URLShortener {
     @Override
     public String shorten(String longUrl) {
         try {
-            String result = this.exec(longUrl);
-            if (!result.startsWith("http://j.mp/")) // ... then it's failed :/
-                throw new IOException(result);
-            return result;
-        } catch (IOException e) {
+            String stringJSON = this.exec(encodeData(longUrl), ContentType.JSON);
+            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("link");
+        } catch (IOException | ParseException e) {
             e.printStackTrace();
-            return longUrl; // sorry ...
+            return longUrl;
         }
     }
 }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java

@@ -0,0 +1,90 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Pastes to {@code gist.github.com}. Requires an access token with the {@code gist} scope.
+ */
+class GitHubPasteService extends PasteService {
+    private final boolean isPrivate;
+    // this access token must have the "gist" scope
+    private static final String ACCESS_TOKEN = "token github-access-token";
+    private static final String GITHUB_POST_REQUEST = "https://api.github.com/gists";
+
+    GitHubPasteService(boolean isPrivate) {
+        super(GITHUB_POST_REQUEST, ACCESS_TOKEN);
+        this.isPrivate = isPrivate;
+        if (ACCESS_TOKEN.endsWith("access-token")) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(String data) {
+        Map<String, String> mapData = new HashMap<String, String>();
+        mapData.put("multiverse.txt", data);
+        return this.encodeData(mapData);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(Map<String, String> files) {
+        JSONObject root = new JSONObject();
+        root.put("description", "Multiverse-Core Debug Info");
+        root.put("public", !this.isPrivate);
+        JSONObject fileList = new JSONObject();
+        for (Map.Entry<String, String> entry : files.entrySet()) {
+            JSONObject fileObject = new JSONObject();
+            fileObject.put("content", entry.getValue());
+            fileList.put(entry.getKey(), fileObject);
+        }
+
+        root.put("files", fileList);
+        return root.toJSONString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(String data) throws PasteFailedException {
+        try {
+            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
+            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("html_url");
+        } catch (IOException | ParseException e) {
+            throw new PasteFailedException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(Map<String, String> data) throws PasteFailedException {
+        try {
+            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
+            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("html_url");
+        } catch (IOException | ParseException e) {
+            throw new PasteFailedException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean supportsMultiFile() {
+        return true;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HastebinPasteService.java

@@ -0,0 +1,69 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Pastes to {@code hastebin.com}.
+ */
+class HastebinPasteService extends PasteService {
+    private static final String HASTEBIN_POST_REQUEST = "https://hastebin.com/documents";
+
+    HastebinPasteService() {
+        super(HASTEBIN_POST_REQUEST);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(String data) {
+        return data;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(Map<String, String> data) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(String data) throws PasteFailedException {
+        try {
+            String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
+            return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
+        } catch (IOException | ParseException e) {
+            throw new PasteFailedException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(Map<String, String> data) throws PasteFailedException {
+        try {
+            String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
+            return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
+        } catch (IOException | ParseException e) {
+            throw new PasteFailedException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean supportsMultiFile() {
+        return false;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HttpAPIClient.java

@@ -1,50 +1,129 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
+import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.net.URL;
-import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
 /**
  * HTTP API-client.
  */
-public abstract class HttpAPIClient {
+abstract class HttpAPIClient {
     /**
-     * The URL for this API-request.
+     * The URL for this API-request, and if necessary, the access token.
+     * If an access token is not necessary, it should be set to null.
      */
-    protected final String urlFormat;
+    private final String url;
+    private final String accessToken;
 
-    public HttpAPIClient(String urlFormat) {
-        this.urlFormat = urlFormat;
+    /**
+     * Types of data that can be sent.
+     */
+    enum ContentType {
+        JSON,
+        PLAINTEXT,
+        URLENCODED
     }
 
+    HttpAPIClient(String url) {
+        this(url, null);
+    }
+
+    HttpAPIClient(String url, String accessToken) {
+        this.url = url;
+        this.accessToken = accessToken;
+    }
+
+    /**
+     * Returns the HTTP Content-Type header that corresponds with each ContentType.
+     * @param type The type of data.
+     * @return The HTTP Content-Type header that corresponds with the type of data.
+     */
+    private String getContentHeader(ContentType type) {
+        switch (type) {
+            case JSON:
+                return "application/json; charset=utf-8";
+            case PLAINTEXT:
+                return "text/plain; charset=utf-8";
+            case URLENCODED:
+                return "application/x-www-form-urlencoded; charset=utf-8";
+            default:
+                throw new IllegalArgumentException("Unexpected value: " + type);
+        }
+    }
+
+    /**
+     * Encode the given String data into a format suitable for transmission in an HTTP request.
+     *
+     * @param data The raw data to encode.
+     * @return A URL-encoded string.
+     */
+    abstract String encodeData(String data);
+
+    /**
+     * Encode the given Map data into a format suitable for transmission in an HTTP request.
+     *
+     * @param data The raw data to encode.
+     * @return A URL-encoded string.
+     */
+    abstract String encodeData(Map<String, String> data);
+
     /**
      * Executes this API-Request.
-     * @param args Format-args.
+     * @param payload The data that will be sent.
+     * @param type The type of data that will be sent.
      * @return The result (as text).
      * @throws IOException When the I/O-operation failed.
      */
-    protected final String exec(Object... args) throws IOException {
+    final String exec(String payload, ContentType type) throws IOException {
+        BufferedReader rd = null;
+        OutputStreamWriter wr = null;
 
-        URLConnection conn = new URL(String.format(this.urlFormat, args)).openConnection();
-        conn.connect();
-        StringBuilder ret = new StringBuilder();
-        BufferedReader reader = null;
         try {
-            reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            while (!reader.ready()); // wait until reader is ready, may not be necessary, SUPPRESS CHECKSTYLE: EmptyStatement
+            HttpsURLConnection conn = (HttpsURLConnection) new URL(this.url).openConnection();
+            conn.setRequestMethod("POST");
+            conn.setDoOutput(true);
 
-            while (reader.ready()) {
-                ret.append(reader.readLine()).append('\n');
+            // we can receive anything!
+            conn.addRequestProperty("Accept", "*/*");
+            // set a dummy User-Agent
+            conn.addRequestProperty("User-Agent", "placeholder");
+            // this isn't required, but is technically correct
+            conn.addRequestProperty("Content-Type", getContentHeader(type));
+            // only some API requests require an access token
+            if (this.accessToken != null) {
+                conn.addRequestProperty("Authorization", this.accessToken);
             }
+
+            wr = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8.newEncoder());
+            wr.write(payload);
+            wr.flush();
+
+            String line;
+            StringBuilder responseString = new StringBuilder();
+            // this has to be initialized AFTER the data has been flushed!
+            rd = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
+
+            while ((line = rd.readLine()) != null) {
+                responseString.append(line);
+            }
+
+            return responseString.toString();
         } finally {
-            if (reader != null) {
+            if (wr != null) {
                 try {
-                    reader.close();
+                    wr.close();
+                } catch (IOException ignore) { }
+            }
+            if (rd != null) {
+                try {
+                    rd.close();
                 } catch (IOException ignore) { }
             }
         }
-        return ret.toString();
     }
 }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteFailedException.java

@@ -1,7 +1,7 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
 /**
- * Thrown when pasting failed.
+ * Thrown when pasting fails.
  */
 public class PasteFailedException extends Exception {
     public PasteFailedException() {

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java

@@ -0,0 +1,90 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Pastes to {@code paste.gg}.
+ */
+class PasteGGPasteService extends PasteService {
+    private final boolean isPrivate;
+    private static final String PASTEGG_POST_REQUEST = "https://api.paste.gg/v1/pastes";
+
+    PasteGGPasteService(boolean isPrivate) {
+        super(PASTEGG_POST_REQUEST);
+        this.isPrivate = isPrivate;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(String data) {
+        Map<String, String> mapData = new HashMap<String, String>();
+        mapData.put("multiverse.txt", data);
+        return this.encodeData(mapData);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    String encodeData(Map<String, String> files) {
+        JSONObject root = new JSONObject();
+        root.put("name", "Multiverse-Core Debug Info");
+        root.put("visibility", this.isPrivate ? "unlisted" : "public");
+        JSONArray fileList = new JSONArray();
+        for (Map.Entry<String, String> entry : files.entrySet()) {
+            JSONObject fileObject = new JSONObject();
+            JSONObject contentObject = new JSONObject();
+            fileObject.put("name", entry.getKey());
+            fileObject.put("content", contentObject);
+            contentObject.put("format", "text");
+            contentObject.put("value", entry.getValue());
+            fileList.add(fileObject);
+        }
+
+        root.put("files", fileList);
+        return root.toJSONString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(String data) throws PasteFailedException {
+        try {
+            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
+            return (String) ((JSONObject) ((JSONObject) new JSONParser().parse(stringJSON)).get("result")).get("id");
+        } catch (IOException | ParseException e) {
+            throw new PasteFailedException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(Map<String, String> data) throws PasteFailedException {
+        try {
+            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
+            return "https://paste.gg/" + ((JSONObject) ((JSONObject) new JSONParser().parse(stringJSON)).get("result")).get("id");
+        } catch (IOException | ParseException e) {
+            throw new PasteFailedException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean supportsMultiFile() {
+        return true;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteService.java

@@ -1,45 +1,52 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
-import java.net.URL;
+import java.util.Map;
 
 /**
- * An interface to a web-based text-pasting service. Classes implementing this
- * interface should implement its methods to send data to an online text-sharing
- * service, such as pastebin.com. Conventionally, a paste is accomplished by (given
- * some PasteService instance ps):
+ * An interface to a web-based text-pasting service. Classes extending this
+ * should implement its methods to send data to an online text-sharing service,
+ * such as pastebin.com. Given some PasteService instance ps, a paste is accomplished by:
  *
- * {@code ps.postData(ps.encodeData(someString), ps.getPostURL());}
+ * {@code ps.postData(someString);}
  *
  * Services that provide a distinction between "public" and "private" pastes
- * should implement a custom constructor that specifies which kind the PasteService
- * instance is submitting; an example of this is the PastiePasteService class.
+ * should implement a constructor that specifies which kind the PasteService
+ * instance is submitting; an example of this is the PastebinPasteService class.
  */
-public interface PasteService {
+public abstract class PasteService extends HttpAPIClient {
+    PasteService(String url) {
+        super(url);
+    }
+
+    PasteService(String url, String accessToken) {
+        super(url, accessToken);
+    }
 
     /**
-     * Encode the given String data into a format suitable for transmission in an HTTP request.
+     * Post data to the Web.
      *
-     * @param data The raw data to encode.
-     * @return A URL-encoded string.
-     */
-    String encodeData(String data);
-
-    /**
-     * Get the URL to which this paste service sends new pastes.
-     *
-     * @return The URL that will be accessed to complete the paste.
-     */
-    URL getPostURL();
-
-    /**
-     * Post encoded data to the Web.
-     *
-     * @param encodedData A URL-encoded String containing the full request to post to
-     *                    the given URL. Can be the result of calling #encodeData().
-     * @param url The URL to which to paste. Can be the result of calling #getPostURL().
+     * @param data A String to post to the web.
      * @throws PasteFailedException When pasting/posting the data failed.
      * @return The URL at which the new paste is visible.
      */
-    String postData(String encodedData, URL url) throws PasteFailedException;
+    public abstract String postData(String data) throws PasteFailedException;
 
+    /**
+     * Post data to the Web.
+     *
+     * @param data A Map to post to the web.
+     * @throws PasteFailedException When pasting/posting the data failed.
+     * @return The URL at which the new paste is visible.
+     */
+    public abstract String postData(Map<String, String> data) throws PasteFailedException;
+
+    /**
+     * Does this service support uploading multiple files.
+     *
+     * Newer services like GitHub's Gist support multi-file pastes,
+     * which allows us to upload configs in addition to the standard logs.
+     *
+     * @return True if this service supports multiple file upload.
+     */
+    public abstract boolean supportsMultiFile();
 }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceFactory.java

@@ -14,10 +14,14 @@ public class PasteServiceFactory {
      */
     public static PasteService getService(PasteServiceType type, boolean isPrivate) {
         switch(type) {
+            case PASTEGG:
+                return new PasteGGPasteService(isPrivate);
             case PASTEBIN:
                 return new PastebinPasteService(isPrivate);
-            case PASTIE:
-                return new PastiePasteService(isPrivate);
+            case HASTEBIN:
+                return new HastebinPasteService();
+            case GITHUB:
+                return new GitHubPasteService(isPrivate);
             default:
                 return null;
         }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceType.java

@@ -7,12 +7,20 @@ package com.onarandombox.MultiverseCore.utils.webpaste;
  * @see PasteServiceFactory
  */
 public enum PasteServiceType {
+    /**
+     * @see PasteGGPasteService
+     */
+    PASTEGG,
     /**
      * @see PastebinPasteService
      */
     PASTEBIN,
     /**
-     * @see PastiePasteService
+     * @see HastebinPasteService
      */
-    PASTIE
+    HASTEBIN,
+    /**
+     * @see GitHubPasteService
+     */
+    GITHUB
 }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastebinPasteService.java

@@ -1,23 +1,19 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.util.Map;
 
 /**
  * Pastes to {@code pastebin.com}.
  */
-public class PastebinPasteService implements PasteService {
+class PastebinPasteService extends PasteService {
+    private final boolean isPrivate;
+    private static final String PASTEBIN_POST_REQUEST = "https://pastebin.com/api/api_post.php";
 
-    private boolean isPrivate;
-
-    public PastebinPasteService(boolean isPrivate) {
+    PastebinPasteService(boolean isPrivate) {
+        super(PASTEBIN_POST_REQUEST);
         this.isPrivate = isPrivate;
     }
 
@@ -25,26 +21,14 @@ public class PastebinPasteService implements PasteService {
      * {@inheritDoc}
      */
     @Override
-    public URL getPostURL() {
+    String encodeData(String data) {
         try {
-            return new URL("http://pastebin.com/api/api_post.php");
-        } catch (MalformedURLException e) {
-            return null; // should never hit here
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String encodeData(String data) {
-        try {
-            String encData = URLEncoder.encode("api_dev_key", "UTF-8") + "=" + URLEncoder.encode("d61d68d31e8e0392b59b50b277411c71", "UTF-8");
-            encData += "&" + URLEncoder.encode("api_option", "UTF-8") + "=" + URLEncoder.encode("paste", "UTF-8");
-            encData += "&" + URLEncoder.encode("api_paste_code", "UTF-8") + "=" + URLEncoder.encode(data, "UTF-8");
-            encData += "&" + URLEncoder.encode("api_paste_private", "UTF-8") + "=" + URLEncoder.encode(this.isPrivate ? "1" : "0", "UTF-8");
-            encData += "&" + URLEncoder.encode("api_paste_format", "UTF-8") + "=" + URLEncoder.encode("yaml", "UTF-8");
-            return encData;
+            return URLEncoder.encode("api_dev_key", "UTF-8") + "=" + URLEncoder.encode("d61d68d31e8e0392b59b50b277411c71", "UTF-8") +
+                    "&" + URLEncoder.encode("api_option", "UTF-8") + "=" + URLEncoder.encode("paste", "UTF-8") +
+                    "&" + URLEncoder.encode("api_paste_code", "UTF-8") + "=" + URLEncoder.encode(data, "UTF-8") +
+                    "&" + URLEncoder.encode("api_paste_private", "UTF-8") + "=" + URLEncoder.encode(this.isPrivate ? "1" : "0", "UTF-8") +
+                    "&" + URLEncoder.encode("api_paste_format", "UTF-8") + "=" + URLEncoder.encode("yaml", "UTF-8") +
+                    "&" + URLEncoder.encode("api_paste_name", "UTF-8") + "=" + URLEncoder.encode("Multiverse-Core Debug Info", "UTF-8");
         } catch (UnsupportedEncodingException e) {
             return ""; // should never hit here
         }
@@ -54,36 +38,39 @@ public class PastebinPasteService implements PasteService {
      * {@inheritDoc}
      */
     @Override
-    public String postData(String encodedData, URL url) throws PasteFailedException {
-        OutputStreamWriter wr = null;
-        BufferedReader rd = null;
-        try {
-            URLConnection conn = url.openConnection();
-            conn.setDoOutput(true);
-            wr = new OutputStreamWriter(conn.getOutputStream());
-            wr.write(encodedData);
-            wr.flush();
+    String encodeData(Map<String, String> data) {
+        throw new UnsupportedOperationException();
+    }
 
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line;
-            String pastebinUrl = "";
-            while ((line = rd.readLine()) != null) {
-                pastebinUrl = line;
-            }
-            return pastebinUrl;
-        } catch (Exception e) {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(String data) throws PasteFailedException {
+        try {
+            return this.exec(encodeData(data), ContentType.URLENCODED);
+        } catch (IOException e) {
             throw new PasteFailedException(e);
-        } finally {
-            if (wr != null) {
-                try {
-                    wr.close();
-                } catch (IOException ignore) { }
-            }
-            if (rd != null) {
-                try {
-                    rd.close();
-                } catch (IOException ignore) { }
-            }
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String postData(Map<String, String> data) throws PasteFailedException {
+        try {
+            return this.exec(encodeData(data), ContentType.URLENCODED);
+        } catch (IOException e) {
+            throw new PasteFailedException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean supportsMultiFile() {
+        return false;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastiePasteService.java

@@ -1,107 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Pastes to {@code pastie.org}.
- */
-public class PastiePasteService implements PasteService {
-
-    private boolean isPrivate;
-
-    public PastiePasteService(boolean isPrivate) {
-        this.isPrivate = isPrivate;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public URL getPostURL() {
-        try {
-            return new URL("http://pastie.org/pastes");
-        } catch (MalformedURLException e) {
-            return null; // should never hit here
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String encodeData(String data) {
-        try {
-            String encData = URLEncoder.encode("paste[authorization]", "UTF-8") + "=" + URLEncoder.encode("burger", "UTF-8"); // burger is magic
-            encData += "&" + URLEncoder.encode("paste[restricted]", "UTF-8") + "=" + URLEncoder.encode(this.isPrivate ? "1" : "0", "UTF-8");
-            encData += "&" + URLEncoder.encode("paste[parser_id]", "UTF-8") + "=" + URLEncoder.encode("6", "UTF-8"); // 6 is plain text
-            encData += "&" + URLEncoder.encode("paste[body]", "UTF-8") + "=" + URLEncoder.encode(data, "UTF-8");
-            return encData;
-        } catch (UnsupportedEncodingException e) {
-            return ""; // should never hit here
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(String encodedData, URL url) throws PasteFailedException {
-        OutputStreamWriter wr = null;
-        BufferedReader rd = null;
-        try {
-            URLConnection conn = url.openConnection();
-            conn.setDoOutput(true);
-            wr = new OutputStreamWriter(conn.getOutputStream());
-            wr.write(encodedData);
-            wr.flush();
-
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line;
-            String pastieUrl = "";
-            Pattern pastiePattern = this.getURLMatchingPattern();
-            while ((line = rd.readLine()) != null) {
-                Matcher m = pastiePattern.matcher(line);
-                if (m.matches()) {
-                    String pastieID = m.group(1);
-                    pastieUrl = this.formatURL(pastieID);
-                }
-            }
-            return pastieUrl;
-        } catch (Exception e) {
-            throw new PasteFailedException(e);
-        } finally {
-            if (wr != null) {
-                try {
-                    wr.close();
-                } catch (IOException ignore) { }
-            }
-            if (rd != null) {
-                try {
-                    rd.close();
-                } catch (IOException ignore) { }
-            }
-        }
-    }
-
-    private Pattern getURLMatchingPattern() {
-        if (this.isPrivate) {
-            return Pattern.compile(".*http://pastie.org/.*key=([0-9a-z]+).*");
-        } else {
-            return Pattern.compile(".*http://pastie.org/([0-9]+).*");
-        }
-    }
-
-    private String formatURL(String pastieID) {
-        return "http://pastie.org/" + (this.isPrivate ? "private/" : "") + pastieID;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortener.java

@@ -1,13 +1,27 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
 /**
- * URL-Shortener.
+ * An interface to a web-based URL Shortener. Classes extending this should
+ * implement its methods to shorten links using the service. Given some
+ * URLShortener instance us, a URL is shortened by:
+ *
+ * {@code us.shorten(longUrl);}
+ *
+ * An example of this, is the BitlyURLShortener.
  */
-public interface URLShortener {
+public abstract class URLShortener extends HttpAPIClient {
+    URLShortener(String url) {
+        super(url);
+    }
+
+    URLShortener(String url, String accessToken) {
+        super(url, accessToken);
+    }
+
     /**
-     * Shorten an URL.
+     * Shorten a URL.
      * @param longUrl The long form.
      * @return The shortened URL.
      */
-    String shorten(String longUrl);
+    public abstract String shorten(String longUrl);
 }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerFactory.java

@@ -0,0 +1,23 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+/**
+ * Used to construct {@link URLShortener}s.
+ */
+public class URLShortenerFactory {
+    private URLShortenerFactory() { }
+
+    /**
+     * Constructs a new {@link URLShortener}.
+     * @param type The {@link URLShortenerType}.
+     * @return The newly created {@link URLShortener}.
+     */
+    public static URLShortener getService(URLShortenerType type) {
+        if (type == URLShortenerType.BITLY) {
+            try {
+                return new BitlyURLShortener();
+            } catch (UnsupportedOperationException ignored) {}
+        }
+
+        return null;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerType.java

@@ -0,0 +1,14 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+/**
+ * An enum containing all known {@link URLShortener}s.
+ *
+ * @see URLShortener
+ * @see URLShortenerFactory
+ */
+public enum URLShortenerType {
+    /**
+     * @see BitlyURLShortener
+     */
+    BITLY
+}