WIP doxygen fix.

Fix Travis Builds for Pull Requests (#2208 )
* fix travis * I don't think we need this * we don't use circleci anymore
2020-06-12 23:54:55 -04:00 · 2020-05-06 13:07:48 -04:00 · 2020-05-05 21:19:42 -04:00 · 2020-05-05 21:14:12 -04:00 · 2020-04-30 20:43:11 +02:00 · 2020-04-16 18:31:23 -04:00
93 changed files with 2633 additions and 2441 deletions
@@ -12,6 +12,7 @@

 # maven
 /target
+dependency-reduced-pom.xml

 # vim
 .*.sw[a-p]
@@ -0,0 +1,6 @@
+language: java
+jdk:
+  - oraclejdk8
+notifications:
+  email: false
+dist: trusty
@@ -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.
+ 
@@ -104,7 +104,6 @@
        </module>
        <module name="LeftCurly"/>
        <module name="RightCurly"/>
-        <module name="DoubleCheckedLocking"/>
        <module name="EmptyStatement"/>
        <module name="EqualsHashCode"/>
        <module name="HiddenField">
@@ -116,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
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.onarandombox.multiversecore</groupId>
    <artifactId>Multiverse-Core</artifactId>
-    <version>2.5</version>
+    <version>4.1.1-SNAPSHOT</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
@@ -12,23 +12,31 @@
    </properties>

    <repositories>
+      <!-- Spigot -->
+        <repository>
+            <id>spigotmc-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>
        </repository>
        <repository>
-            <id>Bukkit Official</id>
-            <url>http://repo.bukkit.org/content/repositories/public</url>
+            <id>spigot</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
        </repository>
-        <!-- Required for Metrics -->
        <repository>
-            <id>mcstats</id>
-            <url>http://repo.mcstats.org/content/repositories/snapshots</url>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
        </repository>
-        <!-- Required for Vault -->
        <repository>
-            <id>herocraft</id>
-            <url>http://ci.herocraftonline.com/plugin/repository/everything/</url>
+            <id>minebench-repo</id>
+            <url>https://repo.minebench.de/</url>
+        </repository>
+        <!-- Has a copy of metrics R8-SNAPSHOT !-->
+        <repository>
+            <id>elmakers-repo</id>
+            <url>http://maven.elmakers.com/repository/</url>
        </repository>
    </repositories>

@@ -71,16 +79,16 @@
            <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>
                        <phase>prepare-package</phase>
@@ -103,7 +111,7 @@
            <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>
@@ -114,7 +122,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>
@@ -127,14 +135,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.8</version>
+                <version>2.17</version>
                <configuration>
                    <enableRulesSummary>true</enableRulesSummary>
                    <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
@@ -143,7 +151,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>
@@ -154,9 +162,20 @@
                    </execution>
                </executions>
            </plugin>
+            <plugin>
+                <groupId>net.sf.doodleproject</artifactId>
+                <artifactId>doxygen-maven-plugin</artifactId>
+                <configuration>
+                    <alphabeticalIndex>true</alphabeticalIndex>
+                    <inputDirectory>${basedir}/src/main/java</inputDirectory>
+                    <filePatterns>*.java</filePatterns>
+                    <recursive>true</recursive>
+                    <outputDirectory>${project.reporting.outputDirectory}/doxygen</outputDirectory>
+                </configuration>
+            </plugin>
            <plugin>
                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>2.10.4</version>
                <executions>
                    <execution>
                        <id>javadoc-jar</id>
@@ -164,13 +183,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.1.1</version>
                <executions>
                    <execution>
                        <phase>package</phase>
@@ -178,186 +200,175 @@
                            <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:metrics</include>
-                                    <include>com.dumptruckman.minecraft:Logging</include>
-                                    <include>com.dumptruckman.minecraft:Permissions-Bukkit</include>
-                                    <include>com.fernferret.allpay:AllPay</include>
-                                </includes>
-                            </artifactSet>
                            <relocations>
-                                <relocation>
-                                    <pattern>com.fernferret.allpay</pattern>
-                                    <shadedPattern>com.fernferret.allpay.multiverse</shadedPattern>
-                                </relocation>
                                <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>
+                                    <shadedPattern>com.onarandombox.mcstats</shadedPattern>
                                </relocation>
                                <relocation>
                                    <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.CoreLogging</shadedPattern>
                                </relocation>
-                                <relocation>
-                                    <pattern>com.dumptruckman.minecraft.pluginbase</pattern>
-                                    <shadedPattern>com.onarandombox.MultiverseCore.pluginbase</shadedPattern>
-                                </relocation>
                                <relocation>
                                    <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>0.6.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>tests-instrument</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
    </build>

    <dependencies>
-        <!-- Bukkit Dependency -->
        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.4.5-R0.2</version>
-            <!-- If you want the lates, use this -->
-            <!-- <version>LATEST</version> -->
-            <type>jar</type>
-            <scope>compile</scope>
+           <groupId>org.bukkit</groupId>
+           <artifactId>bukkit</artifactId>
+           <version>1.13.2-R0.1-SNAPSHOT</version>
+           <scope>provided</scope>
        </dependency>
-        <!-- Bukkit Dependency -->
-        <!-- 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>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <!-- End of SerializationConfig Dependency -->
        <!-- Start of Economy Dependency -->
-        <dependency>
-            <groupId>com.fernferret.allpay</groupId>
-            <artifactId>AllPay</artifactId>
-            <version>10</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
        <dependency>
            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>Vault</artifactId>
-            <version>1.2.19-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <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>7</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <version>11</version>
        </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>
+            <version>2.0-SNAPSHOT</version>
        </dependency>
-        <!-- End of Buscript Dependency -->
-        <!-- Start of Metrics Dependency -->
        <dependency>
-            <groupId>org.mcstats</groupId>
+            <groupId>org.mcstats.bukkit</groupId>
            <artifactId>metrics</artifactId>
-            <version>1.2-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <version>R8-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
-        <!-- End of Metrics Dependency -->
-        <!-- Start of Logging Dependency -->
        <dependency>
            <groupId>com.dumptruckman.minecraft</groupId>
            <artifactId>Logging</artifactId>
-            <version>1.0.9</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <version>1.1.1</version>
        </dependency>
-        <!-- End of Logging Dependency -->
-        <!-- Start of Permissions lib Dependency -->
        <dependency>
-            <groupId>com.dumptruckman.minecraft</groupId>
-            <artifactId>Permissions-Bukkit</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
        </dependency>
-        <!-- End of Permissions lib 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.0</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.0</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.0</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>
@@ -12,11 +12,11 @@ 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;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import com.onarandombox.MultiverseCore.utils.Permissions;
 import me.main__.util.SerializationConfig.ChangeDeniedException;
 import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.VirtualProperty;
@@ -24,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;
@@ -31,7 +32,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.SerializableAs;
 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;
@@ -50,7 +53,7 @@ public class MVWorld implements MultiverseWorld {
    private final MultiverseCore plugin; // Hold the Plugin Instance.
    private final String name; // The Worlds Name, EG its folder name.
    private final UUID worldUID;
-    final WorldProperties props;
+    private final WorldProperties props;

    public MVWorld(MultiverseCore plugin, World world, WorldProperties properties) {
        this(plugin, world, properties, true);
@@ -84,6 +87,8 @@ public class MVWorld implements MultiverseWorld {
        this.props.environment = world.getEnvironment();
        this.props.seed = world.getSeed();

+        this.initPerms();
+
        this.props.flushChanges();

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

@@ -244,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();
@@ -269,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);
        }
    }
@@ -320,7 +335,10 @@ public class MVWorld implements MultiverseWorld {
        }
    }

+    private Permission permission;
    private Permission exempt;
+    private Permission ignoreperm;
+    private Permission limitbypassperm;

    /**
     * Null-location.
@@ -366,6 +384,37 @@ public class MVWorld implements MultiverseWorld {
        };
    }

+    /**
+     * Initializes permissions.
+     */
+    private void initPerms() {
+        this.permission = new Permission("multiverse.access." + this.getName(), "Allows access to " + this.getName(), PermissionDefault.OP);
+        // This guy is special. He shouldn't be added to any parent perms.
+        this.ignoreperm = new Permission("mv.bypass.gamemode." + this.getName(),
+                "Allows players with this permission to ignore gamemode changes.", PermissionDefault.FALSE);
+
+        this.exempt = new Permission("multiverse.exempt." + this.getName(),
+                "A player who has this does not pay to enter this world, or use any MV portals in it " + this.getName(), PermissionDefault.OP);
+
+        this.limitbypassperm = new Permission("mv.bypass.playerlimit." + this.getName(),
+                "A player who can enter this world regardless of wether its full", PermissionDefault.OP);
+        try {
+            this.plugin.getServer().getPluginManager().addPermission(this.permission);
+            this.plugin.getServer().getPluginManager().addPermission(this.exempt);
+            this.plugin.getServer().getPluginManager().addPermission(this.ignoreperm);
+            this.plugin.getServer().getPluginManager().addPermission(this.limitbypassperm);
+            // Add the permission and exempt to parents.
+            this.addToUpperLists(this.permission);
+
+            // Add ignore to it's parent:
+            this.ignoreperm.addParent("mv.bypass.gamemode.*", true);
+            // 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);
+        }
+    }
+
    private Location readSpawnFromWorld(World w) {
        Location location = w.getSpawnLocation();
        // Set the worldspawn to our configspawn
@@ -408,10 +457,44 @@ public class MVWorld implements MultiverseWorld {
        return location;
    }

+    private void addToUpperLists(Permission perm) {
+        Permission all = this.plugin.getServer().getPluginManager().getPermission("multiverse.*");
+        Permission allWorlds = this.plugin.getServer().getPluginManager().getPermission("multiverse.access.*");
+        Permission allExemption = this.plugin.getServer().getPluginManager().getPermission("multiverse.exempt.*");
+
+        if (allWorlds == null) {
+            allWorlds = new Permission("multiverse.access.*");
+            this.plugin.getServer().getPluginManager().addPermission(allWorlds);
+        }
+        allWorlds.getChildren().put(perm.getName(), true);
+        if (allExemption == null) {
+            allExemption = new Permission("multiverse.exempt.*");
+            this.plugin.getServer().getPluginManager().addPermission(allExemption);
+        }
+        allExemption.getChildren().put(this.exempt.getName(), true);
+        if (all == null) {
+            all = new Permission("multiverse.*");
+            this.plugin.getServer().getPluginManager().addPermission(all);
+        }
+        all.getChildren().put("multiverse.access.*", true);
+        all.getChildren().put("multiverse.exempt.*", true);
+
+        this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(all);
+        this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(allWorlds);
+    }
+
+    /**
+     * Copies all properties from another {@link MVWorld} object.
+     * @param other The other world object.
+     */
    public void copyValues(MVWorld other) {
        props.copyValues(other.props);
    }

+    /**
+     * Copies all properties from a {@link WorldProperties} object.
+     * @param other The world properties object.
+     */
    public void copyValues(WorldProperties other) {
        props.copyValues(other);
    }
@@ -472,6 +555,7 @@ public class MVWorld implements MultiverseWorld {
        if (list == null)
            return false;
        list.clear();
+        validateEntitySpawns();
        return true;
    }

@@ -487,6 +571,7 @@ public class MVWorld implements MultiverseWorld {
        if (list == null)
            return false;
        list.add(value);
+        validateEntitySpawns();
        return true;
    }

@@ -502,6 +587,7 @@ public class MVWorld implements MultiverseWorld {
        if (list == null)
            return false;
        list.remove(value);
+        validateEntitySpawns();
        return true;
    }

@@ -519,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}
     */
@@ -854,14 +917,14 @@ public class MVWorld implements MultiverseWorld {
     */
    @Override
    public Permission getAccessPermission() {
-        return Permissions.ACCESS.getPermission(getName());
+        return this.permission;
    }

    /**
     * {@inheritDoc}
     */
    @Override
-    public int getCurrency() {
+    public Material getCurrency() {
        return this.props.getCurrency();
    }

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

@@ -894,7 +957,7 @@ public class MVWorld implements MultiverseWorld {
     */
    @Override
    public Permission getExemptPermission() {
-        return Permissions.COST_EXEMPT.getPermission(getName());
+        return this.exempt;
    }

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

 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.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+
 import buscript.Buscript;
-import com.dumptruckman.minecraft.pluginbase.permission.BukkitPermFactory;
 import com.dumptruckman.minecraft.util.Logging;
-import com.fernferret.allpay.AllPay;
-import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.Core;
@@ -64,6 +78,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;
@@ -71,16 +86,20 @@ import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
 import com.onarandombox.MultiverseCore.listeners.MVMapListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
-import com.onarandombox.MultiverseCore.listeners.MVPluginListener;
 import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
 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.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.SimpleBlockSafety;
 import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
+import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
 import com.onarandombox.MultiverseCore.utils.VaultHandler;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
 import com.pneumaticraft.commandhandler.CommandHandler;
@@ -95,31 +114,21 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
 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.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.java.JavaPluginLoader;
 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;
-
 /**
 * The implementation of the Multiverse-{@link Core}.
 */
 public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
-    private static final int PROTOCOL = 18;
+    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>();
@@ -128,6 +137,21 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    // TODO please let's make this non-static
    private volatile MultiverseCoreConfiguration config;

+    public MultiverseCore() {
+        super();
+    }
+
+    /**
+     * This is for unit testing.
+     * @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.
+     */
+    public MultiverseCore(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
+        super(loader, description, dataFolder, file);
+    }
+
    /**
     * This method is used to find out who is teleporting a player.
     * @param playerName The teleported player (the teleportee).
@@ -153,11 +177,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.
@@ -201,32 +220,27 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    // Setup the block/player/entity listener.
    private final MVPlayerListener playerListener = new MVPlayerListener(this);
    private final MVEntityListener entityListener = new MVEntityListener(this);
-    private final MVPluginListener pluginListener = new MVPluginListener(this);
    private final MVWeatherListener weatherListener = new MVWeatherListener(this);
    private final MVPortalListener portalListener = new MVPortalListener(this);
+    private final MVWorldListener worldListener = new MVWorldListener(this);
    private MVChatListener chatListener;

    // HashMap to contain information relating to the Players.
    private HashMap<String, MVPlayerSession> playerSessions;
-    private VaultHandler vaultHandler;
-    private GenericBank bank = null;
-    private AllPay banker;
+    private MVEconomist economist;
    private Buscript buscript;
    private int pluginCount;
    private DestinationFactory destFactory;
-    //private SpoutInterface spoutInterface = null;
    private MultiverseMessaging messaging;
    private BlockSafety blockSafety;
    private LocationManipulation locationManipulation;
    private SafeTTeleporter safeTTeleporter;
+    private UnsafeCallWrapper unsafeCallWrapper;

    private File serverFolder = new File(System.getProperty("user.dir"));

    @Override
    public void onLoad() {
-        // Register permission handler
-        BukkitPermFactory.registerPermissionName(getClass(), "multiverse");
-        BukkitPermFactory.registerPermissionName(Core.class, "multiverse");
        // Register our config
        SerializationConfig.registerAll(MultiverseCoreConfiguration.class);
        // Register our world
@@ -242,31 +256,18 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        this.locationManipulation = new SimpleLocationManipulation();
        // Setup our SafeTTeleporter
        this.safeTTeleporter = new SimpleSafeTTeleporter(this);
+        this.unsafeCallWrapper = new UnsafeCallWrapper(this);
    }

-    /**
-     * {@inheritDoc}
-     * @deprecated This is deprecated.
-     */
+
    @Override
    @Deprecated
-    public FileConfiguration getMVConfiguration() {
-        return this.multiverseConfig;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @deprecated Now using Vault.
-     */
-    @Override
-    @Deprecated
-    public GenericBank getBank() {
-        return this.bank;
-    }
-
-    @Override
    public VaultHandler getVaultHandler() {
-        return vaultHandler;
+        return getEconomist().getVaultHandler();
+    }
+
+    public MVEconomist getEconomist() {
+        return economist;
    }

    /**
@@ -274,9 +275,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     */
    @Override
    public void onEnable() {
+        getServer().getPluginManager().registerEvents(new MVWorldInitListener(this), this);
+
        this.messaging = new MVMessaging();
-        this.banker = new AllPay(this, LOG_TAG + " ");
-        this.vaultHandler = new VaultHandler(this);
+        this.economist = new MVEconomist(this);
        // Load the defaultWorldGenerators
        this.worldManager.getDefaultWorldGenerators();

@@ -284,8 +286,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Setup Permissions, we'll do an initial check for the Permissions plugin then fall back on isOP().
        this.ph = new MVPermissions(this);

-        this.bank = this.banker.loadEconPlugin();
-
        // Setup the command manager
        this.commandHandler = new CommandHandler(this, this.ph);
        // Call the Function to assign all the Commands to their Class.
@@ -305,7 +305,6 @@ 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);
@@ -334,19 +333,17 @@ 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");
+        }
    }

    /**
@@ -355,7 +352,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    private void initializeBuscript() {
        buscript = new Buscript(this);
        // Add global variable "multiverse" to javascript environment
-        buscript.getGlobalScope().put("multiverse", buscript.getGlobalScope(), this);
+        buscript.setScriptVariable("multiverse", this);
    }

    /**
@@ -415,17 +412,18 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        try {
            Metrics m = new Metrics(this);

-            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
+            Metrics.Graph envGraph = m.createGraph("Worlds by environment");
            for (Environment env : Environment.values())
                envGraph.addPlotter(new EnvironmentPlotter(this, env));

-            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
+            Metrics.Graph loadedWorldsGraph = m.createGraph("Worlds by environment");
+            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Loaded worlds") {
                @Override
                public int getValue() {
                    return getMVWorldManager().getMVWorlds().size();
                }
            });
-            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
+            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Total number of worlds") {
                @Override
                public int getValue() {
                    return getMVWorldManager().getMVWorlds().size()
@@ -438,13 +436,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                gens.add(w.getGenerator());
            gens.remove(null);
            gens.remove("null");
-            Metrics.Graph genGraph = m.createGraph("custom_gens");
+            Metrics.Graph genGraph = m.createGraph("Custom Generators");
            for (String gen : gens)
                genGraph.addPlotter(new GeneratorPlotter(this, gen));

            m.start();
            log(Level.FINE, "Metrics have run!");
-        } catch (IOException e) {
+        } catch (Exception e) {
            log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
        }
    }
@@ -467,9 +465,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        PluginManager pm = getServer().getPluginManager();
        pm.registerEvents(this.playerListener, this);
        pm.registerEvents(this.entityListener, this);
-        pm.registerEvents(this.pluginListener, this);
        pm.registerEvents(this.weatherListener, this);
        pm.registerEvents(this.portalListener, this);
+        log(Level.INFO, "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do. The performance impact is negligible.");
+        pm.registerEvents(this.worldListener, this);
        pm.registerEvents(new MVMapListener(this), this);
    }

@@ -480,8 +479,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);

@@ -505,6 +515,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));
+        }
    }

    /**
@@ -558,12 +574,22 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        }
    }

+    private static final char PATH_SEPARATOR = '\uF8FF';
+
    /**
     * Migrate the worlds.yml to SerializationConfig.
     */
    private void migrateWorldConfig() { // SUPPRESS CHECKSTYLE: MethodLength
-        FileConfiguration wconf = YamlConfiguration
-                .loadConfiguration(new File(getDataFolder(), "worlds.yml"));
+        FileConfiguration wconf = new YamlConfiguration();
+        wconf.options().pathSeparator(PATH_SEPARATOR);
+        File worldsFile = new File(getDataFolder(), "worlds.yml");
+        try {
+            wconf.load(worldsFile);
+        } catch (IOException e) {
+            log(Level.WARNING, "Cannot load worlds.yml");
+        } catch (InvalidConfigurationException e) {
+            log(Level.WARNING, "Your worlds.yml is invalid!");
+        }

        if (!wconf.isConfigurationSection("worlds")) { // empty config
            this.log(Level.FINE, "No worlds to migrate!");
@@ -615,8 +641,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"));
@@ -740,7 +767,14 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

                // migrate difficulty
                if (section.isString("difficulty")) {
-                    final Difficulty difficulty = Difficulty.valueOf(section.getString("difficulty").toUpperCase());
+                    Difficulty difficulty;
+                    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");
+                        difficulty = Difficulty.NORMAL;
+                    }
                    if (difficulty != null) {
                        world.setDifficulty(difficulty);
                    }
@@ -839,8 +873,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    @Override
    public void onDisable() {
        this.saveMVConfigs();
-        this.banker = null;
-        this.bank = null;
        Logging.shutdown();
    }

@@ -857,17 +889,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}
     */
@@ -1026,26 +1047,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        this.pluginCount -= 1;
    }

-    /**
-     * {@inheritDoc}
-     * @deprecated Now using Vault.
-     */
-    @Override
-    @Deprecated
-    public AllPay getBanker() {
-        return this.banker;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @deprecated Now using Vault.
-     */
-    @Override
-    @Deprecated
-    public void setBank(GenericBank bank) {
-        this.bank = bank;
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -1087,25 +1088,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}
     */
@@ -1238,6 +1220,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     */
    @Override
    public void setBlockSafety(BlockSafety bs) {
+        if (bs == null) {
+            throw new NullPointerException("block safety may not be null.");
+        }
        this.blockSafety = bs;
    }

@@ -1296,4 +1281,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    public Buscript getScriptAPI() {
        return buscript;
    }
+
+    public UnsafeCallWrapper getUnsafeCallWrapper() {
+        return this.unsafeCallWrapper;
+    }
 }
@@ -1,12 +1,14 @@
 package com.onarandombox.MultiverseCore;

+import java.util.Map;
+
 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 java.util.Map;
+import org.bukkit.Bukkit;

 /**
 * Our configuration.
@@ -44,6 +46,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    @Property
    private volatile boolean prefixchat;
    @Property
+    private volatile String prefixchatformat;
+    @Property
    private volatile boolean useasyncchat;
    @Property
    private volatile boolean teleportintercept;
@@ -67,6 +71,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();
@@ -87,6 +95,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        enforceaccess = false;
        useasyncchat = true;
        prefixchat = true;
+        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
        displaypermerrors = true;
@@ -96,7 +105,9 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        this.version = 2.9;
        silentstart = false;
        defaultportalsearch = false;
-        portalsearchradius = 16;
+        portalsearchradius = 128;
+        autopurge = true;
+        idonotwanttodonate = false;
        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
    }

@@ -145,6 +156,22 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    public void setPrefixChat(boolean prefixChat) {
        this.prefixchat = prefixChat;
    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getPrefixChatFormat() {
+        return this.prefixchatformat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPrefixChatFormat(String prefixChatFormat) {
+        this.prefixchatformat = prefixChatFormat;
+    }

    /**
     * {@inheritDoc}
@@ -209,6 +236,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    public void setGlobalDebug(int globalDebug) {
        this.globaldebug = globalDebug;
        Logging.setDebugLevel(globalDebug);
+        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
    }

    /**
@@ -315,4 +343,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;
+    }
 }
@@ -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;
@@ -29,6 +31,11 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+/*
+ * This is a property class, I think we don't need that much javadoc.
+ * BEGIN CHECKSTYLE-SUPPRESSION: Javadoc
+ */
+
@SerializableAs("MVWorld")
 public class WorldProperties extends SerializationConfig {

@@ -36,7 +43,9 @@ public class WorldProperties extends SerializationConfig {

    static {
        PROPERTY_ALIASES = new HashMap<String, String>();
-        PROPERTY_ALIASES.put("curr", "currency");
+        PROPERTY_ALIASES.put("curr", "entryfee.currency");
+        PROPERTY_ALIASES.put("currency", "entryfee.currency");
+        PROPERTY_ALIASES.put("price", "entryfee.amount");
        PROPERTY_ALIASES.put("scaling", "scale");
        PROPERTY_ALIASES.put("aliascolor", "color");
        PROPERTY_ALIASES.put("heal", "autoHeal");
@@ -57,12 +66,17 @@ public class WorldProperties extends SerializationConfig {
        PROPERTY_ALIASES.put("allowfly", "allowFlight");
    }

+    private final boolean keepSpawnFallback;
+
    public WorldProperties(Map<String, Object> values) {
        super(values);
+        Object keepSpawnObject = values.get("keepSpawnInMemory");
+        keepSpawnFallback = keepSpawnObject == null || Boolean.parseBoolean(keepSpawnObject.toString());
    }

    public WorldProperties() {
        super();
+        keepSpawnFallback = true;
    }

    public WorldProperties(final boolean fixSpawn, final Environment environment) {
@@ -71,6 +85,7 @@ public class WorldProperties extends SerializationConfig {
            this.adjustSpawn = false;
        }
        setScaling(getDefaultScale(environment));
+        keepSpawnFallback = true;
    }

    void setMVWorld(MVWorld world) {
@@ -235,7 +250,7 @@ public class WorldProperties extends SerializationConfig {
    @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'style' must be a valid style-name.")
    private volatile EnglishChatStyle style;
    @Property(description = "Sorry, 'pvp' must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
-    volatile VirtualProperty<Boolean> pvp;
+    volatile VirtualProperty<Boolean> pvp; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @Property(description = "Scale must be a positive double value. ex: 2.3")
    private volatile double scale;
    @Property(description = "You must set this to the NAME not alias of a world.")
@@ -244,11 +259,11 @@ public class WorldProperties extends SerializationConfig {
    private volatile boolean allowWeather;
    @Property(serializor = DifficultyPropertySerializor.class, virtualType = Difficulty.class, persistVirtual = true,
            description = "Difficulty must be set as one of the following: peaceful easy normal hard")
-    volatile VirtualProperty<Difficulty> difficulty;
+    volatile VirtualProperty<Difficulty> difficulty; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @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.")
@@ -260,12 +275,12 @@ public class WorldProperties extends SerializationConfig {
    @Property(serializor = GameModePropertySerializor.class, description = "GameMode must be set as one of the following: survival creative")
    private volatile GameMode gameMode;
    @Property(description = "Sorry, this must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
-    volatile VirtualProperty<Boolean> keepSpawnInMemory;
+    volatile VirtualProperty<Boolean> keepSpawnInMemory; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @Property
-    volatile SpawnLocation spawnLocation;
+    volatile SpawnLocation spawnLocation; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @Property(virtualType = Location.class,
            description = "There is no help available for this variable. Go bug Rigby90 about it.")
-    volatile VirtualProperty<Location> spawn;
+    volatile VirtualProperty<Location> spawn; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @Property(description = "Set this to false ONLY if you don't want this world to load itself on server restart.")
    private volatile boolean autoLoad;
    @Property(description = "If a player dies in this world, shoudld they go to their bed?")
@@ -274,11 +289,11 @@ public class WorldProperties extends SerializationConfig {
    private volatile List<String> worldBlacklist;
    @Property(serializor = TimePropertySerializor.class, virtualType = Long.class,
            description = "Set the time to whatever you want! (Will NOT freeze time)")
-    volatile VirtualProperty<Long> time;
+    volatile VirtualProperty<Long> time; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @Property
-    volatile Environment environment;
+    volatile Environment environment; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @Property
-    volatile long seed;
+    volatile long seed; // SUPPRESS CHECKSTYLE: VisibilityModifier
    @Property
    private volatile String generator;
    @Property
@@ -361,7 +376,7 @@ public class WorldProperties extends SerializationConfig {
        this.flushPendingVPropChanges();
    }

-    String getAlias() {
+    public String getAlias() {
        return this.alias;
    }

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

@@ -520,7 +535,14 @@ public class WorldProperties extends SerializationConfig {
    }

    public boolean isKeepingSpawnInMemory() {
-        return this.keepSpawnInMemory.get();
+        if (keepSpawnInMemory == null) {
+            return keepSpawnFallback;
+        }
+        try {
+            return this.keepSpawnInMemory.get();
+        } catch (IllegalStateException e) {
+            return keepSpawnFallback;
+        }
    }

    public void setKeepSpawnInMemory(boolean value) {
@@ -547,7 +569,7 @@ public class WorldProperties extends SerializationConfig {
        return this.difficulty.get();
    }

-    @Deprecated
+    @Deprecated // SUPPRESS CHECKSTYLE: Deprecated
    public boolean setDifficulty(String difficulty) {
        return this.setPropertyUnchecked("difficulty", difficulty);
    }
@@ -8,10 +8,9 @@
 package com.onarandombox.MultiverseCore.api;

 import buscript.Buscript;
-import com.fernferret.allpay.AllPay;
-import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
+import com.onarandombox.MultiverseCore.utils.MVEconomist;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
 import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
@@ -19,7 +18,6 @@ import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
 import com.onarandombox.MultiverseCore.utils.VaultHandler;
 import com.pneumaticraft.commandhandler.CommandHandler;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;

 /**
@@ -29,32 +27,24 @@ import org.bukkit.entity.Player;
 */
 public interface Core {

-    /**
-     * Gets the Multiverse config file.
-     *
-     * @return The Multiverse config file.
-     * @deprecated Don't modify the config-file manually!
-     */
-    @Deprecated
-    FileConfiguration getMVConfiguration();
-
-    /**
-     * Gets the Banking system that Multiverse-Core has hooked into.
-     *
-     * @return A {@link GenericBank} that can be used for payments.
-     * @deprecated Now using vault, see {@link VaultHandler#getEconomy}
-     */
-    @Deprecated
-    GenericBank getBank();
-
    /**
     * Returns the Vault handler used by Multiverse.  The returned object will have all methods necessary for
     * interfacing with Vault.
     *
     * @return the Vault handler for Multiverse.
+     * @deprecated we are now using {@link #getEconomist()} for all economy needs.
     */
+    @Deprecated
    VaultHandler getVaultHandler();

+    /**
+     * Retrieves Multiverse's friendly economist. The economist can be used for dealing with economies without
+     * worrying about any of the messy details.
+     *
+     * @return the economy manager for Multiverse.
+     */
+    MVEconomist getEconomist();
+
    /**
     * Reloads the Multiverse Configuration files:
     * worlds.yml and config.yml.
@@ -80,17 +70,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.
@@ -118,7 +97,7 @@ public interface Core {
    /**
     * Gets the primary class responsible for managing Multiverse Worlds.
     *
-     * @return {@link WorldManager}.
+     * @return {@link MVWorldManager}.
     */
    MVWorldManager getMVWorldManager();

@@ -151,24 +130,6 @@ public interface Core {
    @Deprecated
    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);

-    /**
-     * Sets the {@link GenericBank}-Bank AllPay is using.
-     *
-     * @param bank The new {@link GenericBank}
-     * @deprecated Now using vault, see {@link VaultHandler#getEconomy}
-     */
-    @Deprecated
-    void setBank(GenericBank bank);
-
-    /**
-     * Gets this plugin's {@link AllPay}-Banker.
-     *
-     * @return An {@link AllPay}-Banker
-     * @deprecated Now using vault, see {@link VaultHandler#getEconomy}
-     */
-    @Deprecated
-    AllPay getBanker();
-
    /**
     * Decrements the number of plugins that have specifically hooked into core.
     */
@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.api;

 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

@@ -131,14 +130,6 @@ public interface MVDestination {
     */
    String getRequiredPermission();

-    /**
-     * Checks whether the given permissible has the permission to go to this destination.
-     *
-     * @param permissible Whoever we need to check permissions for.
-     * @return True if they are allowed to go to this destination based on permissions.
-     */
-    boolean hasRequiredPermission(Permissible permissible);
-
    /**
     * Should the Multiverse SafeTeleporter be used?
     * <p>
@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.api;

 import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
 import com.onarandombox.MultiverseCore.utils.SimpleWorldPurger;
-
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldType;
@@ -65,16 +64,30 @@ public interface MVWorldManager {
     *
     * @param oldName            Name of world to be copied
     * @param newName            Name of world to be created
-     * @param generator          The Custom generator plugin to use.
+     * @param generator          The Custom generator plugin to use. Ignored.
     * @return True if the world is copied successfully, false if not.
+     * @deprecated Use {@link #cloneWorld(String, String)} instead.
     */
+    @Deprecated
    boolean cloneWorld(String oldName, String newName, String generator);

    /**
-     * Remove the world from the Multiverse list, from the
-     * config and deletes the folder.
+     * Make a copy of a world.
     *
-     * @param name The name of the world to remove
+     * @param oldName
+     *            Name of world to be copied
+     * @param newName
+     *            Name of world to be created
+     * @return True if the world is copied successfully, false if not.
+     */
+    boolean cloneWorld(String oldName, String newName);
+
+    /**
+     * Remove the world from the Multiverse list, from the config and deletes
+     * the folder.
+     *
+     * @param name
+     *            The name of the world to remove
     * @return True if success, false if failure.
     */
    boolean deleteWorld(String name);
@@ -109,6 +122,15 @@ public interface MVWorldManager {
     */
    boolean unloadWorld(String name);

+    /**
+     * Unload a world from Multiverse with option to prevent calling unloadWorld in Bukkit.
+     *
+     * @param name Name of the world to unload
+     * @param unloadBukkit True if Bukkit world should be unloaded
+     * @return True if the world was unloaded, false if not.
+     */
+    boolean unloadWorld(String name, boolean unloadBukkit);
+
    /**
     * Loads the world. Only use this if the world has been
     * unloaded with {@link #unloadWorld(String)}.
@@ -177,7 +199,7 @@ public interface MVWorldManager {
    boolean isMVWorld(World world);

    /**
-     * Load the Worlds & Settings from the configuration file.
+     * Load the Worlds &amp; Settings from the configuration file.
     *
     * @param forceLoad If set to true, this will perform a total
     *                  reset and not just load new worlds.
@@ -185,7 +207,7 @@ public interface MVWorldManager {
    void loadWorlds(boolean forceLoad);

    /**
-     * Loads the Worlds & Settings for any worlds that bukkit loaded before us.
+     * Loads the Worlds &amp; Settings for any worlds that bukkit loaded before us.
     * <p>
     * This way people will _always_ have some worlds in the list.
     */
@@ -278,4 +300,18 @@ public interface MVWorldManager {
     * @return True if success, false if fail.
     */
    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);
+
+    boolean isKeepingSpawnInMemory(World world);
+    
+    /**
+     * Checks whether Multiverse knows about a provided unloaded world. This
+     * method will check the parameter against the alias mappings.
+     *
+     * @param name The name of the unloaded world
+     * @param includeLoaded The value to return if the world is loaded
+     *
+     * @return True if the world exists and is unloaded. False if the world
+     * does not exist. {@code includeLoaded} if the world exists and is loaded.
+     */
+    boolean hasUnloadedWorld(String name, boolean includeLoaded);
 }
@@ -121,6 +121,18 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     * @return prefixChat.
     */
    boolean getPrefixChat();
+    
+    /**
+     * Sets prefixChatFormat.
+     * @param prefixChatFormat The new value.
+     */
+    void setPrefixChatFormat(String prefixChatFormat);
+
+    /**
+     * Gets prefixChatFormat.
+     * @return prefixChatFormat.
+     */
+    String getPrefixChatFormat();

    /**
     * Sets enforceAccess.
@@ -187,4 +199,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);
 }
@@ -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}.
     *
@@ -245,18 +216,14 @@ public interface MultiverseWorld {
     * Gets the permission required to enter this world.
     *
     * @return The permission required to be exempt from charges to/from this world.
-     * @deprecated Now using {@link com.onarandombox.MultiverseCore.utils.Permissions#ACCESS}.
     */
-    @Deprecated
    Permission getAccessPermission();

    /**
     * Gets the permission required to be exempt when entering.
     *
     * @return The permission required to be exempt when entering.
-     * @deprecated Now using {@link com.onarandombox.MultiverseCore.utils.Permissions#COST_EXEMPT}.
     */
-    @Deprecated
    Permission getExemptPermission();
    // end of permission stuff

@@ -508,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.
@@ -9,7 +9,7 @@ import com.onarandombox.MultiverseCore.enums.TeleportResult;
 /**
 * Used to safely teleport people.
 */
-public interface SafeTTeleporter {
+public interface SafeTTeleporter extends Teleporter {

    /**
     * Gets the next safe location around the given location.
@@ -0,0 +1,10 @@
+package com.onarandombox.MultiverseCore.api;
+
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public interface Teleporter {
+    TeleportResult teleport(CommandSender teleporter, Player teleportee, MVDestination destination);
+}
@@ -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}.
     */
@@ -7,15 +7,14 @@

 package com.onarandombox.MultiverseCore.commands;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.pneumaticraft.commandhandler.CommandHandler;
+import java.util.List;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

-import java.util.ArrayList;
-import java.util.List;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;

 /**
 * Creates a clone of a world.
@@ -34,27 +33,23 @@ public class CloneCommand extends MultiverseCommand {
        this.addKey("mv clone");
        this.addCommandExample("/mv clone " + ChatColor.GOLD + "world" + ChatColor.GREEN + " world_backup");
        this.addCommandExample("/mv clone " + ChatColor.GOLD + "skyblock_pristine" + ChatColor.GREEN + " skyblock");
-        this.addCommandExample("To clone a world that uses a generator:");
-        this.addCommandExample("/mv clone " + ChatColor.GOLD + "CleanRoom"
-                + ChatColor.GREEN + " CleanRoomCopy" + ChatColor.DARK_AQUA + " -g CleanRoomGenerator");
        this.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        Class<?>[] paramTypes = {String.class, String.class, String.class};
-        List<Object> objectArgs = new ArrayList<Object>();
-        objectArgs.add(args.get(0));
-        objectArgs.add(args.get(1));
-        objectArgs.add(CommandHandler.getFlag("-g", args));
-        if (!this.worldManager.isMVWorld(args.get(0))) {
+        String oldName = args.get(0);
+	    if (!this.worldManager.hasUnloadedWorld(oldName, true)) {
            // If no world was found, we can't clone.
-            sender.sendMessage("Sorry, Multiverse doesn't know about world " + args.get(0) + ", so we can't clone it!");
+            sender.sendMessage("Sorry, Multiverse doesn't know about world " + oldName + ", so we can't clone it!");
            sender.sendMessage("Check the " + ChatColor.GREEN + "/mv list" + ChatColor.WHITE + " command to verify it is listed.");
            return;
        }
-        this.plugin.getCommandHandler().queueCommand(sender, "mvclone", "cloneWorld", objectArgs,
-                paramTypes, ChatColor.GREEN + "World Cloned!", ChatColor.RED + "World could NOT be cloned!");
+        if (this.plugin.getMVWorldManager().cloneWorld(oldName, args.get(1))) {
+            sender.sendMessage(ChatColor.GREEN + "World cloned!");
+        } else {
+            sender.sendMessage(ChatColor.RED + "World could NOT be cloned!");
+        }
    }
 }
@@ -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.");
        }
@@ -27,15 +27,19 @@ public class DeleteCommand extends MultiverseCommand {
        this.setArgRange(1, 1);
        this.addKey("mvdelete");
        this.addKey("mv delete");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "MyWorld");
+        this.addCommandExample("/mv delete " + ChatColor.GOLD + "MyWorld");
        this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = args.get(0);
+
        Class<?>[] paramTypes = {String.class};
        List<Object> objectArgs = new ArrayList<Object>(args);
-        this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
-                paramTypes, ChatColor.GREEN + "World Deleted!", ChatColor.RED + "World could NOT be deleted!");
+        this.plugin.getCommandHandler()
+                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
+                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
+                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
    }
 }
@@ -71,12 +71,14 @@ public class EnvironmentCommand extends MultiverseCommand {
     */
    public static WorldType getWorldTypeFromString(String type) {
        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (type.equalsIgnoreCase("normal"))
+        if (type.equalsIgnoreCase("normal")) {
            type = "NORMAL";
-        if (type.equalsIgnoreCase("flat"))
+        } else if (type.equalsIgnoreCase("flat")) {
            type = "FLAT";
-        if (type.equalsIgnoreCase("largebiomes")) {
+        } else if (type.equalsIgnoreCase("largebiomes")) {
            type = "LARGE_BIOMES";
+        } else if (type.equalsIgnoreCase("amplified")) {
+            type = "AMPLIFIED";
        }
        try {
            // Now that we've converted a potentially unfriendly value
@@ -62,6 +62,11 @@ public class GameruleCommand extends MultiverseCommand {
            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)) {
@@ -57,7 +57,7 @@ public class ImportCommand extends MultiverseCommand {
            File[] files = worldFolder.listFiles(new FilenameFilter() {
                @Override
                public boolean accept(File file, String name) {
-                    return name.equalsIgnoreCase("level.dat");
+                    return name.toLowerCase().endsWith(".dat");
                }
            });
            if (files != null && files.length > 0) {
@@ -95,10 +95,15 @@ public class ImportCommand extends MultiverseCommand {
        }
        return worldList;
    }
+    
+    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();
@@ -112,7 +117,7 @@ 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;
        }
@@ -142,21 +147,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.getPotentialWorlds();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
+        } else if (!checkIfIsWorld(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!");
        }
    }
 }
@@ -125,13 +125,13 @@ public class InfoCommand extends MultiverseCommand {
        message.add(new FancyMessage("World Scale: ", String.valueOf(world.getScaling()), colors));
        message.add(new FancyMessage("World Seed: ", String.valueOf(world.getSeed()), colors));
        if (world.getPrice() > 0) {
-            final String formattedAmount;
-            if (world.getCurrency() <= 0 && plugin.getVaultHandler().getEconomy() != null) {
-                formattedAmount = plugin.getVaultHandler().getEconomy().format(world.getPrice());
-            } else {
-                formattedAmount = this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency());
-            }
-            message.add(new FancyMessage("Price to enter this world: ", formattedAmount, colors));
+            message.add(new FancyMessage("Price to enter this world: ",
+                    plugin.getEconomist().formatPrice(world.getPrice(), world.getCurrency()),
+                    colors));
+        } else if (world.getPrice() < 0) {
+            message.add(new FancyMessage("Reward for entering this world: ",
+                    plugin.getEconomist().formatPrice(-world.getPrice(), world.getCurrency()),
+                    colors));
        } else {
            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
        }
@@ -181,8 +181,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 {
@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
 import org.bukkit.command.CommandSender;
@@ -66,7 +65,7 @@ public class ListCommand extends PaginatedCoreCommand<String> {
            }
        }
        for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
-            if (p == null || Permissions.ACCESS.hasPermission(p, name)) {
+            if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + name, true)) {
                worldList.add(ChatColor.GRAY + name + " - UNLOADED");
            }
        }
@@ -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;
        }

@@ -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
@@ -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
@@ -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,7 +28,7 @@ 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("mvss");
        this.addKey("mv set spawn");
@@ -37,43 +38,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).");
        }
    }
 }
@@ -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);
-    }
-}
-*/
@@ -8,7 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
@@ -156,7 +158,9 @@ public class TeleportCommand extends MultiverseCommand {
            this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
            return;
        }
-        TeleportResult result = this.playerTeleporter.safelyTeleport(teleporter, teleportee, d);
+        Teleporter teleportObject = (d instanceof CustomTeleporterDestination) ?
+                ((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()
                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
@@ -170,7 +174,7 @@ public class TeleportCommand extends MultiverseCommand {
            if (!teleportee.equals(teleporter)) {
                player = teleportee.getName();
            }
-            String message = String.format("%sMultiverse %sdid not teleport %s%s%sto %s%s%sbecause it was unsafe.",
+            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);
@@ -16,12 +16,20 @@ 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.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 org.bukkit.util.StringUtil;

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

 /**
 * Dumps version info to the console.
@@ -32,8 +40,8 @@ public class VersionCommand extends MultiverseCommand {
    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 + "-[bh] [--include-plugin-list]");
+        this.setArgRange(0, 2);
        this.addKey("mv version");
        this.addKey("mvv");
        this.addKey("mvversion");
@@ -41,6 +49,98 @@ public class VersionCommand extends MultiverseCommand {
                "Dumps version info to the console, optionally to pastie.org with -p or pastebin.com with a -b.", PermissionDefault.TRUE);
    }

+    private String getLegacyString() {
+        StringBuilder legacyFile = new StringBuilder();
+        legacyFile.append("[Multiverse-Core] Multiverse-Core Version: ").append(this.plugin.getDescription().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Bukkit Version: ").append(this.plugin.getServer().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds()).append('\n');
+        legacyFile.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
+        legacyFile.append("[Multiverse-Core] Economy being used: ").append(plugin.getEconomist().getEconomyName()).append('\n');
+        legacyFile.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
+        legacyFile.append("[Multiverse-Core] Dumping Config Values: (version ")
+                .append(this.plugin.getMVConfig().getVersion()).append(")").append('\n');
+        legacyFile.append("[Multiverse-Core]  messagecooldown: ").append(plugin.getMessaging().getCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportcooldown: ").append(plugin.getMVConfig().getTeleportCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefix: ").append(plugin.getMVConfig().getPrefixChat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefixFormat: ").append(plugin.getMVConfig().getPrefixChatFormat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  enforceaccess: ").append(plugin.getMVConfig().getEnforceAccess()).append('\n');
+        legacyFile.append("[Multiverse-Core]  displaypermerrors: ").append(plugin.getMVConfig().getDisplayPermErrors()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportintercept: ").append(plugin.getMVConfig().getTeleportIntercept()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnoverride: ").append(plugin.getMVConfig().getFirstSpawnOverride()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnworld: ").append(plugin.getMVConfig().getFirstSpawnWorld()).append('\n');
+        legacyFile.append("[Multiverse-Core]  debug: ").append(plugin.getMVConfig().getGlobalDebug()).append('\n');
+        legacyFile.append("[Multiverse-Core] Special Code: FRN002").append('\n');
+        return legacyFile.toString();
+    }
+
+    private String getMarkdownString() {
+        StringBuilder markdownString = new StringBuilder();
+        markdownString.append("# Multiverse-Core\n");
+        markdownString.append("## Overview\n");
+        markdownString.append("| Name | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| Multiverse-Core Version | `").append(this.plugin.getDescription().getVersion()).append("` |\n");
+        markdownString.append("| Bukkit Version | `").append(this.plugin.getServer().getVersion()).append("` |\n");
+        //markdownString.append("| Loaded Worlds | `").append(this.plugin.getMVWorldManager().getMVWorlds()).append("` |\n");
+        markdownString.append("| Multiverse Plugins Loaded | `").append(this.plugin.getPluginCount()).append("` |\n");
+        markdownString.append("| Economy being used | `").append(plugin.getEconomist().getEconomyName()).append("` |\n");
+        markdownString.append("| Permissions Plugin | `").append(this.plugin.getMVPerms().getType()).append("` |\n");
+        markdownString.append("## Parsed Config\n");
+        markdownString.append("These are what Multiverse thought the in-memory values of the config were.\n\n");
+        markdownString.append("| Config Key  | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| version | `").append(this.plugin.getMVConfig().getVersion()).append("` |\n");
+        markdownString.append("| messagecooldown | `").append(plugin.getMessaging().getCooldown()).append("` |\n");
+        markdownString.append("| teleportcooldown | `").append(plugin.getMVConfig().getTeleportCooldown()).append("` |\n");
+        markdownString.append("| worldnameprefix | `").append(plugin.getMVConfig().getPrefixChat()).append("` |\n");
+        markdownString.append("| worldnameprefixFormat | `").append(plugin.getMVConfig().getPrefixChatFormat()).append("` |\n");
+        markdownString.append("| enforceaccess | `").append(plugin.getMVConfig().getEnforceAccess()).append("` |\n");
+        markdownString.append("| displaypermerrors | `").append(plugin.getMVConfig().getDisplayPermErrors()).append("` |\n");
+        markdownString.append("| teleportintercept | `").append(plugin.getMVConfig().getTeleportIntercept()).append("` |\n");
+        markdownString.append("| firstspawnoverride | `").append(plugin.getMVConfig().getFirstSpawnOverride()).append("` |\n");
+        markdownString.append("| firstspawnworld | `").append(plugin.getMVConfig().getFirstSpawnWorld()).append("` |\n");
+        markdownString.append("| debug | `").append(plugin.getMVConfig().getGlobalDebug()).append("` |\n");
+        return markdownString.toString();
+    }
+
+    private String readFile(final String filename) {
+        String result;
+        try {
+            FileReader reader = new FileReader(filename);
+            BufferedReader bufferedReader = new BufferedReader(reader);
+            String line;
+            result = "";
+            while ((line = bufferedReader.readLine()) != null) {
+                result += line + '\n';
+            }
+        } catch (FileNotFoundException e) {
+            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = 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 = String.format("ERROR: Could not load: %s", filename);
+        }
+        return result;
+    }
+
+    private Map<String, String> getVersionFiles() {
+        Map<String, String> files = new HashMap<String, String>();
+
+        // Add the legacy file, but as markdown so it's readable
+        files.put("version.md", this.getMarkdownString());
+
+        // Add the config.yml
+        File configFile = new File(this.plugin.getDataFolder(), "config.yml");
+        files.put(configFile.getName(), this.readFile(configFile.getAbsolutePath()));
+
+        // Add the config.yml
+        File worldConfig = new File(this.plugin.getDataFolder(), "worlds.yml");
+        files.put(worldConfig.getName(), this.readFile(worldConfig.getAbsolutePath()));
+        return files;
+    }
+
    @Override
    public void runCommand(final CommandSender sender, final List<String> args) {
        // Check if the command was sent from a Player.
@@ -48,76 +148,80 @@ 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');
-        final boolean usingVault = plugin.getVaultHandler().getEconomy() != null;
-        buffer.append("[Multiverse-Core] Using Vault: ").append(usingVault).append('\n');
-        if (usingVault) {
-            buffer.append("[Multiverse-Core] Economy being used: ").append(plugin.getVaultHandler().getEconomy().getName()).append('\n');
-        } else {
-            buffer.append("[Multiverse-Core] Economy being used: ").append(this.plugin.getBank().getEconUsed()).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]  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(buffer.toString());
+        MVVersionEvent versionEvent = new MVVersionEvent(this.getLegacyString(), this.getVersionFiles());
+        final Map<String, String> files = this.getVersionFiles();
        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);
+        String versionInfo = versionEvent.getVersionInfo();
+
+        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
+            versionInfo = versionInfo + "\nPlugins: " + getPluginList();
        }

-        this.plugin.getServer().getScheduler().scheduleAsyncDelayedTask(this.plugin, new Runnable() {
+        final String data = versionInfo;
+
+        // log to console
+        String[] lines = data.split("\n");
+        for (String line : lines) {
+            if (!line.isEmpty()) {
+                Logging.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, data, files);
+                    } else if (CommandHandler.hasFlag("-h", args)) {
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, 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(ps.encodeData(pasteFiles), ps.getPostURL());
+            } else {
+                result = ps.postData(ps.encodeData(pasteData), ps.getPostURL());
+            }
+            return SHORTENER.shorten(result);
        } catch (PasteFailedException e) {
            System.out.print(e);
            return "Error posting to service";
        }
    }
+
+    private String getPluginList() {
+        return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
+    }
 }
@@ -52,11 +52,11 @@ public class WhoCommand extends MultiverseCommand {
            showAll = false;
        }

-        final Player[] onlinePlayers = plugin.getServer().getOnlinePlayers();
-        final Collection<Player> visiblePlayers = new HashSet<Player>(onlinePlayers.length);
-        for (final Player player : onlinePlayers) {
-            if (p == null || p.canSee(player)) {
-                visiblePlayers.add(player);
+        final Collection onlinePlayers = plugin.getServer().getOnlinePlayers();
+        final Collection<Player> visiblePlayers = new HashSet<Player>(onlinePlayers.size());
+        for (final Object player : onlinePlayers) {
+            if (player instanceof Player && (p == null || p.canSee((Player) player))) {
+                visiblePlayers.add((Player) player);
            }
        }

@@ -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,9 @@ 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;

    public EntryFee() {
        super();
@@ -31,7 +36,7 @@ public class EntryFee extends SerializationConfig {
    @Override
    protected void setDefaults() {
        amount = 0D;
-        currency = -1;
+        currency = null;
    }

    /**
@@ -44,7 +49,8 @@ public class EntryFee extends SerializationConfig {
    /**
     * @return the currency
     */
-    public int getCurrency() {
+    @Nullable
+    public Material getCurrency() {
        return currency;
    }

@@ -60,7 +66,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());
+        }
+    }
 }
@@ -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();
-}
@@ -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();
-}
@@ -9,10 +9,8 @@ package com.onarandombox.MultiverseCore.destination;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

@@ -136,15 +134,7 @@ public class AnchorDestination implements MVDestination {
     */
    @Override
    public String getRequiredPermission() {
-        return Permissions.ACCESS.getName(this.location.getWorld().getName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hasRequiredPermission(Permissible permissible) {
-        return Permissions.ACCESS.hasPermission(permissible, this.location.getWorld().getName());
+        return "multiverse.access." + this.location.getWorld().getName();
    }

    /**
@@ -9,12 +9,13 @@ package com.onarandombox.MultiverseCore.destination;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.utils.Permissions;
+
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

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

@@ -51,9 +61,13 @@ public class BedDestination implements MVDestination {
    @Override
    public Location getLocation(Entity entity) {
        if (entity instanceof Player) {
-            this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
+            if (this.playername.isEmpty())
+                this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
+            else
+                this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(Bukkit.getOfflinePlayer(this.playername).getBedSpawnLocation());
+
            if (this.knownBedLoc == null) {
-                ((Player) entity).sendMessage("Your bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
+                ((Player) entity).sendMessage("The bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
            }
            return this.knownBedLoc;
        }
@@ -106,22 +120,11 @@ public class BedDestination implements MVDestination {
    @Override
    public String getRequiredPermission() {
        if (knownBedLoc != null) {
-            return Permissions.ACCESS.getName(knownBedLoc.getWorld().getName());
+            return "multiverse.access." + knownBedLoc.getWorld().getName();
        }
        return "";
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hasRequiredPermission(Permissible permissible) {
-        if (knownBedLoc != null) {
-            Permissions.ACCESS.hasPermission(permissible, knownBedLoc.getWorld().getName());
-        }
-        return true;
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -133,6 +136,6 @@ public class BedDestination implements MVDestination {

    @Override
    public String toString() {
-        return "b:playerbed";
+        return playername.isEmpty() ? OLD_BED_STRING : ("b:" + playername);
    }
 }
@@ -9,10 +9,8 @@ package com.onarandombox.MultiverseCore.destination;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

@@ -207,15 +205,7 @@ public class CannonDestination implements MVDestination {
     */
    @Override
    public String getRequiredPermission() {
-        return Permissions.ACCESS.getName(this.location.getWorld().getName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hasRequiredPermission(Permissible permissible) {
-        return Permissions.ACCESS.hasPermission(permissible, this.location.getWorld().getName());
+        return "multiverse.access." + this.location.getWorld().getName();
    }

    /**
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.destination;
+
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+
+public abstract class CustomTeleporterDestination implements MVDestination {
+    @Override
+    public final Location getLocation(final Entity entity) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final Vector getVelocity() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final boolean useSafeTeleporter() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public abstract String toString();
+
+    public abstract Teleporter getTeleporter();
+}
@@ -9,10 +9,8 @@ package com.onarandombox.MultiverseCore.destination;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

@@ -23,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}
@@ -90,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;
    }

    /**
@@ -136,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]);
@@ -186,11 +229,7 @@ public class ExactDestination implements MVDestination {
     * @param location The {@link Location}.
     */
    public void setDestination(Location location) {
-        if (location != null) {
-            this.location = location;
-            this.isValid = true;
-        }
-        this.isValid = false;
+        this.isValid = (this.location = location) != null;
    }

    /**
@@ -210,15 +249,7 @@ public class ExactDestination implements MVDestination {
     */
    @Override
    public String getRequiredPermission() {
-        return Permissions.ACCESS.getName(this.location.getWorld().getName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hasRequiredPermission(Permissible permissible) {
-        return Permissions.ACCESS.hasPermission(permissible, this.location.getWorld().getName());
+        return "multiverse.access." + this.location.getWorld().getName();
    }

    /**
@@ -11,10 +11,8 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

@@ -151,15 +149,9 @@ public class WorldDestination implements MVDestination {
     */
    @Override
    public String getRequiredPermission() {
-        return Permissions.ACCESS.getName(this.world.getName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hasRequiredPermission(Permissible permissible) {
-        return Permissions.ACCESS.hasPermission(permissible, this.world.getName());
+        // TODO: Potenitally replace spaces wiht tabs for friendlier yaml.
+        // this.world.getName().replace(" ","_");
+        return "multiverse.access." + this.world.getName();
    }

    /**
@@ -43,4 +43,8 @@ public enum AllowedPortalType {
    public PortalType getActualPortalType() {
        return this.type;
    }
+
+    public boolean isPortalAllowed(PortalType portalType) {
+        return this != NONE && (getActualPortalType() == portalType || this == ALL);
+    }
 }
@@ -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;
+    }
+}
@@ -3,15 +3,19 @@ package com.onarandombox.MultiverseCore.event;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

+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(String legacyVersionInfo, Map<String, String> files) {
+        this.versionInfoBuilder = new StringBuilder(legacyVersionInfo);
+        this.detailedVersionInfo = files;
    }

    private static final HandlerList HANDLERS = new HandlerList();
@@ -40,6 +44,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.
+     *
+     * The keys are filenames, the values are the contents of the files.
+     *
+     * @return The key value mapping of files and the contents of those files.
+     */
+    public Map<String, String> getDetailedVersionInfo() {
+        return 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'.
@@ -3,6 +3,8 @@ package com.onarandombox.MultiverseCore.listeners;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+
+import org.bukkit.ChatColor;
 import org.bukkit.event.Listener;

 /**
@@ -45,8 +47,13 @@ public abstract class MVChatListener implements Listener {
                return;
            }
            prefix = mvworld.getColoredWorldString();
-            String format = event.getFormat();
-            event.setFormat("[" + prefix + "]" + format);
+            String chat = event.getFormat();
+            
+            String prefixChatFormat = plugin.getMVConfig().getPrefixChatFormat();
+            prefixChatFormat = prefixChatFormat.replace("%world%", prefix).replace("%chat%", chat);
+            prefixChatFormat = ChatColor.translateAlternateColorCodes('&', prefixChatFormat);
+            
+            event.setFormat(prefixChatFormat);
        }
    }
 }
@@ -21,11 +21,15 @@ public class MVMapListener implements Listener {
        this.plugin = plugin;
    }

+    /**
+     * This method is called when a map is initialized.
+     * @param event The event that was fired.
+     */
    @EventHandler
    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();
@@ -7,13 +7,16 @@

 package com.onarandombox.MultiverseCore.listeners;

+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
-import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -30,10 +33,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;

-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
 /**
 * Multiverse's {@link Listener} for players.
 */
@@ -121,7 +120,7 @@ public class MVPlayerListener implements Listener {
        } else {
            this.plugin.log(Level.FINER, "Player joined AGAIN!");
            if (this.plugin.getMVConfig().getEnforceAccess() // check this only if we're enforcing access!
-                    && !Permissions.ACCESS.hasPermission(p, p.getWorld().getName())) {
+                    && !this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
                p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
                this.sendPlayerToDefaultWorld(p);
            }
@@ -177,8 +176,12 @@ public class MVPlayerListener implements Listener {
                + 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 (fromWorld == null || toWorld == null)
+        if (toWorld == null) {
+            this.plugin.log(Level.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.");
@@ -202,8 +205,8 @@ public class MVPlayerListener implements Listener {
            if (event.isCancelled() && teleporter != null) {
                this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                        + "' was DENIED ACCESS to '" + toWorld.getAlias()
-                        + "' because '" + teleporter.getName() + "' don't have: "
-                        + Permissions.ACCESS.getName(event.getTo().getWorld().getName()));
+                        + "' because '" + teleporter.getName()
+                        + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
                return;
            }
        } else {
@@ -217,9 +220,11 @@ 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)) {
-                    Logging.fine("Player '%s' was DENIED ACCESS to '%s' because the world is full and '%s' doesn't have: %s.%s",
-                            teleportee.getName(), toWorld.getAlias(), teleporter.getName(),
-                            Permissions.BYPASS_PLAYERLIMIT.getName(), event.getTo().getWorld().getName());
+                    this.plugin.log(Level.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());
+                    event.setCancelled(true);
                    return;
                }
            }
@@ -247,7 +252,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.
@@ -290,11 +295,9 @@ 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()
                        + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
-                        + "' because they don't have: "
-                        + Permissions.ACCESS.getName(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()
@@ -302,7 +305,15 @@ public class MVPlayerListener implements Listener {
                    + "' because enforceaccess is off.");
        }
        if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
-            event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
+            try {
+                Class.forName("org.bukkit.TravelAgent");
+                if (event.getPortalTravelAgent() != null) {
+                    event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
+                }
+            } catch (ClassNotFoundException ignore) {
+                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
+            }
+
        }
    }

@@ -337,38 +348,37 @@ public class MVPlayerListener implements Listener {
    public void handleGameModeAndFlight(final Player player, final MultiverseWorld world) {
        // We perform this task one tick later to MAKE SURE that the player actually reaches the
        // destination world, otherwise we'd be changing the player mode if they havent moved anywhere.
-        if (!this.pt.playerCanIgnoreGameModeRestriction(world, player)) {
-            this.plugin.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin,
+        this.plugin.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin,
                new Runnable() {
                    @Override
                    public void run() {
-                        // Check that the player is in the new world and they haven't been teleported elsewhere or the event cancelled.
-                        if (player.getWorld() == world.getCBWorld()) {
-                            Logging.fine("Handling gamemode for player: %s, Changing to %s", player.getName(), world.getGameMode().toString());
-                            Logging.finest("From World: %s", player.getWorld());
-                            Logging.finest("To World: %s", world);
-                            player.setGameMode(world.getGameMode());
+                        if (!MVPlayerListener.this.pt.playerCanIgnoreGameModeRestriction(world, player)) {
+                            // Check that the player is in the new world and they haven't been teleported elsewhere or the event cancelled.
+                            if (player.getWorld() == world.getCBWorld()) {
+                                Logging.fine("Handling gamemode for player: %s, Changing to %s", player.getName(), world.getGameMode().toString());
+                                Logging.finest("From World: %s", player.getWorld());
+                                Logging.finest("To World: %s", world);
+                                player.setGameMode(world.getGameMode());
+                                // Check if their flight mode should change
+                                // TODO need a override permission for this
+                                if (player.getAllowFlight() && !world.getAllowFlight() && player.getGameMode() != GameMode.CREATIVE) {
+                                    player.setAllowFlight(false);
+                                    if (player.isFlying()) {
+                                        player.setFlying(false);
+                                    }
+                                } else if (world.getAllowFlight()) {
+                                    if (player.getGameMode() == GameMode.CREATIVE) {
+                                        player.setAllowFlight(true);
+                                    }
+                                }
+                            } else {
+                                Logging.fine("The gamemode/allowfly was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'",
+                                        player.getName(), player.getWorld().getName(), world.getName());
+                            }
                        } else {
-                            Logging.fine("The gamemode was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'",
-                                    player.getName(), player.getWorld().getName(), world.getName());
+                            MVPlayerListener.this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
                        }
                    }
                }, 1L);
-        } else {
-            this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
-        }
-        // TODO need a override permission for this
-        if (player.getAllowFlight() && !world.getAllowFlight() && player.getGameMode() != GameMode.CREATIVE) {
-            if (!this.pt.playerCanIgnoreAllowFlightRestriction(world, player)) {
-                player.setAllowFlight(false);
-                if (player.isFlying()) {
-                    player.setFlying(false);
-                }
-            }
-        } else if (world.getAllowFlight()) {
-            if (player.getGameMode() == GameMode.CREATIVE) {
-                player.setAllowFlight(true);
-            }
-        }
    }
 }
@@ -1,63 +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.listeners;
-
-import com.fernferret.allpay.AllPay;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
-
-import java.util.Arrays;
-
-/**
- * Multiverse's Plugin {@link Listener}.
- */
-public class MVPluginListener implements Listener {
-
-    private MultiverseCore plugin;
-
-    public MVPluginListener(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Keep an eye out for Plugins which we can utilize.
-     * @param event The event.
-     */
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void pluginEnable(PluginEnableEvent event) {
-        if (plugin.getVaultHandler().getEconomy() != null) {
-            // Don't hook 2 economy plugins.
-            return;
-        }
-        // Let AllPay handle all econ plugin loadings, only go for econ plugins we support
-        if (Arrays.asList(AllPay.getValidEconPlugins()).contains(event.getPlugin().getDescription().getName())) {
-            this.plugin.setBank(this.plugin.getBanker().loadEconPlugin());
-        }
-
-        /*
-        if (event.getPlugin().getDescription().getName().equals("Spout")) {
-            this.plugin.setSpout();
-            this.plugin.log(Level.INFO, "Spout integration enabled.");
-        }
-        */
-    }
-
-    /**
-     * We'll check if any of the plugins we rely on decide to Disable themselves.
-     * @param event The event.
-     */
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void pluginDisable(PluginDisableEvent event) {
-        // TODO: Disable econ when it disables.
-    }
-
-}
@@ -9,15 +9,17 @@ package com.onarandombox.MultiverseCore.listeners;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
 import org.bukkit.Material;
 import org.bukkit.PortalType;
-import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityCreatePortalEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.world.PortalCreateEvent;

+import java.util.logging.Level;
+
 /**
 * A custom listener for portal related events.
 */
@@ -39,9 +41,9 @@ public class MVPortalListener implements Listener {
        if (event.isCancelled() || event.getBlocks().size() == 0) {
            return;
        }
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getBlocks().get(0).getWorld());
+        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getEntity().getWorld());
        // We have to do it like this due to a bug in 1.1-R3
-        if (cancelPortalEvent(world, event.getPortalType())) {
+        if (world != null && !world.getAllowedPortals().isPortalAllowed(event.getPortalType())) {
            event.setCancelled(true);
        }
    }
@@ -50,36 +52,35 @@ public class MVPortalListener implements Listener {
     * This is called when a portal is created as the result of another world being linked.
     * @param event The event where a portal was formed due to a world link
     */
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
    public void portalForm(PortalCreateEvent event) {
-        if (event.isCancelled() || event.getBlocks().size() == 0) {
-            return;
-        }
-        // There's no type attribute (as of 1.1-R1), so we have to iterate.
-        for (Block b : event.getBlocks()) {
-            if (b.getType() == Material.PORTAL) {
-                MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(b.getWorld());
-                if (cancelPortalEvent(world, PortalType.NETHER)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-        // If We're here, then the Portal was an Ender type:
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getBlocks().get(0).getWorld());
-        if (cancelPortalEvent(world, PortalType.ENDER)) {
+        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.");
            event.setCancelled(true);
        }
    }

-    private static boolean cancelPortalEvent(MultiverseWorld world, PortalType type) {
-        if (world.getAllowedPortals() == AllowedPortalType.NONE) {
-            return true;
-        } else if (world.getAllowedPortals() != AllowedPortalType.ALL) {
-            if (type != world.getAllowedPortals().getActualPortalType()) {
-                return true;
-            }
+    /**
+     * This method will prevent ender portals from being created in worlds where they are not allowed due to portalForm.
+     *
+     * @param event The player interact event.
+     */
+    @EventHandler(ignoreCancelled = true)
+    public void portalForm(PlayerInteractEvent event) {
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
+        if (event.getClickedBlock().getType() != Material.END_PORTAL_FRAME) {
+            return;
+        }
+        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.");
+            event.setCancelled(true);
        }
-        return false;
    }
 }
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * 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.listeners;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.WorldInitEvent;
+
+public class MVWorldInitListener implements Listener {
+
+    MultiverseCore plugin;
+
+    public MVWorldInitListener(MultiverseCore plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void initWorld(WorldInitEvent event) {
+        if (!plugin.getMVWorldManager().isKeepingSpawnInMemory(event.getWorld())) {
+            event.getWorld().setKeepSpawnInMemory(false);
+        }
+    }
+}
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.listeners;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.World;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;
+
+/**
+ * Multiverse's World {@link Listener}.
+ */
+public class MVWorldListener implements Listener {
+    private MultiverseCore plugin;
+    private MVWorldManager worldManager;
+
+    public MVWorldListener(MultiverseCore plugin) {
+        this.plugin = plugin;
+        this.worldManager = plugin.getMVWorldManager();
+    }
+
+    /**
+     * This method is called when Bukkit fires off a WorldUnloadEvent.
+     * @param event The Event that was fired.
+     */
+    @EventHandler
+    public void unloadWorld(WorldUnloadEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+        if (event.getWorld() instanceof World) {
+            World world = (World) event.getWorld();
+            if (world != null) {
+                this.plugin.getMVWorldManager().unloadWorld(world.getName(), false);
+            }
+        }
+    }
+
+    /**
+     * This method is called when Bukkit fires off a WorldLoadEvent.
+     * @param event The Event that was fired.
+     */
+    @EventHandler
+    public void loadWorld(WorldLoadEvent event) {
+        World world = event.getWorld();
+        if (world != null) {
+            if (this.plugin.getMVWorldManager().getUnloadedWorlds().contains(world.getName())) {
+                this.plugin.getMVWorldManager().loadWorld(world.getName());
+            }
+            MultiverseWorld mvWorld = plugin.getMVWorldManager().getMVWorld(world);
+            if (mvWorld != null) {
+                // This is where we can temporarily fix those pesky property issues!
+                world.setPVP(mvWorld.isPVPEnabled());
+                world.setDifficulty(mvWorld.getDifficulty());
+            }
+        }
+    }
+}
@@ -140,8 +140,17 @@ public class AnchorManager {
            if (ancLoc == null) {
                continue;
            }
-            if (Permissions.ACCESS.hasPermission(p, 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);
@@ -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;
-    }
-
-}
@@ -0,0 +1,110 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import java.util.logging.Level;
+
+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) {
+            agent.core.log(Level.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);
+    }
+}
@@ -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;
@@ -7,14 +7,21 @@

 package com.onarandombox.MultiverseCore.utils;

+import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
+
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+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.Comparator;
+import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import com.dumptruckman.minecraft.util.Logging;

 /**
 * File-utilities.
@@ -31,16 +38,11 @@ public class FileUtils {
     * @return true if the folder was successfully deleted.
     */
    public static boolean deleteFolder(File file) {
-        if (file.exists()) {
-            boolean ret = true;
-            // If the file exists, and it has more than one file in it.
-            if (file.isDirectory()) {
-                for (File f : file.listFiles()) {
-                    ret = ret && deleteFolder(f);
-                }
-            }
-            return ret && file.delete();
-        } else {
+        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());
            return false;
        }
    }
@@ -52,22 +54,18 @@ public class FileUtils {
     * @return true if the contents were successfully deleted
     */
    public static boolean deleteFolderContents(File file) {
-        if (file.exists()) {
-            boolean ret = true;
-            // If the file exists, and it has more than one file in it.
-            if (file.isDirectory()) {
-                for (File f : file.listFiles()) {
-                    ret = ret && deleteFolder(f);
-                }
-            }
-            return ret;
-        } else {
+        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());
            return false;
        }
    }

-    private static final int COPY_BLOCK_SIZE = 1024;
-
    /**
     * Helper method to copy the world-folder.
     * @param source Source-File
@@ -77,46 +75,42 @@ public class FileUtils {
     * @return if it had success
     */
    public static boolean copyFolder(File source, File target, Logger log) {
-        InputStream in = null;
-        OutputStream out = null;
+        Path sourceDir = source.toPath();
+        Path targetDir = target.toPath();
+
        try {
-            if (source.isDirectory()) {
-
-                if (!target.exists())
-                    target.mkdir();
-
-                String[] children = source.list();
-                // for (int i=0; i<children.length; i++) {
-                for (String child : children) {
-                    copyFolder(new File(source, child), new File(target, child), log);
-                }
-            } else {
-                in = new FileInputStream(source);
-                out = new FileOutputStream(target);
-
-                byte[] buf = new byte[COPY_BLOCK_SIZE];
-                int len;
-                while ((len = in.read(buf)) > 0) {
-                    out.write(buf, 0, len);
-                }
-            }
+            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir));
            return true;
-        } catch (FileNotFoundException e) {
-            log.warning("Exception while copying file: " + e.getMessage());
        } catch (IOException e) {
-            log.warning("Exception while copying file: " + e.getMessage());
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException ignore) { }
-            }
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException ignore) { }
-            }
+            log.log(Level.WARNING, "Unable to copy directory", e);
+            return false;
+        }
+    }
+
+    private static class CopyDirFileVisitor extends SimpleFileVisitor<Path> {
+
+        private final Path sourceDir;
+        private final Path targetDir;
+
+        private CopyDirFileVisitor(Path sourceDir, Path targetDir) {
+            this.sourceDir = sourceDir;
+            this.targetDir = targetDir;
+        }
+
+        @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 {
+            Path targetFile = targetDir.resolve(sourceDir.relativize(file));
+            Files.copy(file, targetFile, COPY_ATTRIBUTES);
+            return FileVisitResult.CONTINUE;
        }
-        return false;
    }
 }
@@ -0,0 +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 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."));
+            }
+        }
+    }
+}
@@ -36,6 +36,17 @@ public class MVPermissions implements PermissionsInterface {

    }

+    /**
+     * Check if a Player can ignore GameMode restrictions for world they travel to.
+     *
+     * @param p The {@link Player} to check.
+     * @param w The {@link MultiverseWorld} the player wants to teleport to.
+     * @return True if they should bypass restrictions.
+     */
+    public boolean canIgnoreGameModeRestriction(Player p, MultiverseWorld w) {
+        return p.hasPermission("mv.bypass.gamemode." + w.getName());
+    }
+
    /**
     * Check if a Player can teleport to the Destination world from there current world.
     *
@@ -92,7 +103,7 @@ public class MVPermissions implements PermissionsInterface {
            this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
            return true;
        }
-        return Permissions.ACCESS.hasPermission(p, w.getName());
+        return this.hasPermission(p, "multiverse.access." + w.getName(), false);
    }

    private boolean canEnterLocation(Player p, Location l) {
@@ -103,7 +114,7 @@ public class MVPermissions implements PermissionsInterface {
        if (!this.plugin.getMVWorldManager().isMVWorld(worldName)) {
            return false;
        }
-        return Permissions.ACCESS.hasPermission(p, worldName);
+        return this.hasPermission(p, "multiverse.access." + worldName, false);
    }

    /**
@@ -130,7 +141,7 @@ public class MVPermissions implements PermissionsInterface {
        if (!canEnterLocation(p, d.getLocation(p))) {
            return false;
        }
-        return d.hasRequiredPermission(p);
+        return this.hasPermission(p, d.getRequiredPermission(), false);
    }

    /**
@@ -166,14 +177,14 @@ public class MVPermissions implements PermissionsInterface {
                    ChatColor.DARK_AQUA, ChatColor.WHITE));
            cango = false;
        }
-        if (!Permissions.ACCESS.hasPermission(p, worldName)) {
+        if (!this.hasPermission(p, "multiverse.access." + worldName, false)) {
            asker.sendMessage(String.format("The player (%s%s%s) does not have the required world entry permission (%s%s%s) to go to the destination (%s%s%s).",
                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
-                    ChatColor.GREEN, Permissions.ACCESS.getName(worldName), ChatColor.WHITE,
+                    ChatColor.GREEN, "multiverse.access." + worldName, ChatColor.WHITE,
                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
            cango = false;
        }
-        if (d.hasRequiredPermission(p)) {
+        if (!this.hasPermission(p, d.getRequiredPermission(), false)) {
            asker.sendMessage(String.format("The player (%s%s%s) does not have the required entry permission (%s%s%s) to go to the destination (%s%s%s).",
                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
                    ChatColor.GREEN, d.getRequiredPermission(), ChatColor.WHITE,
@@ -219,7 +230,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
@@ -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;
-
-    }
-
 }
@@ -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 : "");
+        }
+    }
+}
@@ -7,9 +7,9 @@

 package com.onarandombox.MultiverseCore.utils;

-import com.fernferret.allpay.GenericBank;
 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;
@@ -135,53 +135,52 @@ public class PermissionTools {

        // Only check payments if it's a different world:
        if (!toWorld.equals(fromWorld)) {
+            final double price = toWorld.getPrice();
            // Don't bother checking economy stuff if it doesn't even cost to enter.
-            if (toWorld.getPrice() == 0D) {
+            if (price == 0D) {
                return true;
            }
            // If the player does not have to pay, return now.
-            if (Permissions.COST_EXEMPT.hasPermission(teleporter, toWorld.getName())) {
+            if (this.plugin.getMVPerms().hasPermission(teleporter, toWorld.getExemptPermission().getName(), true)) {
                return true;
            }
-            final boolean usingVault;
-            final String formattedAmount;
-            if (toWorld.getCurrency() <= 0 && plugin.getVaultHandler().getEconomy() != null) {
-                usingVault = true;
-                formattedAmount = plugin.getVaultHandler().getEconomy().format(toWorld.getPrice());
-            } else {
-                usingVault = false;
-                formattedAmount = this.plugin.getBank().getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
-            }
-            String errString = "You need " + formattedAmount + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
-            if (teleportee.equals(teleporter)) {
-                errString = "You need " + formattedAmount + " to enter " + toWorld.getColoredWorldString();
-            }
-            if (usingVault) {
-                if (!plugin.getVaultHandler().getEconomy().has(teleporterPlayer.getName(), toWorld.getPrice())) {
-                    return false;
-                } else if (pay) {
-                    if (toWorld.getPrice() < 0D) {
-                        plugin.getVaultHandler().getEconomy().depositPlayer(teleporterPlayer.getName(), toWorld.getPrice() * -1D);
+
+            final MVEconomist economist = plugin.getEconomist();
+            final Material currency = toWorld.getCurrency();
+            final String formattedAmount = economist.formatPrice(price, currency);
+
+            if (economist.isPlayerWealthyEnough(teleporterPlayer, price, currency)) {
+                if (pay) {
+                    if (price < 0D) {
+                        economist.deposit(teleporterPlayer, -price, currency);
                    } else {
-                        plugin.getVaultHandler().getEconomy().withdrawPlayer(teleporterPlayer.getName(), toWorld.getPrice());
+                        economist.withdraw(teleporterPlayer, price, currency);
                    }
+                    sendTeleportPaymentMessage(economist, teleporterPlayer, teleportee, toWorld.getColoredWorldString(), price, currency);
                }
            } else {
-                GenericBank bank = plugin.getBank();
-                if (!bank.hasEnough(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
-                    return false;
-                } else if (pay) {
-                    if (toWorld.getPrice() < 0D) {
-                        bank.give(teleporterPlayer, toWorld.getPrice() * -1D, toWorld.getCurrency());
-                    } else {
-                        bank.take(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
-                    }
+                if (teleportee.equals(teleporter)) {
+                    teleporterPlayer.sendMessage(economist.getNSFMessage(currency,
+                            "You need " + formattedAmount + " to enter " + toWorld.getColoredWorldString()));
+                } else {
+                    teleporterPlayer.sendMessage(economist.getNSFMessage(currency,
+                            "You need " + formattedAmount + " to send " + teleportee.getName() + " to " + toWorld.getColoredWorldString()));
                }
+                return false;
            }
        }
        return true;
    }

+    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);
+        } else {
+            teleporterPlayer.sendMessage("You were " + (price > 0D ? "charged " : "given ") + economist.formatPrice(price, currency) + " for teleporting " + teleportee.getName() + " to " + toWorld);
+        }
+    }
+

    /**
     * Checks to see if player can go to a world given their current status.
@@ -275,7 +274,8 @@ public class PermissionTools {
            return true;
        }

-        if (Permissions.BYPASS_PLAYERLIMIT.hasPermission(teleportee, toWorld.getName())) {
+        MVPermissions perms = plugin.getMVPerms();
+        if (perms.hasPermission(teleportee, "mv.bypass.playerlimit." + toWorld.getName(), false)) {
            return true;
        } else {
            teleporter.sendMessage("The world " + toWorld.getColoredWorldString() + " is full");
@@ -292,24 +292,7 @@ public class PermissionTools {
     */
    public boolean playerCanIgnoreGameModeRestriction(MultiverseWorld toWorld, Player teleportee) {
        if (toWorld != null) {
-            return Permissions.BYPASS_GAMEMODE.hasPermission(teleportee, toWorld.getName());
-        } else {
-            // TODO: Determine if this value is false because a world didn't exist
-            // or if it was because a world wasn't imported.
-            return true;
-        }
-    }
-
-    /**
-     * Checks to see if a player should bypass allow flight restrictions.
-     *
-     * @param toWorld world travelling to.
-     * @param teleportee player travelling.
-     * @return True if they should bypass restrictions
-     */
-    public boolean playerCanIgnoreAllowFlightRestriction(MultiverseWorld toWorld, Player teleportee) {
-        if (toWorld != null) {
-            return Permissions.BYPASS_ALLOWFLY.hasPermission(teleportee, toWorld.getName());
+            return this.plugin.getMVPerms().canIgnoreGameModeRestriction(teleportee, toWorld);
        } else {
            // TODO: Determine if this value is false because a world didn't exist
            // or if it was because a world wasn't imported.
@@ -1,182 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import com.dumptruckman.minecraft.pluginbase.permission.BukkitPerm;
-import com.dumptruckman.minecraft.pluginbase.permission.BukkitPermFactory;
-import com.dumptruckman.minecraft.pluginbase.permission.PermDefault;
-import com.onarandombox.MultiverseCore.api.Core;
-
-public class Permissions {
-
-    // ============ Multiverse Bypass Permissions ============
-
-    private static final BukkitPerm MV = BukkitPermFactory.newBukkitPerm(Core.class, "mv.*")
-            .def(PermDefault.FALSE).build();
-
-    private static final BukkitPerm BYPASS_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "mv.bypass.*")
-            .def(PermDefault.FALSE).parent(MV).build();
-
-    private static final BukkitPerm BYPASS_GAMEMODE_ALL = BukkitPermFactory.newBukkitPerm(Core.class,
-            "mv.bypass.gamemode.*").desc("Allows a player to ignore gamemode changes for all worlds.")
-            .def(PermDefault.FALSE).parent(BYPASS_ALL).build();
-
-    private static final BukkitPerm BYPASS_PLAYERLIMIT_ALL = BukkitPermFactory.newBukkitPerm(Core.class,
-            "mv.bypass.playerlimit.*").desc("Allows a player to ignore the player limit for all worlds.")
-            .def(PermDefault.FALSE).parent(BYPASS_ALL).build();
-
-    private static final BukkitPerm BYPASS_ALLOWFLY_ALL = BukkitPermFactory.newBukkitPerm(Core.class,
-            "mv.bypass.allowfly.*").desc("Allows a player to ignore the flight restrictions for all worlds.")
-            .def(PermDefault.FALSE).parent(BYPASS_ALL).build();
-
-    /** Used for bypassing the gamemode of specific worlds. */
-    public static final BukkitPerm BYPASS_GAMEMODE = BukkitPermFactory.newBukkitPerm(Core.class,
-            "mv.bypass.gamemode").desc("Allows a player to ignore gamemode changes for a specific world.")
-            .specificOnly().def(PermDefault.FALSE).parent(BYPASS_GAMEMODE_ALL).build();
-
-    /** Used for bypassing the player limit of specific worlds. */
-    public static final BukkitPerm BYPASS_PLAYERLIMIT = BukkitPermFactory.newBukkitPerm(Core.class,
-            "mv.bypass.playerlimit").desc("Allows a player to ignore the player limit for a specific world.")
-            .specificOnly().def(PermDefault.FALSE).parent(BYPASS_PLAYERLIMIT_ALL).build();
-
-    /** Used for bypassing the allow fly setting of specific worlds. */
-    public static final BukkitPerm BYPASS_ALLOWFLY = BukkitPermFactory.newBukkitPerm(Core.class,
-            "mv.bypass.allowfly").desc("Allows a player to ignore the flight restrictions for a specific world.")
-            .specificOnly().def(PermDefault.FALSE).parent(BYPASS_ALLOWFLY_ALL).build();
-
-
-    // ============ Multiverse World Permissions ============
-
-    private static final BukkitPerm ACCESS_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "access.*")
-            .desc("Allows a player to access all worlds.")
-            .usePluginName().addToAll().build();
-
-    private static final BukkitPerm COST_EXEMPT_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "exempt.*")
-            .desc("Allows a player to bypass the costs for worlds and MV portals.")
-            .usePluginName().addToAll().build();
-
-    public static final BukkitPerm ACCESS = BukkitPermFactory.newBukkitPerm(Core.class, "access")
-            .desc("Allows a player to access a specific world.")
-            .usePluginName().specificOnly().parent(ACCESS_ALL).build();
-
-    public static final BukkitPerm COST_EXEMPT = BukkitPermFactory.newBukkitPerm(Core.class, "exempt")
-            .desc("Allows a player to bypass the costs for a specific world and MV portals in that world.")
-            .usePluginName().specificOnly().parent(COST_EXEMPT_ALL).build();
-
-
-    // ============ Multiverse Teleport Permissions ============
-
-    private static final BukkitPerm TELEPORT_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.*")
-            .desc("Allows the player to use all forms of teleportation.")
-            .usePluginName().addToAll().build();
-
-    private static final BukkitPerm TELEPORT_SELF_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.*")
-            .desc("Allows the player to use all forms of self teleportation.")
-            .usePluginName().parent(TELEPORT_ALL).build();
-
-    private static final BukkitPerm TELEPORT_OTHER_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.*")
-            .desc("Allows the player to use all forms of teleportation on other players.")
-            .usePluginName().parent(TELEPORT_ALL).build();
-
-    private static final BukkitPerm TELEPORT_SELF_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.w")
-            .desc("Allows the player to teleport self to any world.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    public static final BukkitPerm TP_SELF_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.w")
-            .desc("Allows the player to teleport self to a specific world.")
-            .usePluginName().specificOnly().parent(TELEPORT_SELF_WORLD).build();
-
-    private static final BukkitPerm TELEPORT_SELF_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.a")
-            .desc("Allows the player to teleport self to any anchor.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    public static final BukkitPerm TP_SELF_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.a")
-            .desc("Allows the player to teleport self to a specific anchor.")
-            .usePluginName().specificOnly().parent(TELEPORT_SELF_ANCHOR).build();
-
-    public static final BukkitPerm TP_SELF_EXACT = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.e")
-            .desc("Allows the player to teleport self to an exact location.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    private static final BukkitPerm TELEPORT_SELF_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.pl")
-            .desc("Allows the player to teleport self to any player.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    public static final BukkitPerm TP_SELF_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.pl")
-            .desc("Allows the player to teleport self to a specific player.")
-            .usePluginName().specificOnly().parent(TELEPORT_SELF_PLAYER).build();
-
-    public static final BukkitPerm TP_SELF_CANNON = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.ca")
-            .desc("Allows the player to teleport self to cannon.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    public static final BukkitPerm TP_SELF_BED = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.b")
-            .desc("Allows the player to teleport self to their bed.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    private static final BukkitPerm TELEPORT_SELF_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.p")
-            .desc("Allows the player to teleport self to any MV portal.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    public static final BukkitPerm TP_SELF_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.p")
-            .desc("Allows the player to teleport self to a specific MV portal.")
-            .usePluginName().specificOnly().parent(TELEPORT_SELF_PORTAL).build();
-
-    private static final BukkitPerm TELEPORT_SELF_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.ow")
-            .desc("Allows the player to teleport self to any OpenWarp destination.")
-            .usePluginName().parent(TELEPORT_SELF_ALL).build();
-
-    public static final BukkitPerm TP_SELF_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.ow")
-            .desc("Allows the player to teleport self to a specific OpenWarp destination.")
-            .usePluginName().specificOnly().parent(TELEPORT_SELF_OPENWARP).build();
-
-    private static final BukkitPerm TELEPORT_OTHER_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.w")
-            .desc("Allows the player to teleport other to any world.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    public static final BukkitPerm TP_OTHER_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.w")
-            .desc("Allows the player to teleport other to a specific world.")
-            .usePluginName().specificOnly().parent(TELEPORT_OTHER_WORLD).build();
-
-    private static final BukkitPerm TELEPORT_OTHER_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.a")
-            .desc("Allows the player to teleport other to any anchor.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    public static final BukkitPerm TP_OTHER_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.a")
-            .desc("Allows the player to teleport other to a specific anchor.")
-            .usePluginName().specificOnly().parent(TELEPORT_OTHER_ANCHOR).build();
-
-    public static final BukkitPerm TP_OTHER_EXACT = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.e")
-            .desc("Allows the player to teleport other to an exact location.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    private static final BukkitPerm TELEPORT_OTHER_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.pl")
-            .desc("Allows the player to teleport other to any player.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    public static final BukkitPerm TP_OTHER_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.pl")
-            .desc("Allows the player to teleport other to a specific player.")
-            .usePluginName().specificOnly().parent(TELEPORT_OTHER_PLAYER).build();
-
-    public static final BukkitPerm TP_OTHER_CANNON = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.ca")
-            .desc("Allows the player to teleport other to cannon.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    public static final BukkitPerm TP_OTHER_BED = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.b")
-            .desc("Allows the player to teleport other to their bed.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    private static final BukkitPerm TELEPORT_OTHER_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.p")
-            .desc("Allows the player to teleport other to any MV portal.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    public static final BukkitPerm TP_OTHER_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.p")
-            .desc("Allows the player to teleport other to a specific MV portal.")
-            .usePluginName().specificOnly().parent(TELEPORT_OTHER_PORTAL).build();
-
-    private static final BukkitPerm TELEPORT_OTHER_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.ow")
-            .desc("Allows the player to teleport other to any OpenWarp destination.")
-            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
-
-    public static final BukkitPerm TP_OTHER_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.ow")
-            .desc("Allows the player to teleport other to a specific OpenWarp destination.")
-            .usePluginName().specificOnly().parent(TELEPORT_OTHER_OPENWARP).build();
-}
@@ -27,7 +27,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 {
@@ -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;
-    }
-
-}
@@ -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;
@@ -30,7 +30,6 @@ import java.util.logging.Level;
 * The default-implementation of {@link SafeTTeleporter}.
 */
 public class SimpleSafeTTeleporter implements SafeTTeleporter {
-
    private MultiverseCore plugin;

    public SimpleSafeTTeleporter(MultiverseCore plugin) {
@@ -293,19 +292,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;
@@ -331,4 +330,8 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
        return blockB;
    }

+    @Override
+    public TeleportResult teleport(final CommandSender teleporter, final Player teleportee, final MVDestination destination) {
+        return this.safelyTeleport(teleporter, teleportee, destination);
+    }
 }
@@ -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;
@@ -35,8 +36,16 @@ public class SimpleWorldPurger implements WorldPurger {

    private MultiverseCore plugin;

+    private Class<Entity> ambientClass = null;
+
    public SimpleWorldPurger(MultiverseCore plugin) {
        this.plugin = plugin;
+        try {
+            Class entityClass = Class.forName("org.bukkit.entity.Ambient");
+            if (Entity.class.isAssignableFrom(entityClass)) {
+                ambientClass = entityClass;
+            }
+        } catch (ClassNotFoundException ignore) { }
    }

    /**
@@ -130,7 +139,8 @@ public class SimpleWorldPurger implements WorldPurger {
            boolean negateMonsters, boolean specifiedAnimals, boolean specifiedMonsters) {
        boolean negate = false;
        boolean specified = false;
-        if (e instanceof Golem || e instanceof Squid || e instanceof Animals) {
+        if (e instanceof Golem || e instanceof Squid || e instanceof Animals
+                || (ambientClass != null && ambientClass.isInstance(e))) {
            // it's an animal
            if (specifiedAnimals && !negateAnimals) {
                Logging.finest("Removing an entity because I was told to remove all animals in world %s: %s", e.getWorld().getName(), e);
@@ -139,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);
@@ -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;
-    }
-}
-*/
@@ -0,0 +1,44 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.api.Core;
+
+import java.util.concurrent.Callable;
+
+/**
+ * Wraps calls that could result in exceptions that are not Multiverse's fault.
+ */
+public class UnsafeCallWrapper {
+    private final Core core;
+
+    public UnsafeCallWrapper(Core core) {
+        this.core = core;
+    }
+
+    /**
+     * Wraps calls that could result in exceptions that are not Multiverse's fault.
+     *
+     * @param callable The potentially unsafe call.
+     * @param plugin The plugin that's probably the culprit.
+     * @param action What MV was attempting to do (error message, format string).
+     * @param formatArgs The formatting arguments for the error message.
+     *                   The exception that was thrown will be appended to these objects.
+     * @param <T> The type of the return value.
+     * @return The return value or null if the call failed.
+     */
+    public <T> T wrap(Callable<T> callable, String plugin, String action, Object... formatArgs) {
+        try {
+            // We're ready to catch you! JUMP!
+            return callable.call();
+        } catch (Throwable t) {
+            Object[] actualFormatArgs = new Object[formatArgs.length + 1];
+            System.arraycopy(formatArgs, 0, actualFormatArgs, 0, formatArgs.length);
+            actualFormatArgs[formatArgs.length] = t;
+                Logging.warning(action, actualFormatArgs);
+            Logging.warning("This is a bug in %s, NOT a bug in Multiverse!", plugin);
+            if (core.getMVConfig().getGlobalDebug() >= 1)
+                t.printStackTrace();
+            return null;
+        }
+    }
+}
@@ -1,130 +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 java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-
-/*
- * Apparently this isn't used and I don't know if we'll ever use this,
- * so I'm just going to deprecate it for now and suppress the warnings.
- *
- * BEGIN CHECKSTYLE-SUPPRESSION: ALL
- */
-
-/**
- * @deprecated Currently unused.
- */
-@Deprecated
-public class UpdateChecker {
-
-    public static final Logger log = Logger.getLogger("Minecraft");
-
-    private Timer timer = new Timer(); // Create a new Timer.
-
-    private String name; // Hold the Plugins Name.
-    private String cversion; // Hold the Plugins Current Version.
-
-    public UpdateChecker(String name, String version) {
-        this.name = name;
-        this.cversion = version;
-
-        int delay = 0; // No Delay, fire the first check instantly.
-        int period = 1800; // Delay 30 Minutes
-
-        this.timer.scheduleAtFixedRate(new TimerTask() {
-            @Override
-            public void run() {
-                checkUpdate();
-            }
-        }, delay * 1000, period * 1000);
-    }
-
-    public void checkUpdate() {
-        BufferedReader rd = null;
-        try {
-            URL url = new URL("http://bukkit.onarandombox.com/multiverse/version.php?n=" + URLEncoder.encode(this.name, "UTF-8") + "&v=" + this.cversion);
-            URLConnection conn = url.openConnection();
-            conn.setReadTimeout(2000); // 2000 = 2 Seconds.
-
-            int code = ((HttpURLConnection) conn).getResponseCode();
-
-            if (code != 200) {
-                return;
-            }
-
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line;
-            String version = null;
-
-            while ((line = rd.readLine()) != null) {
-                if (version == null) {
-                    version = line;
-                }
-            }
-
-            if (version == null) {
-                return;
-            }
-
-            String v1 = normalisedVersion(version);
-            String v2 = normalisedVersion(this.cversion);
-
-            int compare = v1.compareTo(v2);
-
-            if (compare > 0) {
-                Logging.info("[%s] - Update Available (%s)", this.name, version);
-            }
-
-            rd.close();
-        } catch (Exception e) {
-            // No need to alert the user of any error here... it's not important.
-        } finally {
-            if (rd != null) {
-                try {
-                    rd.close();
-                } catch (IOException ignore) { }
-            }
-        }
-    }
-
-    /**
-     * Convert the given Version String to a Normalized Version String so we can compare it.
-     *
-     * @param version The version string
-     * @return The normalized version string
-     */
-    public static String normalisedVersion(String version) {
-        return normalisedVersion(version, ".", 4);
-    }
-
-    public static String normalisedVersion(String version, String sep, int maxWidth) {
-        String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
-        StringBuilder sb = new StringBuilder();
-        for (String s : split) {
-            sb.append(String.format("%" + maxWidth + 's', s));
-        }
-        return sb.toString();
-    }
-
-}
-
-/*
- * END CHECKSTYLE-SUPPRESSION: ALL
- */
@@ -56,11 +56,20 @@ public class VaultHandler implements Listener {
        private void vaultDisabled(PluginDisableEvent event) {
            if (event.getPlugin() != null && event.getPlugin().getName().equals("Vault")) {
                Logging.fine("Vault economy disabled");
-                setupVaultEconomy();
+                economy = null;
            }
        }
    }

+    /**
+     * Checks whether Vault is in use and has an economy system enabled.
+     *
+     * @return true if vault is in use and has an economy system enabled.
+     */
+    public boolean hasEconomy() {
+        return economy != null;
+    }
+
    /**
     * Returns the Vault economy system if Vault is present and has an economy system enabled.
     *
@@ -10,13 +10,14 @@ package com.onarandombox.MultiverseCore.utils;
 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 com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
@@ -27,6 +28,8 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;

 import java.io.File;
@@ -40,9 +43,9 @@ 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 java.util.logging.Logger;

 /**
 * Public facing API to add/remove Multiverse worlds.
@@ -90,15 +93,35 @@ public class WorldManager implements MVWorldManager {

    /**
     * {@inheritDoc}
+     * @deprecated Use {@link #cloneWorld(String, String)} instead.
     */
    @Override
+    @Deprecated
    public boolean cloneWorld(String oldName, String newName, String generator) {
-        // Make sure we don't already know about the new world.
-        if (this.isMVWorld(newName)) {
-            return false;
+        return this.cloneWorld(oldName, newName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean cloneWorld(String oldName, String newName) {
+        // Make sure we already know about the old world and that we don't
+        // already know about the new world.
+        if (!this.worldsFromTheConfig.containsKey(oldName)) {
+            for (Map.Entry<String, WorldProperties> entry : this.worldsFromTheConfig.entrySet()) {
+                if (oldName.equals(entry.getValue().getAlias())) {
+                    oldName = entry.getKey();
+                    break;
+                }
+            }
+            if (!this.worldsFromTheConfig.containsKey(oldName)) {
+                Logging.warning("Old world '%s' does not exist", oldName);
+                return false;
+            }
        }
-        // Make sure the old world is actually a world!
-        if (this.getUnloadedWorlds().contains(oldName) || !this.isMVWorld(oldName)) {
+        if (this.isMVWorld(newName)) {
+            Logging.warning("New world '%s' already exists", newName);
            return false;
        }

@@ -107,63 +130,80 @@ public class WorldManager implements MVWorldManager {

        // Make sure the new world doesn't exist outside of multiverse.
        if (newWorldFile.exists()) {
+            Logging.warning("File for new world '%s' already exists", newName);
            return false;
        }

-        unloadWorld(oldName);
-
-        removePlayersFromWorld(oldName);
-
-        Logging.config("Copying data for world '%s'", oldName);
-        try {
-            Thread t = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    FileUtils.copyFolder(oldWorldFile, newWorldFile, Logger.getLogger("Minecraft"));
-                }
-            });
-            t.start();
-            try {
-                t.join();
-            } catch (InterruptedException e) {
-                // do nothing
+        // Load the old world... but just the metadata.
+        boolean wasJustLoaded = false;
+        boolean wasLoadSpawn = false;
+        if (this.plugin.getServer().getWorld(oldName) == null) {
+            wasJustLoaded = true;
+            WorldProperties props = this.worldsFromTheConfig.get(oldName);
+            wasLoadSpawn = props.isKeepingSpawnInMemory();
+            if (wasLoadSpawn) {
+                // No chunks please.
+                props.setKeepSpawnInMemory(false);
            }
-            File uidFile = new File(newWorldFile, "uid.dat");
-            uidFile.delete();
-        } catch (NullPointerException e) {
-            e.printStackTrace();
+            if (!this.loadWorld(oldName)) {
+                return false;
+            }
+            this.plugin.getServer().getWorld(oldName).setAutoSave(false);
+        }
+        
+        // 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();
+        
+        // Don't need the loaded world anymore.
+        if (wasJustLoaded) {
+            this.unloadWorld(oldName, true);
+            oldWorld = null;
+            if (wasLoadSpawn) {
+                this.worldsFromTheConfig.get(oldName).setKeepSpawnInMemory(true);
+            }
+        }
+
+        boolean wasAutoSave = false;
+        if (oldWorld != null && oldWorld.getCBWorld().isAutoSave()) {
+            wasAutoSave = true;
+            Logging.config("Saving world '%s'", oldName);
+            oldWorld.getCBWorld().setAutoSave(false);
+            oldWorld.getCBWorld().save();
+        }
+        Logging.config("Copying files for world '%s'", oldName);
+        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, Logging.getLogger())) {
+            Logging.warning("Failed to copy files for world '%s', see the log info", newName);
            return false;
        }
-        Logging.fine("Kind of copied stuff");
+        if (oldWorld != null && wasAutoSave) {
+            oldWorld.getCBWorld().setAutoSave(true);
+        }

-        WorldCreator worldCreator = new WorldCreator(newName);
-        Logging.fine("Started to copy settings");
-        worldCreator.copy(this.getMVWorld(oldName).getCBWorld());
-        Logging.fine("Copied lots of settings");
+        File uidFile = new File(newWorldFile, "uid.dat");
+        if (uidFile.exists() && !uidFile.delete()) {
+            Logging.warning("Failed to delete unique ID file for world '%s'", newName);
+            return false;
+        }

-        boolean useSpawnAdjust = this.getMVWorld(oldName).getAdjustSpawn();
-        Logging.fine("Copied more settings");
-
-        Environment environment = worldCreator.environment();
-        Logging.fine("Copied most settings");
        if (newWorldFile.exists()) {
-            Logging.fine("Succeeded at copying stuff");
-            if (this.addWorld(newName, environment, null, null, null, generator, useSpawnAdjust)) {
+            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 stuff");
+                Logging.fine("Succeeded at importing world");
                MVWorld newWorld = (MVWorld) this.getMVWorld(newName);
-                MVWorld oldWorld = (MVWorld) this.getMVWorld(oldName);
-                newWorld.copyValues(oldWorld);
-                try {
-                    // don't keep the alias the same -- that would be useless
-                    newWorld.setPropertyValue("alias", newName);
-                } catch (PropertyDoesNotExistException e) {
-                    // this should never happen
-                    throw new RuntimeException(e);
-                }
+                newWorld.copyValues(this.worldsFromTheConfig.get(oldName));
+                // don't keep the alias the same -- that would be useless
+                newWorld.setAlias("");
                return true;
            }
        }
+        Logging.warning("Failed to copy files for world '%s', see the log info", newName);
        return false;
    }

@@ -182,6 +222,9 @@ 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;
+        }
        Long seed = null;
        WorldCreator c = new WorldCreator(name);
        if (seedString != null && seedString.length() > 0) {
@@ -239,16 +282,21 @@ public class WorldManager implements MVWorldManager {
     * {@inheritDoc}
     */
    @Override
-    public ChunkGenerator getChunkGenerator(String generator, String generatorID, String worldName) {
+    public ChunkGenerator getChunkGenerator(String generator, final String generatorID, final String worldName) {
        if (generator == null) {
            return null;
        }

-        Plugin myPlugin = this.plugin.getServer().getPluginManager().getPlugin(generator);
+        final Plugin myPlugin = this.plugin.getServer().getPluginManager().getPlugin(generator);
        if (myPlugin == null) {
            return null;
        } else {
-            return myPlugin.getDefaultWorldGenerator(worldName, generatorID);
+            return plugin.getUnsafeCallWrapper().wrap(new Callable<ChunkGenerator>() {
+                @Override
+                public ChunkGenerator call() throws Exception {
+                    return myPlugin.getDefaultWorldGenerator(worldName, generatorID);
+                }
+            }, myPlugin.getName(), "Failed to get the default chunk generator: %s");
        }
    }

@@ -308,9 +356,21 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean unloadWorld(String name) {
+        return this.unloadWorld(name, true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean unloadWorld(String name, boolean unloadBukkit) {
        if (this.worlds.containsKey(name)) {
            this.worldsFromTheConfig.get(name).cacheVirtualProperties();
-            if (this.unloadWorldFromBukkit(name, true)) {
+            if (unloadBukkit && this.unloadWorldFromBukkit(name, true)) {
+                this.worlds.remove(name);
+                Logging.info("World '%s' was unloaded from memory.", name);
+                return true;
+            } else if (!unloadBukkit){
                this.worlds.remove(name);
                Logging.info("World '%s' was unloaded from memory.", name);
                return true;
@@ -348,9 +408,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!");
-        this.plugin.log(Level.SEVERE, "Try using Chukster to repair your world! '" + name + "'");
-        this.plugin.log(Level.SEVERE, "http://forums.bukkit.org/threads/admin-chunkster.8186/");
+        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");
+    }
+
+    private void nullWorld(String name) {
+        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because the server didn't like it!");
+        this.plugin.log(Level.SEVERE, "We don't really know why this is. Contact the developer of your server software!");
+        this.plugin.log(Level.SEVERE, "Server version info: " + Bukkit.getServer().getVersion());
    }

    private boolean doLoad(String name) {
@@ -361,17 +427,25 @@ public class WorldManager implements MVWorldManager {
        if (!worldsFromTheConfig.containsKey(name))
            throw new IllegalArgumentException("That world doesn't exist!");

-        WorldProperties world = worldsFromTheConfig.get(name);
-        WorldCreator creator = WorldCreator.name(name);
+        final WorldProperties world = worldsFromTheConfig.get(name);
+        final WorldCreator creator = WorldCreator.name(name);

        creator.environment(world.getEnvironment()).seed(world.getSeed());
        if (type != null) {
            creator.type(type);
        }
-        if ((world.getGenerator() != null) && (!world.getGenerator().equals("null")))
-            creator.generator(world.getGenerator());

-        return doLoad(creator, ignoreExists);
+        boolean generatorSuccess = true;
+        if ((world.getGenerator() != null) && (!world.getGenerator().equals("null")))
+            generatorSuccess = null != plugin.getUnsafeCallWrapper().wrap(new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
+                    creator.generator(world.getGenerator());
+                    return new Object();
+                }
+            }, "the generator plugin", "Failed to set the generator for world '%s' to '%s': %s", name, world.getGenerator());
+
+        return generatorSuccess && doLoad(creator, ignoreExists);
    }

    private boolean doLoad(WorldCreator creator, boolean ignoreExists) {
@@ -381,7 +455,7 @@ public class WorldManager implements MVWorldManager {
        if (worlds.containsKey(worldName))
            throw new IllegalArgumentException("That world is already loaded!");

-        if (!ignoreExists && !new File(this.plugin.getServer().getWorldContainer(), worldName).exists()) {
+        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!");
            return false;
@@ -396,8 +470,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;
    }
@@ -612,9 +692,29 @@ public class WorldManager implements MVWorldManager {
        // Basic Counter to count how many Worlds we are loading.
        int count = 0;
        this.ensureConfigIsPrepared();
+        this.ensureSecondNamespaceIsPrepared();

        // Force the worlds to be loaded, ie don't just load new worlds.
        if (forceLoad) {
+            // Remove all world permissions.
+            Permission allAccess = this.plugin.getServer().getPluginManager().getPermission("multiverse.access.*");
+            Permission allExempt = this.plugin.getServer().getPluginManager().getPermission("multiverse.exempt.*");
+            for (MultiverseWorld w : this.worlds.values()) {
+                // Remove this world from the master list
+                if (allAccess != null) {
+                    allAccess.getChildren().remove(w.getAccessPermission().getName());
+                }
+                if (allExempt != null) {
+                    allExempt.getChildren().remove(w.getAccessPermission().getName());
+                }
+                this.plugin.getServer().getPluginManager().removePermission(w.getAccessPermission().getName());
+                this.plugin.getServer().getPluginManager().removePermission(w.getExemptPermission().getName());
+                // Special namespace for gamemodes
+                this.plugin.getServer().getPluginManager().removePermission("mv.bypass.gamemode." + w.getName());
+            }
+            // Recalc the all permission
+            this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(allAccess);
+            this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(allExempt);
            this.worlds.clear();
        }

@@ -634,6 +734,14 @@ public class WorldManager implements MVWorldManager {
        this.saveWorldsConfig();
    }

+    private void ensureSecondNamespaceIsPrepared() {
+        Permission special = this.plugin.getServer().getPluginManager().getPermission("mv.bypass.gamemode.*");
+        if (special == null) {
+            special = new Permission("mv.bypass.gamemode.*", PermissionDefault.FALSE);
+            this.plugin.getServer().getPluginManager().addPermission(special);
+        }
+    }
+
    /**
     * {@inheritDoc}
     * @deprecated This is deprecated!
@@ -654,6 +762,11 @@ public class WorldManager implements MVWorldManager {

    private static final char SEPARATOR = '\uF8FF';

+    public boolean isKeepingSpawnInMemory(World world) {
+        WorldProperties properties = worldsFromTheConfig.get(world.getName());
+        return properties == null || properties.isKeepingSpawnInMemory();
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -785,4 +898,17 @@ public class WorldManager implements MVWorldManager {
    public FileConfiguration getConfigWorlds() {
        return this.configWorlds;
    }
+
+	@Override
+	public boolean hasUnloadedWorld(String name, boolean includeLoaded) {
+		if (getMVWorld(name) != null) {
+			return includeLoaded;
+		}
+		for (Map.Entry<String, WorldProperties> entry : this.worldsFromTheConfig.entrySet()) {
+			if (name.equals(entry.getKey()) || name.equals(entry.getValue().getAlias())) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GithubPasteService implements PasteService {
+
+    private final boolean isPrivate;
+
+    public GithubPasteService(boolean isPrivate) {
+        this.isPrivate = isPrivate;
+    }
+
+    @Override
+    public String encodeData(String data) {
+        Map<String, String> mapData = new HashMap<String, String>();
+        mapData.put("multiverse.txt", data);
+        return this.encodeData(mapData);
+    }
+
+    @Override
+    public String encodeData(Map<String, String> files) {
+        JsonObject root = new JsonObject();
+        root.add("description", new JsonPrimitive("Multiverse-Core Debug Info"));
+        root.add("public", new JsonPrimitive(!this.isPrivate));
+        JsonObject fileList = new JsonObject();
+        for (Map.Entry<String, String> entry : files.entrySet())
+        {
+            JsonObject fileObject = new JsonObject();
+            fileObject.add("content", new JsonPrimitive(entry.getValue()));
+            fileList.add(entry.getKey(), fileObject);
+        }
+        root.add("files", fileList);
+        return root.toString();
+    }
+
+    @Override
+    public URL getPostURL() {
+        try {
+            return new URL("https://api.github.com/gists");
+            //return new URL("http://jsonplaceholder.typicode.com/posts");
+        } catch (MalformedURLException e) {
+            return null; // should never hit here
+        }
+    }
+
+    @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();
+            StringBuilder responseString = new StringBuilder();
+
+            while ((line = rd.readLine()) != null) {
+                responseString.append(line);
+            }
+            return new JsonParser().parse(responseString.toString()).getAsJsonObject().get("html_url").getAsString();
+        } 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) { }
+            }
+        }
+    }
+
+    @Override
+    public boolean supportsMultiFile() {
+        return true;
+    }
+}
@@ -0,0 +1,81 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Map;
+
+/**
+ * Pastes to {@code hastebin.com}.
+ */
+public class HastebinPasteService implements PasteService {
+
+    @Override
+    public String encodeData(String data) {
+        return data;
+    }
+
+    @Override
+    public String encodeData(Map<String, String> data) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public URL getPostURL() {
+        try {
+            return new URL("https://hastebin.com/documents");
+        } catch (MalformedURLException e) {
+            return null; // should never hit here
+        }
+    }
+
+    @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());
+            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+
+            wr.write(encodedData);
+            wr.flush();
+
+            String line;
+            StringBuilder responseString = new StringBuilder();
+            while ((line = rd.readLine()) != null) {
+                responseString.append(line);
+            }
+            String key = new JsonParser().parse(responseString.toString()).getAsJsonObject().get("key").getAsString();
+
+            return "https://hastebin.com/" + key;
+        } 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) { }
+            }
+        }
+    }
+
+    @Override
+    public boolean supportsMultiFile() {
+        return false;
+    }
+}
@@ -1,6 +1,7 @@
 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
@@ -12,7 +13,7 @@ import java.net.URL;
 *
 * 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.
+ * instance is submitting; an example of this is the PastebinPasteService class.
 */
 public interface PasteService {

@@ -24,6 +25,14 @@ public interface PasteService {
     */
    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.
+     */
+    String encodeData(Map<String, String> data);
+
    /**
     * Get the URL to which this paste service sends new pastes.
     *
@@ -42,4 +51,13 @@ public interface PasteService {
     */
    String postData(String encodedData, URL url) throws PasteFailedException;

+    /**
+     * Does this service support uploading multiple files.
+     *
+     * Newer services like gist support multi-file which allows us to upload configs
+     * in addition to the standard logs.
+     *
+     * @return True if this service supports multiple file upload.
+     */
+    boolean supportsMultiFile();
 }
@@ -16,8 +16,10 @@ public class PasteServiceFactory {
        switch(type) {
            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;
        }
@@ -12,7 +12,11 @@ public enum PasteServiceType {
     */
    PASTEBIN,
    /**
-     * @see PastiePasteService
+     * @see HastebinPasteService
     */
-    PASTIE
+    HASTEBIN,
+    /**
+     * @see GithubPasteService
+     */
+    GITHUB
 }
@@ -9,6 +9,7 @@ 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}.
@@ -50,6 +51,11 @@ public class PastebinPasteService implements PasteService {
        }
    }

+    @Override
+    public String encodeData(Map<String, String> data) {
+        return null;
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -86,4 +92,9 @@ public class PastebinPasteService implements PasteService {
            }
        }
    }
+
+    @Override
+    public boolean supportsMultiFile() {
+        return false;
+    }
 }
@@ -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;
-    }
-}
@@ -1,6 +1,8 @@
 name: Multiverse-Core
 main: com.onarandombox.MultiverseCore.MultiverseCore
-authors: ['Rigby', 'fernferret', 'lithium3141', 'main--']
+authors: ['Rigby', 'fernferret', 'lithium3141', 'main--', 'dumptruckman']
+website: 'https://dev.bukkit.org/projects/multiverse-core'
+api-version: 1.13
 version: maven-version-number
 commands:
  mv:
@@ -231,4 +233,4 @@ commands:
  mvrules:
    description: Lists the gamerules.
    usage: |
-            /<command> [WORLD]
+            /<command> [WORLD]
@@ -15,10 +15,12 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

@@ -30,7 +32,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class })
+@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
+@PowerMockIgnore("javax.script.*")
 public class TestDebugMode {
    TestInstanceCreator creator;
    Server mockServer;
@@ -3,8 +3,10 @@ package com.onarandombox.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
+import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.World;
+import org.bukkit.WorldType;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
@@ -13,10 +15,12 @@ import org.bukkit.entity.Zombie;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

@@ -25,11 +29,13 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

+import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.*;

@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class })
+@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
+@PowerMockIgnore("javax.script.*")
 public class TestEntitySpawnRules {
    TestInstanceCreator creator;
    MultiverseCore core;
@@ -52,7 +58,7 @@ public class TestEntitySpawnRules {
        listener = core.getEntityListener();

        mvWorld = mock(MultiverseWorld.class);
-        cbworld = mock(World.class);
+        cbworld = MockWorldFactory.makeNewMockWorld("world", World.Environment.NORMAL, WorldType.NORMAL);
        when(mvWorld.getCBWorld()).thenReturn(cbworld);

        MVWorldManager worldman = mock(MVWorldManager.class);
@@ -0,0 +1,65 @@
+package com.onarandombox.MultiverseCore;
+
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
+import org.bukkit.Material;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
+@PowerMockIgnore("javax.script.*")
+public class TestEntryFeeConversion {
+
+    private TestInstanceCreator creator;
+    private MultiverseCore core;
+    Map<String, Object> config;
+    Map<String, Object> entryFee;
+
+    @Before
+    public void setUp() {
+        creator = new TestInstanceCreator();
+        assertTrue(creator.setUp());
+        core = creator.getCore();
+
+        config = new HashMap<>();
+        entryFee = new HashMap<>();
+        config.put("entryfee", entryFee);
+        entryFee.put("==", "MVEntryFee");
+    }
+
+    @After
+    public void tearDown() {
+        creator.tearDown();
+    }
+
+    @Test
+    public void testConvertIntegerCurrencyToMaterialCurrency() {
+        entryFee.put("currency", -1);
+        WorldProperties props = new WorldProperties(config);
+        assertNull(props.entryfee.getCurrency());
+
+        entryFee.put("currency", 1);
+        props = new WorldProperties(config);
+        assertEquals(Material.STONE, props.entryfee.getCurrency());
+
+        entryFee.put("currency", "1");
+        props = new WorldProperties(config);
+        assertEquals(Material.STONE, props.entryfee.getCurrency());
+
+        entryFee.put("currency", "stone");
+        props = new WorldProperties(config);
+        assertEquals(Material.STONE, props.entryfee.getCurrency());
+    }
+}
@@ -7,10 +7,12 @@ import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

@@ -20,7 +22,8 @@ import static org.mockito.Mockito.when;


@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class })
+@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class })
+@PowerMockIgnore("javax.script.*")
 public class TestModifyCommand {
    TestInstanceCreator creator;
    Server mockServer;
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
 import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
+import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.Bukkit;
@@ -18,7 +19,9 @@ 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.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -36,12 +39,14 @@ import org.bukkit.event.weather.WeatherChangeEvent;
 import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.internal.verification.VerificationModeFactory;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

@@ -56,7 +61,8 @@ import static org.mockito.Mockito.*;
@PrepareForTest({ PluginManager.class, MultiverseCore.class, Permission.class, Bukkit.class,
        WeatherChangeEvent.class, ThunderChangeEvent.class, AsyncPlayerChatEvent.class,
        PlayerJoinEvent.class, PlayerRespawnEvent.class, EntityRegainHealthEvent.class,
-        FoodLevelChangeEvent.class, WorldManager.class, PluginDescriptionFile.class })
+        FoodLevelChangeEvent.class, WorldManager.class, PluginDescriptionFile.class, JavaPluginLoader.class })
+@PowerMockIgnore("javax.script.*")
 public class TestWorldProperties {
    private TestInstanceCreator creator;
    private MultiverseCore core;
@@ -85,6 +91,8 @@ public class TestWorldProperties {
        assertTrue(creator.setUp());
        core = creator.getCore();
        mockCommandSender = creator.getCommandSender();
+        MockWorldFactory.createWorldDirectory("world");
+        MockWorldFactory.createWorldDirectory("world_nether");
    }

    @After
@@ -104,6 +112,12 @@ public class TestWorldProperties {
        verify(mockCommandSender).sendMessage("Starting import of world 'world'...");
        verify(mockCommandSender).sendMessage(ChatColor.GREEN + "Complete!");

+        assertEquals(core.getServer().getWorlds().size(), 1);
+        assertEquals(core.getServer().getWorlds().get(0).getName(), "world");
+        assertEquals(core.getServer().getWorlds().get(0).getEnvironment(), World.Environment.NORMAL);
+        assertEquals(core.getServer().getWorlds().get(0).getWorldType(), WorldType.NORMAL);
+
+
        // Import a second world
        String[] netherArgs = new String[] { "import", "world_nether", "nether" };
        core.onCommand(mockCommandSender, mockCommand, "", netherArgs);
@@ -111,6 +125,12 @@ public class TestWorldProperties {
        verify(mockCommandSender, VerificationModeFactory.times(2)).sendMessage(
                ChatColor.GREEN + "Complete!");

+        assertEquals(core.getServer().getWorlds().size(), 2);
+        assertEquals(core.getServer().getWorlds().get(0).getName(), "world");
+        assertEquals(core.getServer().getWorlds().get(1).getName(), "world_nether");
+        assertEquals(core.getServer().getWorlds().get(1).getEnvironment(), World.Environment.NETHER);
+        assertEquals(core.getServer().getWorlds().get(1).getWorldType(), WorldType.NORMAL);
+
        // ////////////////////////////////////////////////
        // let's set some world-properties
        // we can test the API with this, too :D
@@ -137,7 +157,7 @@ public class TestWorldProperties {
        assertEquals(Difficulty.NORMAL, mvWorld.getDifficulty());
        assertTrue(mvWorld.canAnimalsSpawn());
        assertTrue(mvWorld.canMonstersSpawn());
-        assertEquals(-1, mvWorld.getCurrency());
+        assertNull(mvWorld.getCurrency());
        assertEquals(0, mvWorld.getPrice(), 0);
        assertTrue(mvWorld.getHunger());
        assertTrue(mvWorld.getAutoHeal());
@@ -219,8 +239,8 @@ public class TestWorldProperties {
        assertEquals(false, mvWorld.canAnimalsSpawn());
        mvWorld.setAllowMonsterSpawn(false);
        assertEquals(false, mvWorld.canMonstersSpawn());
-        mvWorld.setCurrency(1);
-        assertEquals(1, mvWorld.getCurrency());
+        mvWorld.setCurrency(Material.STONE);
+        assertEquals(Material.STONE, mvWorld.getCurrency());
        mvWorld.setPrice(1D);
        assertEquals(1D, mvWorld.getPrice(), 0);
        mvWorld.setHunger(false);
@@ -318,7 +338,7 @@ public class TestWorldProperties {
        assertEquals(Difficulty.PEACEFUL, mvWorld.getDifficulty());
        assertEquals(false, mvWorld.canAnimalsSpawn());
        assertEquals(false, mvWorld.canMonstersSpawn());
-        assertEquals(1, mvWorld.getCurrency());
+        assertEquals(Material.STONE, mvWorld.getCurrency());
        assertEquals(1D, mvWorld.getPrice(), 0);
        assertEquals(false, mvWorld.getHunger());
        assertEquals(false, mvWorld.getAutoHeal());
@@ -9,10 +9,12 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Sheep;
 import org.bukkit.entity.Zombie;
 import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

@@ -22,7 +24,8 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.*;

@RunWith(PowerMockRunner.class)
-@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class })
+@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class })
+@PowerMockIgnore("javax.script.*")
 public class TestWorldPurger {
    TestInstanceCreator creator;
    MultiverseCore core;
@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore;

 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldCreatorMatcher;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
@@ -23,12 +24,15 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Matchers;
 import org.mockito.internal.verification.VerificationModeFactory;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

@@ -38,7 +42,9 @@ import static junit.framework.Assert.*;
 import static org.mockito.Mockito.*;

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

    private TestInstanceCreator creator;
@@ -94,6 +100,10 @@ public class TestWorldStuff {

    @Test
    public void testWorldImport() {
+        MockWorldFactory.createWorldDirectory("world");
+        MockWorldFactory.createWorldDirectory("world_nether");
+        MockWorldFactory.createWorldDirectory("world_the_end");
+
        // Pull a core instance from the server.
        Plugin plugin = mockServer.getPluginManager().getPlugin("Multiverse-Core");

@@ -168,7 +178,7 @@ public class TestWorldStuff {
        verify(mockCommandSender).sendMessage("Complete!");

        WorldCreatorMatcher matcher = new WorldCreatorMatcher(new WorldCreator("newworld"));
-        verify(mockServer).createWorld(Matchers.argThat(matcher));
+        verify(mockServer).createWorld(ArgumentMatchers.argThat(matcher));
    }

    @Test
@@ -231,7 +241,7 @@ public class TestWorldStuff {
        verify(mockCommandSender).sendMessage("Complete!");

        WorldCreatorMatcher matcher = new WorldCreatorMatcher(new WorldCreator("nullworld"));
-        verify(mockServer).createWorld(Matchers.argThat(matcher));
+        verify(mockServer).createWorld(ArgumentMatchers.argThat(matcher));
    }

    @Test
@@ -277,6 +287,9 @@ public class TestWorldStuff {
    }

    private void createInitialWorlds(Plugin plugin, Command command) {
+        MockWorldFactory.createWorldDirectory("world");
+        MockWorldFactory.createWorldDirectory("world_nether");
+        MockWorldFactory.createWorldDirectory("world_the_end");
        plugin.onCommand(mockCommandSender, command, "", new String[]{ "import", "world", "normal" });
        plugin.onCommand(mockCommandSender, command, "", new String[]{ "import", "world_nether", "nether" });
        plugin.onCommand(mockCommandSender, command, "", new String[]{ "import", "world_the_end", "end" });
@@ -0,0 +1,119 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import com.dumptruckman.minecraft.util.Logging;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FileUtilsTest {
+
+    private Path tempDir;
+    private Path parentDir;
+    private Path parentDirFile;
+    private Path childDir;
+    private Path childDirFile;
+
+
+    @Before
+    public void setUp() throws Exception {
+        tempDir = Files.createTempDirectory("testingTempDir");
+
+        parentDir = Files.createDirectory(tempDir.resolve("parentDir"));
+        parentDirFile = Files.createFile(parentDir.resolve("parentDirFile.txt"));
+
+        childDir = Files.createDirectory(parentDir.resolve("childDir"));
+        childDirFile = Files.createFile(childDir.resolve("childDirFile.txt"));
+
+        assertTrue(Files.isDirectory(parentDir));
+        assertTrue(Files.isRegularFile(parentDirFile));
+        assertTrue(Files.isDirectory(childDir));
+        assertTrue(Files.isRegularFile(childDirFile));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        try {
+            org.apache.commons.io.FileUtils.deleteDirectory(tempDir.toFile());
+        } catch (IOException e) {
+            if (Files.exists(tempDir)) {
+                throw e;
+            }
+        }
+    }
+
+    @Test
+    public void deleteFolder() {
+        FileUtils.deleteFolder(parentDir.toFile());
+        assertFalse(Files.isDirectory(parentDir));
+        assertFalse(Files.isRegularFile(parentDirFile));
+        assertFalse(Files.isDirectory(childDir));
+        assertFalse(Files.isRegularFile(childDirFile));
+    }
+
+    @Test
+    public void deleteFolderContents() {
+        FileUtils.deleteFolderContents(parentDir.toFile());
+        assertTrue(Files.isDirectory(parentDir));
+        assertFalse(Files.isRegularFile(parentDirFile));
+        assertFalse(Files.isDirectory(childDir));
+        assertFalse(Files.isRegularFile(childDirFile));
+    }
+
+    @Test
+    public void copyFolder() throws Exception {
+        Path targetDir = tempDir.resolve("target");
+        Path targetFile = targetDir.resolve("parentDirFile.txt");
+        Path targetChildDir = targetDir.resolve("childDir");
+        Path targetChildDirFile = targetChildDir.resolve("childDirFile.txt");
+
+        assertFalse(Files.isDirectory(targetDir));
+        assertFalse(Files.isRegularFile(targetFile));
+        assertFalse(Files.isDirectory(targetChildDir));
+        assertFalse(Files.isRegularFile(targetChildDirFile));
+
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
+
+        assertTrue(Files.isDirectory(targetDir));
+        assertTrue(Files.isRegularFile(targetFile));
+        assertTrue(Files.isDirectory(targetChildDir));
+        assertTrue(Files.isRegularFile(targetChildDirFile));
+    }
+
+    @Test
+    public void copyFolder_intoExistingFolder() throws Exception {
+        Path targetDir = Files.createDirectory(tempDir.resolve("target"));
+        Path targetFile = targetDir.resolve("parentDirFile.txt");
+        Path targetChildDir = targetDir.resolve("childDir");
+        Path targetChildDirFile = targetChildDir.resolve("childDirFile.txt");
+
+        assertTrue(Files.isDirectory(targetDir));
+        assertFalse(Files.isRegularFile(targetFile));
+        assertFalse(Files.isDirectory(targetChildDir));
+        assertFalse(Files.isRegularFile(targetChildDirFile));
+
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
+
+        assertTrue(Files.isDirectory(targetDir));
+        assertTrue(Files.isRegularFile(targetFile));
+        assertTrue(Files.isDirectory(targetChildDir));
+        assertTrue(Files.isRegularFile(targetChildDirFile));
+    }
+
+    @Test()
+    public void copyFolder_intoExistingFolder_whereFileExists() throws Exception {
+        Path targetDir = Files.createDirectory(tempDir.resolve("target"));
+        Path targetFile = Files.createFile(targetDir.resolve("parentDirFile.txt"));
+
+        assertTrue(Files.isDirectory(targetDir));
+        assertTrue(Files.isRegularFile(targetFile));
+
+        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
+    }
+}
@@ -18,18 +18,20 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;

 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.WeakHashMap;
+import java.util.LinkedHashMap;

 import static org.mockito.Mockito.*;

 public class MockWorldFactory {

-    private static final Map<String, World> createdWorlds = new HashMap<String, World>();
+    private static final Map<String, World> createdWorlds = new LinkedHashMap<String, World>();
    private static final Map<UUID, World> worldUIDS = new HashMap<UUID, World>();

    private static final Map<World, Boolean> pvpStates = new WeakHashMap<World, Boolean>();
@@ -42,7 +44,17 @@ public class MockWorldFactory {
    private static void registerWorld(World world) {
        createdWorlds.put(world.getName(), world);
        worldUIDS.put(world.getUID(), world);
-        new File(TestInstanceCreator.worldsDirectory, world.getName()).mkdir();
+        createWorldDirectory(world.getName());
+    }
+
+    public static void createWorldDirectory(String worldName) {
+        File worldFolder = new File(TestInstanceCreator.worldsDirectory, worldName);
+        worldFolder.mkdir();
+        try {
+            new File(worldFolder, "level.dat").createNewFile();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
    }

    private static World basics(String world, World.Environment env, WorldType type) {
@@ -125,7 +137,6 @@ public class MockWorldFactory {
                }

                when(mockBlock.getType()).thenReturn(blockType);
-                when(mockBlock.getTypeId()).thenReturn(blockType.getId());
                when(mockBlock.getWorld()).thenReturn(loc.getWorld());
                when(mockBlock.getX()).thenReturn(loc.getBlockX());
                when(mockBlock.getY()).thenReturn(loc.getBlockY());
@@ -169,7 +180,6 @@ public class MockWorldFactory {
                Material blockType = Material.AIR;

                when(mockBlock.getType()).thenReturn(blockType);
-                when(mockBlock.getTypeId()).thenReturn(blockType.getId());
                when(mockBlock.getWorld()).thenReturn(loc.getWorld());
                when(mockBlock.getX()).thenReturn(loc.getBlockX());
                when(mockBlock.getY()).thenReturn(loc.getBlockY());
@@ -179,6 +189,7 @@ public class MockWorldFactory {
                return mockBlock;
            }
        });
+        when(mockWorld.getUID()).thenReturn(UUID.randomUUID());
        return mockWorld;
    }

@@ -212,13 +223,7 @@ public class MockWorldFactory {
    }

    public static List<World> getWorlds() {
-        // we have to invert the order!
-        ArrayList<World> myList = new ArrayList<World>(createdWorlds.values());
-        List<World> retList = new ArrayList<World>();
-        for (int i = (myList.size() - 1); i >= 0; i--) {
-            retList.add(myList.get(i));
-        }
-        return retList;
+        return new ArrayList<World>(createdWorlds.values());
    }

    public static void clearWorlds() {
@@ -25,12 +25,15 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.powermock.api.easymock.PowerMock;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.MockGateway;
+import org.powermock.reflect.Whitebox;

 import java.io.File;
 import java.lang.reflect.Field;
@@ -40,8 +43,16 @@ import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;

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

 public class TestInstanceCreator {
    private MultiverseCore core;
@@ -55,11 +66,24 @@ public class TestInstanceCreator {
    public boolean setUp() {
        try {
            pluginDirectory.mkdirs();
-            Assert.assertTrue(pluginDirectory.exists());
+            assertTrue(pluginDirectory.exists());

            MockGateway.MOCK_STANDARD_METHODS = false;

-            core = PowerMockito.spy(new MultiverseCore());
+            // Initialize the Mock server.
+            mockServer = mock(Server.class);
+            JavaPluginLoader mockPluginLoader = PowerMock.createMock(JavaPluginLoader.class);
+            Whitebox.setInternalState(mockPluginLoader, "server", mockServer);
+            when(mockServer.getName()).thenReturn("TestBukkit");
+            Logger.getLogger("Minecraft").setParent(Util.logger);
+            when(mockServer.getLogger()).thenReturn(Util.logger);
+            when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);
+
+            // Return a fake PDF file.
+            PluginDescriptionFile pdf = PowerMockito.spy(new PluginDescriptionFile("Multiverse-Core", "2.2-Test",
+                    "com.onarandombox.MultiverseCore.MultiverseCore"));
+            when(pdf.getAuthors()).thenReturn(new ArrayList<String>());
+            core = PowerMockito.spy(new MultiverseCore(mockPluginLoader, pdf, pluginDirectory, new File(pluginDirectory, "testPluginFile")));
            PowerMockito.doAnswer(new Answer<Void>() {
                @Override
                public Void answer(InvocationOnMock invocation) throws Throwable {
@@ -70,12 +94,8 @@ public class TestInstanceCreator {
            // Let's let all MV files go to bin/test
            doReturn(pluginDirectory).when(core).getDataFolder();

-            // Return a fake PDF file.
-            PluginDescriptionFile pdf = PowerMockito.spy(new PluginDescriptionFile("Multiverse-Core", "2.2-Test",
-                    "com.onarandombox.MultiverseCore.MultiverseCore"));
-            when(pdf.getAuthors()).thenReturn(new ArrayList<String>());
-            doReturn(pdf).when(core).getDescription();
            doReturn(true).when(core).isEnabled();
+            doReturn(Util.logger).when(core).getLogger();
            core.setServerFolder(serverDirectory);

            // Add Core to the list of loaded plugins
@@ -100,13 +120,6 @@ public class TestInstanceCreator {
            Util.log("Creating world-folder: " + worldSkylandsFile.getAbsolutePath());
            worldSkylandsFile.mkdirs();

-            // Initialize the Mock server.
-            mockServer = mock(Server.class);
-            when(mockServer.getName()).thenReturn("TestBukkit");
-            Logger.getLogger("Minecraft").setParent(Util.logger);
-            when(mockServer.getLogger()).thenReturn(Util.logger);
-            when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);
-
            // Give the server some worlds
            when(mockServer.getWorld(anyString())).thenAnswer(new Answer<World>() {
                @Override
@@ -143,7 +156,7 @@ public class TestInstanceCreator {

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

-            when(mockServer.createWorld(Matchers.isA(WorldCreator.class))).thenAnswer(
+            when(mockServer.createWorld(ArgumentMatchers.isA(WorldCreator.class))).thenAnswer(
                    new Answer<World>() {
                        @Override
                        public World answer(InvocationOnMock invocation) throws Throwable {
@@ -243,9 +256,9 @@ public class TestInstanceCreator {
            when(commandSender.getServer()).thenReturn(mockServer);
            when(commandSender.getName()).thenReturn("MockCommandSender");
            when(commandSender.isPermissionSet(anyString())).thenReturn(true);
-            when(commandSender.isPermissionSet(Matchers.isA(Permission.class))).thenReturn(true);
+            when(commandSender.isPermissionSet(ArgumentMatchers.isA(Permission.class))).thenReturn(true);
            when(commandSender.hasPermission(anyString())).thenReturn(true);
-            when(commandSender.hasPermission(Matchers.isA(Permission.class))).thenReturn(true);
+            when(commandSender.hasPermission(ArgumentMatchers.isA(Permission.class))).thenReturn(true);
            when(commandSender.addAttachment(core)).thenReturn(null);
            when(commandSender.isOp()).thenReturn(true);

@@ -10,7 +10,7 @@ package com.onarandombox.MultiverseCore.utils;
 import org.bukkit.WorldCreator;
 import org.mockito.ArgumentMatcher;

-public class WorldCreatorMatcher extends ArgumentMatcher<WorldCreator> {
+public class WorldCreatorMatcher implements ArgumentMatcher<WorldCreator> {
    private WorldCreator worldCreator;
    private boolean careAboutSeeds = false;
    private boolean careAboutGenerators = false;
@@ -28,23 +28,23 @@ public class WorldCreatorMatcher extends ArgumentMatcher<WorldCreator> {
        this.careAboutGenerators = doICare;
    }

-    public boolean matches(Object creator) {
+    public boolean matches(WorldCreator creator) {
        Util.log("Checking world creators.");
        if (creator == null) {
            Util.log("The given creator was null, but I was checking: " + this.worldCreator.name());
            return false;
        }
-        Util.log("Checking Names...(" + ((WorldCreator) creator).name() + ") vs (" + this.worldCreator.name() + ")");
-        Util.log("Checking Envs...(" + ((WorldCreator) creator).environment() + ") vs (" + this.worldCreator.environment() + ")");
-        if (!((WorldCreator) creator).name().equals(this.worldCreator.name())) {
+        Util.log("Checking Names...(" + creator.name() + ") vs (" + this.worldCreator.name() + ")");
+        Util.log("Checking Envs...(" + creator.environment() + ") vs (" + this.worldCreator.environment() + ")");
+        if (!creator.name().equals(this.worldCreator.name())) {
            return false;
-        } else if (!((WorldCreator) creator).environment().equals(this.worldCreator.environment())) {
+        } else if (!creator.environment().equals(this.worldCreator.environment())) {
            Util.log("Checking Environments...");
            return false;
-        } else if (careAboutSeeds && ((WorldCreator) creator).seed() != this.worldCreator.seed()) {
+        } else if (careAboutSeeds && creator.seed() != this.worldCreator.seed()) {
            Util.log("Checking Seeds...");
            return false;
-        } else if (careAboutGenerators && !((WorldCreator) creator).generator().equals(this.worldCreator.generator())) {
+        } else if (careAboutGenerators && !creator.generator().equals(this.worldCreator.generator())) {
            Util.log("Checking Gens...");
            return false;
        }