Version 4.1.1-1.8.8-SNAPSHOT!

Bumped version to 4.1.1-SNAPSHOT for continued development.
(cherry picked from commit 1ba693ffd5)
2019-08-25 00:14:43 -04:00 · 2019-08-25 00:09:58 -04:00 · 2019-08-25 00:09:09 -04:00 · 2019-08-25 00:09:03 -04:00 · 2019-08-25 00:08:55 -04:00 · 2019-08-25 00:08:45 -04:00
111 changed files with 5815 additions and 3066 deletions
@@ -12,6 +12,7 @@

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

 # vim
 .*.sw[a-p]
@@ -0,0 +1,7 @@
+language: java
+jdk:
+  - oraclejdk8
+notifications:
+  email: false
+before_install:
+  - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
@@ -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.
+ 
@@ -0,0 +1,3 @@
+machine:
+  java:
+    version: oraclejdk8
@@ -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.4</version>
+    <version>4.1.1-1.8.8-SNAPSHOT</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
@@ -12,13 +12,31 @@
    </properties>

    <repositories>
+      <!-- Spigot -->
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
        <repository>
            <id>onarandombox</id>
            <url>http://repo.onarandombox.com/content/groups/public</url>
        </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>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository>
+        <repository>
+            <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>

@@ -61,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>
@@ -93,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>
@@ -101,16 +119,10 @@
                    </archive>
                </configuration>
            </plugin>
-            <!-- Maven Source Plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
-            </plugin>
            <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>
@@ -123,23 +135,53 @@
                    <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>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <executions>
+                    <execution>
+                        <id>javadoc-jar</id>
+                        <phase>verify</phase>
+                        <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>
@@ -147,119 +189,175 @@
                            <goal>shade</goal>
                        </goals>
                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>me.main__.util:SerializationConfig</include>
-                                    <include>com.fernferret.allpay:AllPay</include>
-                                    <include>com.pneumaticraft.commandhandler:CommandHandler</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>com.onarandombox.buscript</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.mcstats</pattern>
+                                    <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.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.2.5-R1.0</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.8.8-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.6</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <version>1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <!-- End of SerializationConfig Dependency -->
-        <!-- Start of AllPay Dependency -->
+        <!-- Start of Economy Dependency -->
        <dependency>
-            <groupId>com.fernferret.allpay</groupId>
-            <artifactId>AllPay</artifactId>
-            <version>10</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.5</version>
+            <scope>provided</scope>
        </dependency>
-        <!-- End of AllPay 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 -->
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>buscript</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mcstats.bukkit</groupId>
+            <artifactId>metrics</artifactId>
+            <version>R6</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>Logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>de.themoep.idconverter</groupId>
+            <artifactId>mappings</artifactId>
+            <version>1.2-SNAPSHOT</version>
+        </dependency>
+
        <!-- Start of Test Dependencies -->
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.12</version>
+            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.powermock</groupId>
            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.4.9</version>
+            <version>2.0.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>
@@ -7,8 +7,26 @@

 package com.onarandombox.MultiverseCore;

-import com.fernferret.allpay.AllPay;
-import com.fernferret.allpay.GenericBank;
+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.util.Logging;
+import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.LocationManipulation;
@@ -18,7 +36,41 @@ import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.commands.*;
+import com.onarandombox.MultiverseCore.commands.AnchorCommand;
+import com.onarandombox.MultiverseCore.commands.CheckCommand;
+import com.onarandombox.MultiverseCore.commands.CloneCommand;
+import com.onarandombox.MultiverseCore.commands.ConfigCommand;
+import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
+import com.onarandombox.MultiverseCore.commands.CoordCommand;
+import com.onarandombox.MultiverseCore.commands.CreateCommand;
+import com.onarandombox.MultiverseCore.commands.DebugCommand;
+import com.onarandombox.MultiverseCore.commands.DeleteCommand;
+import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
+import com.onarandombox.MultiverseCore.commands.GameruleCommand;
+import com.onarandombox.MultiverseCore.commands.GamerulesCommand;
+import com.onarandombox.MultiverseCore.commands.GeneratorCommand;
+import com.onarandombox.MultiverseCore.commands.HelpCommand;
+import com.onarandombox.MultiverseCore.commands.ImportCommand;
+import com.onarandombox.MultiverseCore.commands.InfoCommand;
+import com.onarandombox.MultiverseCore.commands.ListCommand;
+import com.onarandombox.MultiverseCore.commands.LoadCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyAddCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyClearCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyCommand;
+import com.onarandombox.MultiverseCore.commands.ModifyRemoveCommand;
+import com.onarandombox.MultiverseCore.commands.ModifySetCommand;
+import com.onarandombox.MultiverseCore.commands.PurgeCommand;
+import com.onarandombox.MultiverseCore.commands.RegenCommand;
+import com.onarandombox.MultiverseCore.commands.ReloadCommand;
+import com.onarandombox.MultiverseCore.commands.RemoveCommand;
+import com.onarandombox.MultiverseCore.commands.ScriptCommand;
+import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
+import com.onarandombox.MultiverseCore.commands.SilentCommand;
+import com.onarandombox.MultiverseCore.commands.SpawnCommand;
+import com.onarandombox.MultiverseCore.commands.TeleportCommand;
+import com.onarandombox.MultiverseCore.commands.UnloadCommand;
+import com.onarandombox.MultiverseCore.commands.VersionCommand;
+import com.onarandombox.MultiverseCore.commands.WhoCommand;
 import com.onarandombox.MultiverseCore.destination.AnchorDestination;
 import com.onarandombox.MultiverseCore.destination.BedDestination;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
@@ -26,55 +78,79 @@ 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.exceptions.PropertyDoesNotExistException;
+import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
+import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 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.MVWeatherListener;
 import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
-import com.onarandombox.MultiverseCore.utils.*;
+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;
-
+import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.SerializationConfig;
-
 import org.bukkit.ChatColor;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.World.Environment;
 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 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.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.bukkit.plugin.java.JavaPluginLoader;
+import org.mcstats.Metrics;

 /**
 * The implementation of the Multiverse-{@link Core}.
 */
 public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
-    private static final int PROTOCOL = 14;
+    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>();

    private AnchorManager anchorManager = new AnchorManager(this);
    // TODO please let's make this non-static
-    private MultiverseCoreConfiguration config;
+    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.
@@ -97,15 +173,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     * @param teleportee The name of the player that was teleported.
     */
    public static void addPlayerToTeleportQueue(String teleporter, String teleportee) {
-        staticLog(Level.FINEST, "Adding mapping '" + teleporter + "' => '" + teleportee + "' to teleport queue");
+        Logging.finest("Adding mapping '%s' => '%s' to teleport queue", teleporter, teleportee);
        teleportQueue.put(teleportee, teleporter);
    }

-    @Override
-    public String toString() {
-        return "The Multiverse-Core Plugin";
-    }
-
    /**
     * {@inheritDoc}
     * @deprecated This is now deprecated, nobody needs it any longer.
@@ -133,10 +204,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return MultiverseCore.PROTOCOL;
    }

-    // Useless stuff to keep us going.
-    private static final Logger LOGGER = Logger.getLogger("Minecraft");
-    private static DebugLog debugLog;
-
    // Setup our Map for our Commands using the CommandHandler.
    private CommandHandler commandHandler;

@@ -148,26 +215,27 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    // Configurations
    private FileConfiguration multiverseConfig = null;

-    private MVWorldManager worldManager = new WorldManager(this);
+    private final MVWorldManager worldManager = new WorldManager(this);

    // Setup the block/player/entity listener.
-    private MVPlayerListener playerListener = new MVPlayerListener(this);
-    private MVEntityListener entityListener = new MVEntityListener(this);
-    private MVPluginListener pluginListener = new MVPluginListener(this);
-    private MVWeatherListener weatherListener = new MVWeatherListener(this);
-    private MVPortalListener portalListener = new MVPortalListener(this);
+    private final MVPlayerListener playerListener = new MVPlayerListener(this);
+    private final MVEntityListener entityListener = new MVEntityListener(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 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"));

@@ -176,35 +244,30 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Register our config
        SerializationConfig.registerAll(MultiverseCoreConfiguration.class);
        // Register our world
-        SerializationConfig.registerAll(MVWorld.class);
+        SerializationConfig.registerAll(WorldProperties.class);
        // Create our DataFolder
        getDataFolder().mkdirs();
        // Setup our Debug Log
-        debugLog = new DebugLog("Multiverse-Core", getDataFolder() + File.separator + "debug.log");
+        Logging.init(this);
+        SerializationConfig.initLogging(Logging.getLogger());
        // Setup our BlockSafety
        this.blockSafety = new SimpleBlockSafety(this);
        // Setup our LocationManipulation
        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;
+    public VaultHandler getVaultHandler() {
+        return getEconomist().getVaultHandler();
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public GenericBank getBank() {
-        return this.bank;
+    public MVEconomist getEconomist() {
+        return economist;
    }

    /**
@@ -212,10 +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 + " ");
-        // Output a little snippet to show it's enabled.
-        this.log(Level.INFO, "- Version " + this.getDescription().getVersion() + " (API v" + PROTOCOL + ") Enabled - By " + getAuthors());
+        this.economist = new MVEconomist(this);
        // Load the defaultWorldGenerators
        this.worldManager.getDefaultWorldGenerators();

@@ -223,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.
@@ -244,6 +305,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Setup & Load our Configuration files.
        loadConfigs();
        if (this.multiverseConfig != null) {
+            Logging.setShowingConfig(!getMVConfig().getSilentStart());
            this.worldManager.loadDefaultWorlds();
            this.worldManager.loadWorlds(true);
        } else {
@@ -252,20 +314,134 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        this.anchorManager.loadAnchors();

        // Now set the firstspawnworld (after the worlds are loaded):
-        this.worldManager.setFirstSpawnWorld(config.getFirstSpawnWorld());
+        this.worldManager.setFirstSpawnWorld(getMVConfig().getFirstSpawnWorld());
        try {
-            config.setFirstSpawnWorld(this.worldManager.getFirstSpawnWorld().getName());
+            getMVConfig().setFirstSpawnWorld(this.worldManager.getFirstSpawnWorld().getName());
        } catch (NullPointerException e) {
            // A test that had no worlds loaded was being run. This should never happen in production
        }
        this.saveMVConfig();
-        /*
-        // 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.");
+        // Register async or sync player chat according to config
+        try {
+            Class.forName("org.bukkit.event.player.AsyncPlayerChatEvent");
+        } catch (ClassNotFoundException e) {
+            getMVConfig().setUseAsyncChat(false);
+        }
+        if (getMVConfig().getUseAsyncChat()) {
+            this.chatListener = new MVAsyncPlayerChatListener(this, this.playerListener);
+        } else {
+            this.chatListener = new MVPlayerChatListener(this, this.playerListener);
+        }
+        getServer().getPluginManager().registerEvents(this.chatListener, this);
+
+        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());
+
+        getLogger().info("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
+        getLogger().info("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
+    }
+
+    /**
+     * Initializes the buscript javascript library.
+     */
+    private void initializeBuscript() {
+        buscript = new Buscript(this);
+        // Add global variable "multiverse" to javascript environment
+        buscript.setScriptVariable("multiverse", this);
+    }
+
+    /**
+     * Plotter for Environment-Values.
+     */
+    private static final class EnvironmentPlotter extends Metrics.Plotter {
+        private MultiverseCore core;
+        private final Environment env;
+
+        public EnvironmentPlotter(MultiverseCore core, Environment env) {
+            super(envToString(env));
+            this.core = core;
+            this.env = env;
+        }
+
+        private static String envToString(Environment env) {
+            return new StringBuilder().append(env.name().toUpperCase().charAt(0))
+                    .append(env.name().toLowerCase().substring(1)).toString();
+        }
+
+        @Override
+        public int getValue() {
+            int count = 0;
+            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
+                if (w.getEnvironment() == env)
+                    count++;
+            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, env));
+            return count;
+        }
+    }
+
+    /**
+     * Plotter for Generator-Values.
+     */
+    private static final class GeneratorPlotter extends Metrics.Plotter {
+        private MultiverseCore core;
+        private final String gen;
+
+        public GeneratorPlotter(MultiverseCore core, String gen) {
+            super(gen);
+            this.core = core;
+            this.gen = gen;
+        }
+
+        @Override
+        public int getValue() {
+            int count = 0;
+            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
+                if (gen.equals(w.getGenerator()))
+                    count++;
+            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, gen));
+            return count;
+        }
+    }
+
+    private void setupMetrics() {
+        try {
+            Metrics m = new Metrics(this);
+
+            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
+            for (Environment env : Environment.values())
+                envGraph.addPlotter(new EnvironmentPlotter(this, env));
+
+            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
+                @Override
+                public int getValue() {
+                    return getMVWorldManager().getMVWorlds().size();
+                }
+            });
+            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
+                @Override
+                public int getValue() {
+                    return getMVWorldManager().getMVWorlds().size()
+                            + getMVWorldManager().getUnloadedWorlds().size();
+                }
+            });
+
+            Set<String> gens = new HashSet<String>();
+            for (MultiverseWorld w : this.getMVWorldManager().getMVWorlds())
+                gens.add(w.getGenerator());
+            gens.remove(null);
+            gens.remove("null");
+            Metrics.Graph genGraph = m.createGraph("custom_gens");
+            for (String gen : gens)
+                genGraph.addPlotter(new GeneratorPlotter(this, gen));
+
+            m.start();
+            log(Level.FINE, "Metrics have run!");
+        } catch (IOException e) {
+            log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
        }
-        */
    }

    private void initializeDestinationFactory() {
@@ -286,10 +462,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);
-
+        pm.registerEvents(this.worldListener, this);
+        pm.registerEvents(new MVMapListener(this), this);
    }

    /**
@@ -299,24 +475,33 @@ 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);

-        this.migrateWorldConfig();
-        this.worldManager.loadWorldConfig(new File(getDataFolder(), "worlds.yml"));
-
        MultiverseCoreConfiguration wantedConfig = null;
        try {
            wantedConfig = (MultiverseCoreConfiguration) multiverseConfig.get("multiverse-configuration");
-        } catch (Exception e) {
-            // We're just thinking "no risk no fun" and therefore have to catch and forget this exception
+        } catch (Exception ignore) {
        } finally {
            config = ((wantedConfig == null) ? new MultiverseCoreConfiguration() : wantedConfig);
        }
+        this.migrateWorldConfig();
+        this.worldManager.loadWorldConfig(new File(getDataFolder(), "worlds.yml"));

-        this.messaging.setCooldown(config.getMessageCooldown());
+        this.messaging.setCooldown(getMVConfig().getMessageCooldown());

        // Remove old values.
        this.multiverseConfig.set("enforcegamemodes", null);
@@ -326,6 +511,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));
+        }
    }

    /**
@@ -334,72 +525,85 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     */
    private void migrate22Values() {
        if (this.multiverseConfig.isSet("worldnameprefix")) {
-            this.log(Level.INFO, "Migrating 'worldnameprefix'...");
-            this.config.setPrefixChat(this.multiverseConfig.getBoolean("worldnameprefix"));
+            Logging.config("Migrating 'worldnameprefix'...");
+            this.getMVConfig().setPrefixChat(this.multiverseConfig.getBoolean("worldnameprefix"));
            this.multiverseConfig.set("worldnameprefix", null);
        }
        if (this.multiverseConfig.isSet("firstspawnworld")) {
-            this.log(Level.INFO, "Migrating 'firstspawnworld'...");
-            this.config.setFirstSpawnWorld(this.multiverseConfig.getString("firstspawnworld"));
+            Logging.config("Migrating 'firstspawnworld'...");
+            this.getMVConfig().setFirstSpawnWorld(this.multiverseConfig.getString("firstspawnworld"));
            this.multiverseConfig.set("firstspawnworld", null);
        }
        if (this.multiverseConfig.isSet("enforceaccess")) {
-            this.log(Level.INFO, "Migrating 'enforceaccess'...");
-            this.config.setEnforceAccess(this.multiverseConfig.getBoolean("enforceaccess"));
+            Logging.config("Migrating 'enforceaccess'...");
+            this.getMVConfig().setEnforceAccess(this.multiverseConfig.getBoolean("enforceaccess"));
            this.multiverseConfig.set("enforceaccess", null);
        }
        if (this.multiverseConfig.isSet("displaypermerrors")) {
-            this.log(Level.INFO, "Migrating 'displaypermerrors'...");
-            this.config.setDisplayPermErrors(this.multiverseConfig.getBoolean("displaypermerrors"));
+            Logging.config("Migrating 'displaypermerrors'...");
+            this.getMVConfig().setDisplayPermErrors(this.multiverseConfig.getBoolean("displaypermerrors"));
            this.multiverseConfig.set("displaypermerrors", null);
        }
        if (this.multiverseConfig.isSet("teleportintercept")) {
-            this.log(Level.INFO, "Migrating 'teleportintercept'...");
-            this.config.setTeleportIntercept(this.multiverseConfig.getBoolean("teleportintercept"));
+            Logging.config("Migrating 'teleportintercept'...");
+            this.getMVConfig().setTeleportIntercept(this.multiverseConfig.getBoolean("teleportintercept"));
            this.multiverseConfig.set("teleportintercept", null);
        }
        if (this.multiverseConfig.isSet("firstspawnoverride")) {
-            this.log(Level.INFO, "Migrating 'firstspawnoverride'...");
-            this.config.setFirstSpawnOverride(this.multiverseConfig.getBoolean("firstspawnoverride"));
+            Logging.config("Migrating 'firstspawnoverride'...");
+            this.getMVConfig().setFirstSpawnOverride(this.multiverseConfig.getBoolean("firstspawnoverride"));
            this.multiverseConfig.set("firstspawnoverride", null);
        }
        if (this.multiverseConfig.isSet("messagecooldown")) {
-            this.log(Level.INFO, "Migrating 'messagecooldown'...");
-            this.config.setMessageCooldown(this.multiverseConfig.getInt("messagecooldown"));
+            Logging.config("Migrating 'messagecooldown'...");
+            this.getMVConfig().setMessageCooldown(this.multiverseConfig.getInt("messagecooldown"));
            this.multiverseConfig.set("messagecooldown", null);
        }
        if (this.multiverseConfig.isSet("debug")) {
-            this.log(Level.INFO, "Migrating 'debug'...");
-            this.config.setGlobalDebug(this.multiverseConfig.getInt("debug"));
+            Logging.config("Migrating 'debug'...");
+            this.getMVConfig().setGlobalDebug(this.multiverseConfig.getInt("debug"));
            this.multiverseConfig.set("debug", null);
        }
        if (this.multiverseConfig.isSet("version")) {
-            this.log(Level.INFO, "Migrating 'version'...");
+            Logging.config("Migrating 'version'...");
            this.multiverseConfig.set("version", null);
        }
    }

+    private static final char PATH_SEPARATOR = '\uF8FF';
+
    /**
     * Migrate the worlds.yml to SerializationConfig.
     */
-    private void migrateWorldConfig() {
-        FileConfiguration wconf = YamlConfiguration
-                .loadConfiguration(new File(getDataFolder(), "worlds.yml"));
+    private void migrateWorldConfig() { // SUPPRESS CHECKSTYLE: MethodLength
+        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
+        if (!wconf.isConfigurationSection("worlds")) { // empty config
+            this.log(Level.FINE, "No worlds to migrate!");
            return;
+        }

        Map<String, Object> values = wconf.getConfigurationSection("worlds").getValues(false);

        boolean wasChanged = false;
        Map<String, Object> newValues = new LinkedHashMap<String, Object>(values.size());
        for (Map.Entry<String, Object> entry : values.entrySet()) {
-            if (entry.getValue() instanceof MVWorld) {
+            if (entry.getValue() instanceof WorldProperties) {
                // fine
                newValues.put(entry.getKey(), entry.getValue());
            } else if (entry.getValue() instanceof ConfigurationSection) {
+                this.log(Level.FINE, "Migrating: " + entry.getKey());
                // we have to migrate this
-                MVWorld world = new MVWorld(Collections.EMPTY_MAP);
+                WorldProperties world = new WorldProperties(Collections.EMPTY_MAP);
                ConfigurationSection section = (ConfigurationSection) entry.getValue();

                // migrate animals and monsters
@@ -433,8 +637,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"));
@@ -469,10 +674,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

                // migrate gamemode
                if (section.isString("gamemode")) {
-                    try {
-                        world.setPropertyValue("gamemode", section.getString("gamemode"));
-                    } catch (PropertyDoesNotExistException e) {
-                        throw new RuntimeException("Who forgot to update the migrator?", e);
+                    final GameMode gameMode = GameMode.valueOf(section.getString("gamemode").toUpperCase());
+                    if (gameMode != null) {
+                        world.setGameMode(gameMode);
                    }
                }

@@ -494,8 +698,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                // migrate portalform
                if (section.isString("portalform")) {
                    try {
-                        world.setPropertyValue("portalform", section.getString("portalform"));
-                    } catch (PropertyDoesNotExistException e) {
+                        world.setProperty("portalform", section.getString("portalform"), true);
+                    } catch (NoSuchPropertyException e) {
                        throw new RuntimeException("Who forgot to update the migrator?", e);
                    }
                }
@@ -503,8 +707,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                // migrate environment
                if (section.isString("environment")) {
                    try {
-                        world.setPropertyValue("environment", section.getString("environment"));
-                    } catch (PropertyDoesNotExistException e) {
+                        world.setProperty("environment", section.getString("environment"), true);
+                    } catch (NoSuchPropertyException e) {
                        throw new RuntimeException("Who forgot to update the migrator?", e);
                    }
                }
@@ -542,7 +746,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                // migrate spawn
                if (section.isConfigurationSection("spawn")) {
                    ConfigurationSection spawnSect = section.getConfigurationSection("spawn");
-                    Location spawnLoc = world.getSpawnLocation();
+                    Location spawnLoc = new NullLocation();
                    if (spawnSect.isDouble("yaw"))
                        spawnLoc.setYaw((float) spawnSect.getDouble("yaw"));
                    if (spawnSect.isDouble("pitch"))
@@ -557,6 +761,26 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                    world.setSpawnLocation(spawnLoc);
                }

+                // migrate difficulty
+                if (section.isString("difficulty")) {
+                    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);
+                    }
+                }
+
+                // migrate keepspawninmemory
+                if (section.isBoolean("keepspawninmemory")) {
+                    world.setKeepSpawnInMemory(section.getBoolean("keepspawninmemory"));
+                }
+
                newValues.put(entry.getKey(), world);
                wasChanged = true;
            } else {
@@ -604,6 +828,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        this.commandHandler.registerCommand(new ListCommand(this));
        this.commandHandler.registerCommand(new InfoCommand(this));
        this.commandHandler.registerCommand(new CreateCommand(this));
+        this.commandHandler.registerCommand(new CloneCommand(this));
        this.commandHandler.registerCommand(new ImportCommand(this));
        this.commandHandler.registerCommand(new ReloadCommand(this));
        this.commandHandler.registerCommand(new SetSpawnCommand(this));
@@ -630,8 +855,12 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Misc Commands
        this.commandHandler.registerCommand(new EnvironmentCommand(this));
        this.commandHandler.registerCommand(new DebugCommand(this));
+        this.commandHandler.registerCommand(new SilentCommand(this));
        this.commandHandler.registerCommand(new GeneratorCommand(this));
        this.commandHandler.registerCommand(new CheckCommand(this));
+        this.commandHandler.registerCommand(new ScriptCommand(this));
+        this.commandHandler.registerCommand(new GameruleCommand(this));
+        this.commandHandler.registerCommand(new GamerulesCommand(this));
    }

    /**
@@ -640,10 +869,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    @Override
    public void onDisable() {
        this.saveMVConfigs();
-        debugLog.close();
-        this.banker = null;
-        this.bank = null;
-        log(Level.INFO, "- Disabled");
+        Logging.shutdown();
    }

    /**
@@ -654,22 +880,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        if (this.playerSessions.containsKey(player.getName())) {
            return this.playerSessions.get(player.getName());
        } else {
-            this.playerSessions.put(player.getName(), new MVPlayerSession(player, config));
+            this.playerSessions.put(player.getName(), new MVPlayerSession(player, getMVConfig()));
            return this.playerSessions.get(player.getName());
        }
    }

-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated This is deprecated.
-     */
-    @Override
-    @Deprecated
-    public com.onarandombox.MultiverseCore.utils.SafeTTeleporter getTeleporter() {
-        return new com.onarandombox.MultiverseCore.utils.SafeTTeleporter(this);
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -689,7 +904,17 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        }
        ArrayList<String> allArgs = new ArrayList<String>(Arrays.asList(args));
        allArgs.add(0, command.getName());
-        return this.commandHandler.locateAndRunCommand(sender, allArgs, config.getDisplayPermErrors());
+        try {
+            return this.commandHandler.locateAndRunCommand(sender, allArgs, getMVConfig().getDisplayPermErrors());
+        } catch (Exception e) {
+            e.printStackTrace();
+            sender.sendMessage(ChatColor.RED + "An internal error occurred when attempting to perform this command.");
+            if (sender.isOp())
+                sender.sendMessage(ChatColor.RED + "Details were printed to the server console and logs, please add that to your bug report.");
+            else
+                sender.sendMessage(ChatColor.RED + "Try again and contact the server owner or an admin if this problem persists.");
+            return true;
+        }
    }

    /**
@@ -697,7 +922,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     */
    @Override
    public void log(Level level, String msg) {
-        staticLog(level, msg);
+        Logging.log(level, msg);
    }

    /**
@@ -705,33 +930,28 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     *
     * @param level The Log-{@link Level}.
     * @param msg The message to log.
+     *
+     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
+     * messages will appear to originate from Multiverse-Core.
     */
+    @Deprecated
    public static void staticLog(Level level, String msg) {
-        if (level == Level.FINE && MultiverseCoreConfiguration.getInstance().getGlobalDebug() >= 1) {
-            staticDebugLog(Level.INFO, msg);
-            return;
-        } else if (level == Level.FINER && MultiverseCoreConfiguration.getInstance().getGlobalDebug() >= 2) {
-            staticDebugLog(Level.INFO, msg);
-            return;
-        } else if (level == Level.FINEST && MultiverseCoreConfiguration.getInstance().getGlobalDebug() >= 3) {
-            staticDebugLog(Level.INFO, msg);
-            return;
-        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
-            LOGGER.log(level, String.format("%s %s", LOG_TAG, msg));
-            debugLog.log(level, String.format("%s %s", LOG_TAG, msg));
-        }
+        Logging.log(level, msg);
    }

    /**
-     * Print messages to the Debug Log, if the servers in Debug Mode then we also wan't to print the messages to the
+     * Print messages to the Debug Log, if the servers in Debug Mode then we also want to print the messages to the
     * standard Server Console.
     *
     * @param level The Log-{@link Level}
     * @param msg The message
+     *
+     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
+     * messages will appear to originate from Multiverse-Core.
     */
+    @Deprecated
    public static void staticDebugLog(Level level, String msg) {
-        LOGGER.log(level, "[MVCore-Debug] " + msg);
-        debugLog.log(level, "[MVCore-Debug] " + msg);
+        Logging.log(level, msg);
    }

    /**
@@ -823,22 +1043,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        this.pluginCount -= 1;
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public AllPay getBanker() {
-        return this.banker;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setBank(GenericBank bank) {
-        this.bank = bank;
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -880,25 +1084,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}
     */
@@ -916,6 +1101,15 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.playerListener;
    }

+    /**
+     * Gets the {@link MVChatListener}.
+     *
+     * @return The {@link MVChatListener}.
+     */
+    public MVChatListener getChatListener() {
+        return this.chatListener;
+    }
+
    /**
     * Gets the {@link MVEntityListener}.
     *
@@ -941,7 +1135,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     */
    public boolean saveMVConfig() {
        try {
-            this.multiverseConfig.set("multiverse-configuration", config);
+            this.multiverseConfig.set("multiverse-configuration", getMVConfig());
            this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
            return true;
        } catch (IOException e) {
@@ -978,38 +1172,27 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.worldManager.deleteWorld(name);
    }

+    /**
+     * NOT deprecated for the time as queued commands use this.
+     * However, this is not in the API and other plugins should therefore not use it.
+     *
+     * @param oldName   World to copy
+     * @param newName   World to create
+     * @param generator The Custom generator plugin to use.
+     * @return True if success, false if fail.
+     */
+    public Boolean cloneWorld(String oldName, String newName, String generator) {
+        return this.worldManager.cloneWorld(oldName, newName, generator);
+    }
+
    /**
     * {@inheritDoc}
+     * @deprecated This is deprecated!
     */
    @Override
+    @Deprecated
    public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed) {
-        MultiverseWorld world = this.worldManager.getMVWorld(name);
-        if (world == null) {
-            return false;
-        }
-
-        List<Player> ps = world.getCBWorld().getPlayers();
-
-        if (useNewSeed) {
-            // Set the worldseed.
-            if (randomSeed) {
-                Random random = new Random();
-                Long newseed = random.nextLong();
-                seed = newseed.toString();
-            }
-            ((WorldManager) this.worldManager).getConfigWorlds().set("worlds." + name + ".seed", seed);
-        }
-        if (this.worldManager.deleteWorld(name, false)) {
-            this.worldManager.loadWorlds(false);
-            SafeTTeleporter teleporter = this.getSafeTTeleporter();
-            Location newSpawn = this.getServer().getWorld(name).getSpawnLocation();
-            // Send all players that were in the old world, BACK to it!
-            for (Player p : ps) {
-                teleporter.safelyTeleport(null, p, newSpawn, true);
-            }
-            return true;
-        }
-        return false;
+        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed);
    }

    /**
@@ -1033,6 +1216,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;
    }

@@ -1086,4 +1272,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
    public static MultiverseCoreConfiguration getStaticConfig() {
        return MultiverseCoreConfiguration.getInstance();
    }
+
+    @Override
+    public Buscript getScriptAPI() {
+        return buscript;
+    }
+
+    public UnsafeCallWrapper getUnsafeCallWrapper() {
+        return this.unsafeCallWrapper;
+    }
 }
@@ -1,12 +1,12 @@
 package com.onarandombox.MultiverseCore;

-import java.util.Map;
+import com.dumptruckman.minecraft.util.*;
+import com.onarandombox.MultiverseCore.api.*;
+import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
+import me.main__.util.SerializationConfig.*;
+import org.bukkit.Bukkit;

-import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
-
-import me.main__.util.SerializationConfig.NoSuchPropertyException;
-import me.main__.util.SerializationConfig.Property;
-import me.main__.util.SerializationConfig.SerializationConfig;
+import java.util.*;

 /**
 * Our configuration.
@@ -22,6 +22,13 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        MultiverseCoreConfiguration.instance = instance;
    }

+    /**
+     * @return True if the static instance of config is set.
+     */
+    public static boolean isSet() {
+        return instance != null;
+    }
+
    /**
     * Gets the statically saved instance.
     * @return The statically saved instance.
@@ -33,25 +40,37 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    }

    @Property
-    private boolean enforceaccess;
+    private volatile boolean enforceaccess;
    @Property
-    private boolean prefixchat;
+    private volatile boolean prefixchat;
    @Property
-    private boolean teleportintercept;
+    private volatile String prefixchatformat;
    @Property
-    private boolean firstspawnoverride;
+    private volatile boolean useasyncchat;
    @Property
-    private boolean displaypermerrors;
+    private volatile boolean teleportintercept;
    @Property
-    private int globaldebug;
+    private volatile boolean firstspawnoverride;
    @Property
-    private int messagecooldown;
+    private volatile boolean displaypermerrors;
    @Property
-    private double version;
+    private volatile int globaldebug;
    @Property
-    private String firstspawnworld;
+    private volatile boolean silentstart;
    @Property
-    private int teleportcooldown;
+    private volatile int messagecooldown;
+    @Property
+    private volatile double version;
+    @Property
+    private volatile String firstspawnworld;
+    @Property
+    private volatile int teleportcooldown;
+    @Property
+    private volatile boolean defaultportalsearch;
+    @Property
+    private volatile int portalsearchradius;
+    @Property
+    private volatile boolean autopurge;

    public MultiverseCoreConfiguration() {
        super();
@@ -67,10 +86,12 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     * {@inheritDoc}
     */
    @Override
-    public void setDefaults() {
+    protected void setDefaults() {
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        enforceaccess = false;
+        useasyncchat = true;
        prefixchat = true;
+        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
        displaypermerrors = true;
@@ -78,6 +99,10 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        messagecooldown = 5000;
        teleportcooldown = 1000;
        this.version = 2.9;
+        silentstart = false;
+        defaultportalsearch = false;
+        portalsearchradius = 128;
+        autopurge = true;
        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
    }

@@ -126,6 +151,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}
@@ -189,6 +230,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    @Override
    public void setGlobalDebug(int globalDebug) {
        this.globaldebug = globalDebug;
+        Logging.setDebugLevel(globalDebug);
+        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
    }

    /**
@@ -254,4 +297,55 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    public void setTeleportCooldown(int teleportCooldown) {
        this.teleportcooldown = teleportCooldown;
    }
+
+    @Override
+    public void setUseAsyncChat(boolean useAsyncChat) {
+        this.useasyncchat = useAsyncChat;
+    }
+
+    @Override
+    public boolean getUseAsyncChat() {
+        return this.useasyncchat;
+    }
+
+    @Override
+    public void setSilentStart(boolean silentStart) {
+        Logging.setShowingConfig(!silentStart);
+        this.silentstart = silentStart;
+    }
+
+    @Override
+    public boolean getSilentStart() {
+        return silentstart;
+    }
+
+    @Override
+    public void setUseDefaultPortalSearch(boolean useDefaultPortalSearch) {
+        defaultportalsearch = useDefaultPortalSearch;
+    }
+
+    @Override
+    public boolean isUsingDefaultPortalSearch() {
+        return defaultportalsearch;
+    }
+
+    @Override
+    public void setPortalSearchRadius(int searchRadius) {
+        this.portalsearchradius = searchRadius;
+    }
+
+    @Override
+    public int getPortalSearchRadius() {
+        return portalsearchradius;
+    }
+
+    @Override
+    public boolean isAutoPurgeEnabled() {
+        return autopurge;
+    }
+
+    @Override
+    public void setAutoPurgeEnabled(boolean autopurge) {
+        this.autopurge = autopurge;
+    }
 }
@@ -0,0 +1,655 @@
+package com.onarandombox.MultiverseCore;
+
+import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
+import com.onarandombox.MultiverseCore.configuration.EntryFee;
+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.enums.EnglishChatStyle;
+import me.main__.util.SerializationConfig.IllegalPropertyValueException;
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+import me.main__.util.SerializationConfig.Serializor;
+import me.main__.util.SerializationConfig.Validator;
+import me.main__.util.SerializationConfig.VirtualProperty;
+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;
+import java.util.HashMap;
+import java.util.List;
+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 {
+
+    private static final Map<String, String> PROPERTY_ALIASES;
+
+    static {
+        PROPERTY_ALIASES = new HashMap<String, String>();
+        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");
+        PROPERTY_ALIASES.put("storm", "allowWeather");
+        PROPERTY_ALIASES.put("weather", "allowWeather");
+        PROPERTY_ALIASES.put("spawnmemory", "keepSpawnInMemory");
+        PROPERTY_ALIASES.put("memory", "keepSpawnInMemory");
+        PROPERTY_ALIASES.put("mode", "gameMode");
+        PROPERTY_ALIASES.put("diff", "difficulty");
+        PROPERTY_ALIASES.put("spawnlocation", "spawn");
+        PROPERTY_ALIASES.put("limit", "playerLimit");
+        PROPERTY_ALIASES.put("animals", "spawning.animals.spawn");
+        PROPERTY_ALIASES.put("monsters", "spawning.monsters.spawn");
+        PROPERTY_ALIASES.put("animalsrate", "spawning.animals.spawnrate");
+        PROPERTY_ALIASES.put("monstersrate", "spawning.monsters.spawnrate");
+        PROPERTY_ALIASES.put("flight", "allowFlight");
+        PROPERTY_ALIASES.put("fly", "allowFlight");
+        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) {
+        super();
+        if (!fixSpawn) {
+            this.adjustSpawn = false;
+        }
+        setScaling(getDefaultScale(environment));
+        keepSpawnFallback = true;
+    }
+
+    void setMVWorld(MVWorld world) {
+        registerObjectUsing(world);
+        registerGlobalValidator(new WorldPropertyValidator());
+    }
+
+    /**
+     * Serializor for the color-property.
+     */
+    private static final class EnumPropertySerializor<T extends Enum<T>> implements Serializor<T, String> {
+        @Override
+        public String serialize(T from) {
+            return from.toString();
+        }
+
+        @Override
+        public T deserialize(String serialized, Class<T> wanted) throws IllegalPropertyValueException {
+            try {
+                return Enum.valueOf(wanted, serialized.toUpperCase());
+            } catch (IllegalArgumentException e) {
+                throw new IllegalPropertyValueException(e);
+            }
+        }
+    }
+
+    /**
+     * Serializor for the difficulty-property.
+     */
+    private static final class DifficultyPropertySerializor implements Serializor<Difficulty, String> {
+        @Override
+        public String serialize(Difficulty from) {
+            return from.toString();
+        }
+
+        @Override
+        public Difficulty deserialize(String serialized, Class<Difficulty> wanted) throws IllegalPropertyValueException {
+            try {
+                return Difficulty.getByValue(Integer.parseInt(serialized));
+            } catch (Exception e) {
+            }
+            try {
+                return Difficulty.valueOf(serialized.toUpperCase());
+            } catch (Exception e) {
+            }
+            throw new IllegalPropertyValueException();
+        }
+    }
+
+    /**
+     * Serializor for the gameMode-property.
+     */
+    private static final class GameModePropertySerializor implements Serializor<GameMode, String> {
+        @Override
+        public String serialize(GameMode from) {
+            return from.toString();
+        }
+
+        @Override
+        public GameMode deserialize(String serialized, Class<GameMode> wanted) throws IllegalPropertyValueException {
+            try {
+                return GameMode.getByValue(Integer.parseInt(serialized));
+            } catch (NumberFormatException nfe) {
+            }
+            try {
+                return GameMode.valueOf(serialized.toUpperCase());
+            } catch (Exception e) {
+            }
+            throw new IllegalPropertyValueException();
+        }
+    }
+
+    /**
+     * Serializor for the time-property.
+     */
+    private static final class TimePropertySerializor implements Serializor<Long, String> {
+        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        private static final String TIME_REGEX = "(\\d\\d?):?(\\d\\d)(a|p)?m?";
+        private static final  Map<String, String> TIME_ALIASES;
+        static {
+            Map<String, String> staticTimes = new HashMap<String, String>();
+            staticTimes.put("morning", "8:00");
+            staticTimes.put("day", "12:00");
+            staticTimes.put("noon", "12:00");
+            staticTimes.put("midnight", "0:00");
+            staticTimes.put("night", "20:00");
+
+            // now set TIME_ALIASES to a "frozen" map
+            TIME_ALIASES = Collections.unmodifiableMap(staticTimes);
+        }
+
+        @Override
+        public String serialize(Long from) {
+            // I'm tired, so they get time in 24 hour for now.
+            // Someone else can add 12 hr format if they want :P
+
+            int hours = (int) ((from / 1000 + 8) % 24);
+            int minutes = (int) (60 * (from % 1000) / 1000);
+
+            return String.format("%d:%02d", hours, minutes);
+        }
+
+        @Override
+        public Long deserialize(String serialized, Class<Long> wanted) throws IllegalPropertyValueException {
+            if (TIME_ALIASES.containsKey(serialized.toLowerCase())) {
+                serialized = TIME_ALIASES.get(serialized.toLowerCase());
+            }
+            // Regex that extracts a time in the following formats:
+            // 11:11pm, 11:11, 23:11, 1111, 1111p, and the aliases at the top of this file.
+            Pattern pattern = Pattern.compile(TIME_REGEX, Pattern.CASE_INSENSITIVE);
+            Matcher matcher = pattern.matcher(serialized);
+            matcher.find();
+            int hour = 0;
+            double minute = 0;
+            int count = matcher.groupCount();
+            if (count >= 2) {
+                hour = Integer.parseInt(matcher.group(1));
+                minute = Integer.parseInt(matcher.group(2));
+            }
+            // If there were 4 matches (all, hour, min, am/pm)
+            if (count == 4) {
+                // We want 24 hour time for calcs, but if they
+                // added a p[m], turn it into a 24 hr one.
+                if (matcher.group(3).equals("p")) {
+                    hour += 12;
+                }
+            }
+            // Translate 24th hour to 0th hour.
+            if (hour == 24) {
+                hour = 0;
+            }
+            // Clamp the hour
+            if (hour > 23 || hour < 0) {
+                throw new IllegalPropertyValueException("Illegal hour!");
+            }
+            // Clamp the minute
+            if (minute > 59 || minute < 0) {
+                throw new IllegalPropertyValueException("Illegal minute!");
+            }
+            // 60 seconds in a minute, time needs to be in hrs * 1000, per
+            // the bukkit docs.
+            double totaltime = (hour + (minute / 60.0)) * 1000;
+            // Somehow there's an 8 hour offset...
+            totaltime -= 8000;
+            if (totaltime < 0) {
+                totaltime = 24000 + totaltime;
+            }
+
+            return (long) totaltime;
+        }
+        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+    }
+
+    // --------------------------------------------------------------
+    // Begin properties
+    @Property(description = "Sorry, 'hidden' must either be: true or false.")
+    private volatile boolean hidden;
+    @Property(description = "Alias must be a valid string.")
+    private volatile String alias;
+    @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'color' must be a valid color-name.")
+    private volatile EnglishChatColor color;
+    @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; // 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.")
+    private volatile String respawnWorld;
+    @Property(description = "Sorry, this must either be: true or false.")
+    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; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property(description = "Sorry, 'animals' must either be: true or false.")
+    private volatile SpawnSettings spawning;
+    @Property
+    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.")
+    private volatile boolean autoHeal;
+    @Property(description = "Sorry, 'adjustspawn' must either be: true or false.")
+    private volatile boolean adjustSpawn;
+    @Property(serializor = EnumPropertySerializor.class, description = "Allow portal forming must be NONE, ALL, NETHER or END.")
+    private volatile AllowedPortalType portalForm;
+    @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; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    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; // 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?")
+    private volatile boolean bedRespawn;
+    @Property
+    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; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    volatile Environment environment; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    volatile long seed; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    private volatile String generator;
+    @Property
+    private volatile int playerLimit;
+    @Property
+    private volatile boolean allowFlight;
+    // End of properties
+    // --------------------------------------------------------------
+
+    void setValidator(String fieldName, Validator validator) {
+        registerValidator(fieldName, validator);    //To change body of overridden methods use File | Settings | File Templates.
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void copyValues(SerializationConfig other) {
+        super.copyValues(other);
+    }
+
+    /**
+     * This prepares the MVWorld for unloading.
+     */
+    public void cacheVirtualProperties() {
+        try {
+            this.buildVPropChanges();
+        } catch (IllegalStateException e) {
+            // do nothing
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        this.hidden = false;
+        this.alias = new String();
+        this.color = EnglishChatColor.WHITE;
+        this.style = EnglishChatStyle.NORMAL;
+        this.scale = 1D;
+        this.respawnWorld = new String();
+        this.allowWeather = true;
+        this.spawning = new SpawnSettings();
+        this.entryfee = new EntryFee();
+        this.hunger = true;
+        this.autoHeal = true;
+        this.adjustSpawn = true;
+        this.portalForm = AllowedPortalType.ALL;
+        this.gameMode = GameMode.SURVIVAL;
+        this.spawnLocation = new NullLocation();
+        this.autoLoad = true;
+        this.bedRespawn = true;
+        this.worldBlacklist = new ArrayList<String>();
+        this.generator = null;
+        this.playerLimit = -1;
+        this.allowFlight = true;
+    }
+
+    private static double getDefaultScale(Environment environment) {
+        if (environment == Environment.NETHER) {
+            return 8.0; // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        } else if (environment == Environment.THE_END) {
+            return 16.0; // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        }
+        return 1.0;
+    }
+
+    /**
+     * getAliases().
+     * @return The alias-map.
+     * @see SerializationConfig
+     */
+    protected static Map<String, String> getAliases() {
+        return PROPERTY_ALIASES;
+    }
+
+    void flushChanges() {
+        this.flushPendingVPropChanges();
+    }
+
+    public String getAlias() {
+        return this.alias;
+    }
+
+    public void setAlias(String alias) {
+        this.setPropertyValueUnchecked("alias", alias);
+    }
+
+    public Environment getEnvironment() {
+        return this.environment;
+    }
+
+    public void setEnvironment(Environment environment) {
+        this.setPropertyValueUnchecked("environment", environment);
+    }
+
+    public long getSeed() {
+        return this.seed;
+    }
+
+    public void setSeed(long seed) {
+        this.setPropertyValueUnchecked("seed", seed);
+    }
+
+    public String getGenerator() {
+        return this.generator;
+    }
+
+    public void setGenerator(String generator) {
+        this.setPropertyValueUnchecked("generator", generator);
+    }
+
+    public int getPlayerLimit() {
+        return this.playerLimit;
+    }
+
+    public void setPlayerLimit(int limit) {
+        this.setPropertyValueUnchecked("playerLimit", limit);
+    }
+
+    public boolean canAnimalsSpawn() {
+        return this.spawning.getAnimalSettings().doSpawn();
+    }
+
+    public void setAllowAnimalSpawn(boolean animals) {
+        this.setPropertyValueUnchecked("spawning.animals.spawn", animals);
+    }
+
+    public List<String> getAnimalList() {
+        // These don't fire events at the moment. Should they?
+        return this.spawning.getAnimalSettings().getExceptions();
+    }
+
+    public boolean canMonstersSpawn() {
+        return this.spawning.getMonsterSettings().doSpawn();
+    }
+
+    public void setAllowMonsterSpawn(boolean monsters) {
+        this.setPropertyValueUnchecked("spawning.monsters.spawn", monsters);
+    }
+
+    public int getAnimalSpawnRate() {
+        return this.spawning.getAnimalSettings().getSpawnRate();
+    }
+
+    public int getMonsterSpawnRate() {
+        return this.spawning.getMonsterSettings().getSpawnRate();
+    }
+
+    public List<String> getMonsterList() {
+        // These don't fire events at the moment. Should they?
+        return this.spawning.getMonsterSettings().getExceptions();
+    }
+
+    public boolean isPVPEnabled() {
+        return this.pvp.get();
+    }
+
+    public void setPVPMode(boolean pvp) {
+        this.setPropertyValueUnchecked("pvp", pvp);
+    }
+
+    public boolean isHidden() {
+        return this.hidden;
+    }
+
+    public void setHidden(boolean hidden) {
+        this.setPropertyValueUnchecked("hidden", hidden);
+    }
+
+    public List<String> getWorldBlacklist() {
+        return this.worldBlacklist;
+    }
+
+    public double getScaling() {
+        return this.scale;
+    }
+
+    public boolean setScaling(double scaling) {
+        return this.setPropertyValueUnchecked("scale", scaling);
+    }
+
+    public boolean setColor(String aliasColor) {
+        return this.setPropertyUnchecked("color", aliasColor);
+    }
+
+    public boolean setColor(EnglishChatColor color) {
+        return this.setPropertyValueUnchecked("color", color);
+    }
+
+    public EnglishChatColor getColor() {
+        return this.color;
+    }
+
+    public String getRespawnToWorld() {
+        return this.respawnWorld;
+    }
+
+    public boolean setRespawnToWorld(String respawnToWorld) {
+        return this.setPropertyValueUnchecked("respawnWorld", respawnToWorld);
+    }
+
+    public Material getCurrency() {
+        return this.entryfee.getCurrency();
+    }
+
+    public void setCurrency(@Nullable Material currency) {
+        this.setPropertyValueUnchecked("entryfee.currency", currency);
+    }
+
+    public double getPrice() {
+        return this.entryfee.getAmount();
+    }
+
+    public void setPrice(double price) {
+        this.setPropertyValueUnchecked("entryfee.amount", price);
+    }
+
+    public boolean setGameMode(String mode) {
+        return this.setPropertyUnchecked("gameMode", mode);
+    }
+
+    public boolean setGameMode(GameMode mode) {
+        return this.setPropertyValueUnchecked("gameMode", mode);
+    }
+
+    public GameMode getGameMode() {
+        return this.gameMode;
+    }
+
+    public void setEnableWeather(boolean weather) {
+        this.setPropertyValueUnchecked("allowWeather", weather);
+    }
+
+    public boolean isWeatherEnabled() {
+        return this.allowWeather;
+    }
+
+    public boolean isKeepingSpawnInMemory() {
+        if (keepSpawnInMemory == null) {
+            return keepSpawnFallback;
+        }
+        try {
+            return this.keepSpawnInMemory.get();
+        } catch (IllegalStateException e) {
+            return keepSpawnFallback;
+        }
+    }
+
+    public void setKeepSpawnInMemory(boolean value) {
+        this.setPropertyValueUnchecked("keepSpawnInMemory", value);
+    }
+
+    public boolean getHunger() {
+        return this.hunger;
+    }
+
+    public void setHunger(boolean hunger) {
+        this.setPropertyValueUnchecked("hunger", hunger);
+    }
+
+    public Location getSpawnLocation() {
+        return this.spawn.get();
+    }
+
+    public void setSpawnLocation(Location l) {
+        this.setPropertyValueUnchecked("spawn", l);
+    }
+
+    public Difficulty getDifficulty() {
+        return this.difficulty.get();
+    }
+
+    @Deprecated // SUPPRESS CHECKSTYLE: Deprecated
+    public boolean setDifficulty(String difficulty) {
+        return this.setPropertyUnchecked("difficulty", difficulty);
+    }
+
+    public boolean setDifficulty(Difficulty difficulty) {
+        return this.setPropertyValueUnchecked("difficulty", difficulty);
+    }
+
+    public boolean getAutoHeal() {
+        return this.autoHeal;
+    }
+
+    public void setAutoHeal(boolean heal) {
+        this.setPropertyValueUnchecked("autoHeal", heal);
+    }
+
+    public void setAdjustSpawn(boolean adjust) {
+        this.setPropertyValueUnchecked("adjustSpawn", adjust);
+    }
+
+    public boolean getAdjustSpawn() {
+        return this.adjustSpawn;
+    }
+
+    public void setAutoLoad(boolean load) {
+        this.setPropertyValueUnchecked("autoLoad", load);
+    }
+
+    public boolean getAutoLoad() {
+        return this.autoLoad;
+    }
+
+    public void setBedRespawn(boolean respawn) {
+        this.setPropertyValueUnchecked("bedRespawn", respawn);
+    }
+
+    public boolean getBedRespawn() {
+        return this.bedRespawn;
+    }
+
+    public String getAllPropertyNames() {
+        ChatColor myColor = ChatColor.AQUA;
+        StringBuilder result = new StringBuilder();
+        Map<String, Object> serialized = this.serialize();
+        for (String key : serialized.keySet()) {
+            result.append(myColor).append(key).append(' ');
+            myColor = (myColor == ChatColor.AQUA) ? ChatColor.GOLD : ChatColor.AQUA;
+        }
+        return result.toString();
+    }
+
+    public String getTime() {
+        return this.getPropertyUnchecked("time");
+    }
+
+    public boolean setTime(String timeAsString) {
+        return this.setPropertyUnchecked("time", timeAsString);
+    }
+
+    public AllowedPortalType getAllowedPortals() {
+        return portalForm;
+    }
+
+    public void allowPortalMaking(AllowedPortalType portalType) {
+        this.setPropertyValueUnchecked("portalForm", portalType);
+    }
+
+    public EnglishChatStyle getStyle() {
+        return style;
+    }
+
+    public boolean setStyle(String style) {
+        return this.setPropertyUnchecked("style", style);
+    }
+
+    public boolean getAllowFlight() {
+        return this.allowFlight;
+    }
+
+    public void setAllowFlight(final boolean allowFlight) {
+        this.setPropertyValueUnchecked("allowFlight", allowFlight);
+    }
+}
@@ -35,6 +35,13 @@ public interface BlockSafety {
     */
    boolean playerCanSpawnHereSafely(Location l);

+    /**
+     * Gets a safe bed spawn location OR null if the bed is invalid.
+     * @param l The location of the bead head (block with the pillow on it).
+     * @return Safe location around the bed or null if no location was found.
+     */
+    Location getSafeBedSpawn(Location l);
+
    /**
     * Gets the location of the top block at the specified {@link Location}.
     * @param l Any {@link Location}.
@@ -7,12 +7,17 @@

 package com.onarandombox.MultiverseCore.api;

-import com.fernferret.allpay.AllPay;
-import com.fernferret.allpay.GenericBank;
+import buscript.Buscript;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.*;
+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;
+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;

 /**
@@ -23,20 +28,22 @@ import org.bukkit.entity.Player;
 public interface Core {

    /**
-     * Gets the Multiverse config file.
+     * Returns the Vault handler used by Multiverse.  The returned object will have all methods necessary for
+     * interfacing with Vault.
     *
-     * @return The Multiverse config file.
-     * @deprecated Don't modify the config-file manually!
+     * @return the Vault handler for Multiverse.
+     * @deprecated we are now using {@link #getEconomist()} for all economy needs.
     */
    @Deprecated
-    FileConfiguration getMVConfiguration();
+    VaultHandler getVaultHandler();

    /**
-     * Gets the Banking system that Multiverse-Core has hooked into.
+     * Retrieves Multiverse's friendly economist. The economist can be used for dealing with economies without
+     * worrying about any of the messy details.
     *
-     * @return A {@link GenericBank} that can be used for payments.
+     * @return the economy manager for Multiverse.
     */
-    GenericBank getBank();
+    MVEconomist getEconomist();

    /**
     * Reloads the Multiverse Configuration files:
@@ -63,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.
@@ -101,7 +97,7 @@ public interface Core {
    /**
     * Gets the primary class responsible for managing Multiverse Worlds.
     *
-     * @return {@link WorldManager}.
+     * @return {@link MVWorldManager}.
     */
    MVWorldManager getMVWorldManager();

@@ -128,23 +124,12 @@ public interface Core {
     * @param seed The seed of the world.
     *
     * @return True if success, false if fail.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String)} instead.
     */
+    @Deprecated
    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);

-    /**
-     * Sets the {@link GenericBank}-Bank AllPay is using.
-     *
-     * @param bank The new {@link GenericBank}
-     */
-    void setBank(GenericBank bank);
-
-    /**
-     * Gets this plugin's {@link AllPay}-Banker.
-     *
-     * @return An {@link AllPay}-Banker
-     */
-    AllPay getBanker();
-
    /**
     * Decrements the number of plugins that have specifically hooked into core.
     */
@@ -222,4 +207,11 @@ public interface Core {
     * @return The configuration.
     */
    MultiverseCoreConfig getMVConfig();
+
+    /**
+     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
+     *
+     * @return The Multiverse buscript object.
+     */
+    Buscript getScriptAPI();
 }
@@ -30,14 +30,14 @@ public interface MVPlugin extends LoggablePlugin {
    /**
     * Gets the reference to MultiverseCore.
     *
-     * @return A valid {@link MultiverseCore}.
+     * @return A valid {@link com.onarandombox.MultiverseCore}.
     */
    MultiverseCore getCore();

    /**
     * Sets the reference to MultiverseCore.
     *
-     * @param core A valid {@link MultiverseCore}.
+     * @param core A valid {@link com.onarandombox.MultiverseCore}.
     */
    void setCore(MultiverseCore core);

@@ -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;
@@ -61,10 +60,34 @@ public interface MVWorldManager {
                     String generator, boolean useSpawnAdjust);

    /**
-     * 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
+     * @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);
+
+    /**
+     * Make a copy of a world.
+     *
+     * @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);
@@ -80,6 +103,17 @@ public interface MVWorldManager {
     */
    boolean deleteWorld(String name, boolean removeConfig);

+    /**
+     *
+     * @param name The name of the world to remove
+     * @param removeFromConfig If true(default), we'll remove the entries from the
+     *                         config. If false, they'll stay and the world may come back.
+     * @param deleteWorldFolder If true the world folder will be completely deleted. If false
+     *                          only the contents of the world folder will be deleted
+     * @return True if success, false if failure.
+     */
+    boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder);
+
    /**
     * Unload a world from Multiverse.
     *
@@ -88,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)}.
@@ -156,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.
@@ -164,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.
     */
@@ -245,4 +288,30 @@ public interface MVWorldManager {
     * @return The {@link MultiverseWorld} new players should spawn in.
     */
    MultiverseWorld getFirstSpawnWorld();
+
+    /**
+     * Regenerates a world.
+     *
+     * @param name Name of the world to regenerate
+     * @param useNewSeed If a new seed should be used
+     * @param randomSeed IF the new seed should be random
+     * @param seed The seed of the world.
+     *
+     * @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.
@@ -133,4 +145,72 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     * @return enforceAccess.
     */
    boolean getEnforceAccess();
+
+    /**
+     * Sets useasyncchat.
+     * @param useAsyncChat The new value.
+     */
+    void setUseAsyncChat(boolean useAsyncChat);
+
+    /**
+     * Gets useasyncchat.
+     * @return useasyncchat.
+     */
+    boolean getUseAsyncChat();
+
+    /**
+     * Sets whether to suppress startup messages.
+     *
+     * @param silentStart true to suppress messages.
+     */
+    void setSilentStart(boolean silentStart);
+
+    /**
+     * Whether we are suppressing startup messages.
+     *
+     * @return true if we are suppressing startup messages.
+     */
+    boolean getSilentStart();
+
+    /**
+     * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
+     *
+     * @param useDefaultPortalSearch True to let Bukkit determine portal search radius on its own.
+     */
+    void setUseDefaultPortalSearch(boolean useDefaultPortalSearch);
+
+    /**
+     * Gets whether or not Bukkit will be determining portal search radius on its own or if Multiverse should help.
+     *
+     * @return True means Bukkit will use its own default values.
+     */
+    boolean isUsingDefaultPortalSearch();
+
+    /**
+     * Sets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @param searchRadius The portal search radius.
+     */
+    void setPortalSearchRadius(int searchRadius);
+
+    /**
+     * Gets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @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);
 }
@@ -0,0 +1,161 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.utils.DebugLog;
+import com.pneumaticraft.commandhandler.CommandHandler;
+
+/**
+ * Make things easier for MV-Plugins!
+ */
+public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
+    private MultiverseCore core;
+    /**
+     * Prefix for standard log entrys.
+     */
+    protected String logTag;
+    private DebugLog debugLog;
+
+    /**
+     * {@inheritDoc}
+     *
+     * Note: You can't override this, use {@link #onPluginEnable()} instead!
+     * @see #onPluginEnable()
+     */
+    @Override
+    public final void onEnable() {
+        MultiverseCore theCore = (MultiverseCore) this.getServer().getPluginManager().getPlugin("Multiverse-Core");
+        if (theCore == null) {
+            this.getLogger().severe("Core not found! The plugin dev needs to add a dependency!");
+            this.getLogger().severe("Disabling!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        if (theCore.getProtocolVersion() < this.getProtocolVersion()) {
+            this.getLogger().severe("You need a newer version of Multiverse-Core!");
+            this.getLogger().severe("Disabling!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        this.setCore(theCore);
+
+        this.getServer().getLogger().info(String.format("%s - Version %s enabled - By %s",
+                this.getDescription().getName(), this.getDescription().getVersion(), getAuthors()));
+        getDataFolder().mkdirs();
+        File debugLogFile = new File(getDataFolder(), "debug.log");
+        try {
+            debugLogFile.createNewFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
+        debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
+
+        this.onPluginEnable();
+    }
+
+    /**
+     * Parse the Authors Array into a readable String with ',' and 'and'.
+     *
+     * @return The readable authors-{@link String}
+     */
+    protected String getAuthors() {
+        String authors = "";
+        List<String> auths = this.getDescription().getAuthors();
+        if (auths.size() == 0) {
+            return "";
+        }
+
+        if (auths.size() == 1) {
+            return auths.get(0);
+        }
+
+        for (int i = 0; i < auths.size(); i++) {
+            if (i == this.getDescription().getAuthors().size() - 1) {
+                authors += " and " + this.getDescription().getAuthors().get(i);
+            } else {
+                authors += ", " + this.getDescription().getAuthors().get(i);
+            }
+        }
+        return authors.substring(2);
+    }
+
+    /**
+     * Called when the plugin is enabled.
+     * @see #onEnable()
+     */
+    protected abstract void onPluginEnable();
+
+    /**
+     * You can register commands here.
+     * @param handler The CommandHandler.
+     */
+    protected abstract void registerCommands(CommandHandler handler);
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!this.isEnabled()) {
+            sender.sendMessage("This plugin is Disabled!");
+            return true;
+        }
+
+        ArrayList<String> allArgs = new ArrayList<String>(args.length + 1);
+        allArgs.add(command.getName());
+        allArgs.addAll(Arrays.asList(args));
+        return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
+    }
+
+    @Override
+    public void log(Level level, String msg) {
+        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
+        if ((level == Level.FINE && debugLevel >= 1) || (level == Level.FINER && debugLevel >= 2)
+                || (level == Level.FINEST && debugLevel >= 3)) {
+            debugLog.log(level, msg);
+        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
+            String message = new StringBuilder(getLogTag()).append(msg).toString();
+            this.getServer().getLogger().log(level, message);
+            debugLog.log(level, message);
+        }
+    }
+
+    private String getLogTag() {
+        if (logTag == null)
+            logTag = String.format("[%s]", this.getDescription().getName());
+        return logTag;
+    }
+
+    /**
+     * Sets the debug log-tag.
+     * @param tag The new tag.
+     */
+    protected final void setDebugLogTag(String tag) {
+        this.debugLog.setTag(tag);
+    }
+
+    @Override
+    public final String dumpVersionInfo(String buffer) {
+        throw new UnsupportedOperationException("This is gone.");
+    }
+
+    @Override
+    public final MultiverseCore getCore() {
+        if (this.core == null)
+            throw new IllegalStateException("Core is null!");
+        return this.core;
+    }
+
+    @Override
+    public final void setCore(MultiverseCore core) {
+        this.core = core;
+    }
+}
@@ -9,15 +9,16 @@ package com.onarandombox.MultiverseCore.api;

 import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-
 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;

@@ -154,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}.
     *
@@ -288,6 +258,21 @@ public interface MultiverseWorld {
     */
    boolean setColor(String color);

+    /**
+     * Gets the style that this world's name/alias will display as.
+     *
+     * @return The style of this world. {@code null} for "normal" style.
+     */
+    ChatColor getStyle();
+
+    /**
+     * Sets the style that this world's name/alias will display as.
+     *
+     * @param style A valid style name.
+     * @return True if the style was set, false if not.
+     */
+    boolean setStyle(String style);
+
    /**
     * Tells you if someone entered a valid color.
     *
@@ -490,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.
@@ -606,6 +593,22 @@ public interface MultiverseWorld {
     */
    void setBedRespawn(boolean autoLoad);

+    /**
+     * Sets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
+     *
+     * @param limit The new limit
+     */
+    void setPlayerLimit(int limit);
+
+    /**
+     * Gets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
+     *
+     * @return The player limit
+     */
+    int getPlayerLimit();
+
    /**
     * Same as {@link #getTime()}, but returns a string.
     * @return The time as a short string: 12:34pm
@@ -656,23 +659,16 @@ public interface MultiverseWorld {
    String getAllPropertyNames();

    /**
-     * Gets whether or not flight is allowed in this world.
-     * <p>
-     * It should be noted that this refers to clientside flying. Creative
-     * mode will always allow server based flying.
+     * Whether or not players are allowed to fly in this world.
     *
-     * @return True if flight is allowed.
+     * @return True if players allowed to fly in this world.
     */
-    boolean isFlightAllowed();
+    boolean getAllowFlight();

    /**
-     * Sets whether or not flight is allowed in this world.
-     * <p>
-     * It should be noted that this refers to clientside flying. Creative
-     * mode will always allow server based flying.
+     * Sets whether or not players are allowed to fly in this world.
     *
-     * @param flightAllowed Wheter or not flight is allowed in this world.
+     * @param allowFlight True to allow flight in this world.
     */
-    void setFlightAllowed(boolean flightAllowed);
-
+    void setAllowFlight(final boolean allowFlight);
 }
@@ -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);
+}
@@ -3,21 +3,21 @@ package com.onarandombox.MultiverseCore.api;
 import java.util.List;

 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;

 /**
 * Used to remove animals from worlds that don't belong there.
 */
 public interface WorldPurger {
-
    /**
-     * Synchronizes the given world with it's settings.
+     * Synchronizes the given worlds with their settings.
     *
     * @param worlds A list of {@link MultiverseWorld}
     */
    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}.
     */
@@ -46,4 +46,23 @@ public interface WorldPurger {
    void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
            boolean negateMonsters, CommandSender sender);

+    /**
+     * Determines whether the specified creature should be killed.
+     *
+     * @param e The creature.
+     * @param thingsToKill A {@link List} of animals/monsters to be killed.
+     * @param negateAnimals Whether the monsters in the list should be negated.
+     * @param negateMonsters Whether the animals in the list should be negated.
+     * @return {@code true} if the creature should be killed, otherwise {@code false}.
+     */
+    boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters);
+
+    /**
+     * Determines whether the specified creature should be killed and automatically reads the params from a world object.
+     *
+     * @param w The world.
+     * @param e The creature.
+     * @return {@code true} if the creature should be killed, otherwise {@code false}.
+     */
+    boolean shouldWeKillThisCreature(MultiverseWorld w, Entity e);
 }
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.ArrayList;
@@ -34,7 +35,11 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "otherthing");
        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething " + ChatColor.RED + "-d");
        this.addCommandExample("/mv anchors ");
-        this.setPermission("multiverse.core.anchor", "Allows management of Anchor Destinations.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.anchor.list", "Allows a player to list all anchors.", PermissionDefault.OP);
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.create",
+                "Allows a player to create anchors.", PermissionDefault.OP));
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.delete",
+                "Allows a player to delete anchors.", PermissionDefault.OP));
        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
    }

@@ -49,6 +54,11 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
    }

    private void showList(CommandSender sender, List<String> args) {
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.list", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to list anchors!");
+            return;
+        }
+
        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse Anchor List ]====");
        Player p = null;
        if (sender instanceof Player) {
@@ -105,10 +115,14 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
            return;
        }
        if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
-            if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
-                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
+            if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.delete", true)) {
+                sender.sendMessage(ChatColor.RED + "You don't have the permission to delete anchors!");
            } else {
-                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
+                if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
+                    sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
+                } else {
+                    sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
+                }
            }
            return;
        }
@@ -118,13 +132,16 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
            return;
        }

-        Player player = (Player) sender;
-        if (this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), player.getLocation())) {
-            sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.GREEN + "created!");
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.create", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to create anchors!");
        } else {
-            sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
+            Player player = (Player) sender;
+            if (this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), player.getLocation())) {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.GREEN + "created!");
+            } else {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
+            }
        }
-
    }

    @Override
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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 java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+
+/**
+ * Creates a clone of a world.
+ */
+public class CloneCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public CloneCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Clone World");
+        this.setCommandUsage("/mv clone" + ChatColor.GREEN + " {TARGET} {NAME}" + ChatColor.GOLD + " -g [GENERATOR[:ID]]");
+        this.setArgRange(2, 4); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.addKey("mvclone");
+        this.addKey("mvcl");
+        this.addKey("mv cl");
+        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.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        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 " + oldName + ", so we can't clone it!");
+            sender.sendMessage("Check the " + ChatColor.GREEN + "/mv list" + ChatColor.WHITE + " command to verify it is listed.");
+            return;
+        }
+        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.");
        }
@@ -18,6 +18,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 /**
@@ -65,7 +67,13 @@ public class CreateCommand extends MultiverseCommand {
            }
        }

-        if (worldFile.exists() || this.worldManager.isMVWorld(worldName)) {
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
+                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
+            return;
+        }
+
+        if (worldFile.exists()) {
            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
            return;
@@ -88,7 +96,19 @@ public class CreateCommand extends MultiverseCommand {
            EnvironmentCommand.showWorldTypes(sender);
            return;
        }
-
+        // Determine if the generator is valid. #918
+        if (generator != null) {
+            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
+            if (genarray.size() < 2) {
+                // If there was only one arg specified, pad with another empty one.
+                genarray.add("");
+            }
+            if (this.worldManager.getChunkGenerator(genarray.get(0), genarray.get(1), "test") == null) {
+                // We have an invalid generator.
+                sender.sendMessage("Invalid generator! '" + generator + "'. " + ChatColor.RED + "Aborting world creation.");
+                return;
+            }
+        }
        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");

        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
@@ -23,7 +23,7 @@ public class DebugCommand extends MultiverseCommand {
    public DebugCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Turn Debug on/off?");
-        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off]");
+        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
        this.setArgRange(0, 1);
        this.addKey("mv debug");
        this.addKey("mv d");
@@ -48,17 +48,18 @@ public class DebugCommand extends MultiverseCommand {
                    sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
                            + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
                }
-
            }
+            plugin.saveMVConfigs();
        }
        this.displayDebugMode(sender);
    }

    private void displayDebugMode(CommandSender sender) {
-        if (plugin.getMVConfig().getGlobalDebug() == 0) {
+        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
+        if (debugLevel == 0) {
            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
        } else {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + plugin.getMVConfig().getGlobalDebug());
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
        }
    }
@@ -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!");
    }
 }
@@ -53,8 +53,8 @@ public class EnvironmentCommand extends MultiverseCommand {
     */
    public static void showWorldTypes(CommandSender sender) {
        sender.sendMessage(ChatColor.YELLOW + "Valid World Types are:");
-        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT %sor %sVERSION_1_1",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.GOLD));
+        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT, %sLARGEBIOMES %sor %sVERSION_1_1",
+                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
    }

    @Override
@@ -71,10 +71,15 @@ 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";
+        } 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
            // to a friendly one, get it from the ENUM!
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * 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.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GameruleCommand extends MultiverseCommand {
+
+    public GameruleCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Set a Minecraft Game Rule for a World.");
+        this.setCommandUsage("/mv gamerule " + ChatColor.GREEN + "{RULE} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mv gamerule");
+        this.addKey("mv rule");
+        this.addKey("mvgamerule");
+        this.addKey("mvrule");
+        this.addCommandExample("/mv gamerule " + ChatColor.GREEN + "doMobLoot false");
+        this.addCommandExample("/mvrule " + ChatColor.GREEN + "keepInventory true " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.set", "Allows a player to set a gamerule.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final String gameRule = args.get(0);
+        final String value = args.get(1);
+        final World world;
+        if (args.size() == 2) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(2));
+        }
+
+        if (world.setGameRuleValue(gameRule, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+        } else {
+            sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " cannot be set to " + ChatColor.RED + value);
+        }
+    }
+}
@@ -0,0 +1,76 @@
+/******************************************************************************
+ * 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.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GamerulesCommand extends MultiverseCommand {
+
+    public GamerulesCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("List the Minecraft Game Rules for a World.");
+        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(0, 1);
+        this.addKey("mv gamerules");
+        this.addKey("mv rules");
+        this.addKey("mvgamerules");
+        this.addKey("mvrules");
+        this.addCommandExample("/mv gamerules");
+        this.addCommandExample("/mvrules " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.list", "Allows a player to list gamerules.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 0 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final World world;
+        if (args.size() == 0) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(0));
+        }
+
+        final StringBuilder gameRules = new StringBuilder();
+        for (final String gameRule : world.getGameRules()) {
+            if (gameRules.length() != 0) {
+                gameRules.append(ChatColor.WHITE).append(", ");
+            }
+            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
+            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(gameRule));
+        }
+        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
+        sender.sendMessage(gameRules.toString());
+    }
+}
@@ -7,6 +7,7 @@

 package com.onarandombox.MultiverseCore.commands;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -15,7 +16,6 @@ import org.bukkit.plugin.Plugin;

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

 /**
 * Returns a list of loaded generator plugins.
@@ -37,7 +37,7 @@ public class GeneratorCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.log(Level.INFO, "PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
+        Logging.info("PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
        Plugin[] plugins = this.plugin.getServer().getPluginManager().getPlugins();
        List<String> generators = new ArrayList<String>();
        for (Plugin p : plugins) {
@@ -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!");
        }
    }
 }
@@ -122,10 +122,16 @@ public class InfoCommand extends MultiverseCommand {
        //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
        Location spawn = world.getSpawnLocation();
        message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
-        message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
+        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) {
            message.add(new FancyMessage("Price to enter this world: ",
-                    this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
+                    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));
        }
@@ -175,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 {
@@ -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;
        }

@@ -85,6 +85,9 @@ public class ModifyAddCommand extends MultiverseCommand {
        if (world.addToVariable(property, value)) {
            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA
                    + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
        } else {
            sender.sendMessage(value + " could not be added to " + property);
        }
@@ -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
@@ -80,6 +80,9 @@ public class ModifyClearCommand extends MultiverseCommand {
            sender.sendMessage(property + " was cleared. It contains 0 values now.");
            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was "
                    + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now.");
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
        } else {
            sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
                    + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");
@@ -78,13 +78,16 @@ 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
        if (world.removeFromVariable(property, value)) {
            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE
                    + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
        } else {
            sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY
                    + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);
@@ -111,6 +111,9 @@ public class ModifySetCommand extends MultiverseCommand {
            if (world.setPropertyValue(property, value)) {
                sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
                        + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+                if (!plugin.saveWorldConfig()) {
+                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+                }
            } else {
                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
            }
@@ -0,0 +1,54 @@
+/******************************************************************************
+ * 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 java.io.File;
+import java.util.List;
+
+/**
+ * States who is in what world.
+ */
+public class ScriptCommand extends MultiverseCommand {
+
+    public ScriptCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Runs a script.");
+        this.setCommandUsage("/mv script" + ChatColor.GOLD + " {script} [target]");
+        this.setArgRange(1, 2);
+        this.addKey("mv script");
+        this.addKey("mvscript");
+        this.addCommandExample(String.format("/mv script %sscript.txt", ChatColor.GOLD));
+        this.addCommandExample(String.format("/mv script %stest.txt %ssomeplayer", ChatColor.GOLD, ChatColor.GREEN));
+        this.setPermission("multiverse.core.script", "Runs a script.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
+        if (!file.exists()) {
+            sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");
+            return;
+        }
+        Player player = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+        }
+        String target = null;
+        if (args.size() == 2) {
+            target = args.get(1);
+        }
+        plugin.getScriptAPI().executeScript(file, target, player);
+        sender.sendMessage(String.format("Script '%s%s%s' finished!", ChatColor.GOLD, file.getName(), ChatColor.WHITE));
+    }
+}
@@ -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,40 +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()));
-            } 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).");
        }
    }
 }
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * 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.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Enables debug-information.
+ */
+public class SilentCommand extends MultiverseCommand {
+
+    public SilentCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Turn silent mode on/off?");
+        this.setCommandUsage("/mv silent" + ChatColor.GOLD + " [true|false|on|off]");
+        this.setArgRange(0, 1);
+        this.addKey("mv silent");
+        this.addKey("mvsilent");
+        this.addCommandExample("/mv silent " + ChatColor.GOLD + "true");
+        this.setPermission("multiverse.core.silent", "Reduces the amount of startup messages.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("on")) {
+                args.set(0, "true");
+            }
+            plugin.getMVConfig().setSilentStart(Boolean.valueOf(args.get(0)));
+            plugin.saveMVConfigs();
+        }
+        this.displaySilentMode(sender);
+    }
+
+    private void displaySilentMode(CommandSender sender) {
+        if (plugin.getMVConfig().getSilentStart()) {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.GREEN + "ON");
+        } else {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.RED + "OFF");
+        }
+    }
+}
@@ -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);
@@ -7,6 +7,7 @@

 package com.onarandombox.MultiverseCore.commands;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
 import com.onarandombox.MultiverseCore.utils.webpaste.BitlyURLShortener;
@@ -15,14 +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.logging.Level;
+import java.util.Map;

 /**
 * Dumps version info to the console.
@@ -33,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");
@@ -42,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.
@@ -49,70 +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().size()).append('\n');
-        buffer.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
-        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) {
-            this.plugin.log(Level.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);
-                    plugin.log(Level.INFO, "Version info dumped here: " + 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(), ", ");
+    }
 }
@@ -15,6 +15,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;

 /**
@@ -50,6 +52,14 @@ public class WhoCommand extends MultiverseCommand {
            showAll = false;
        }

+        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);
+            }
+        }
+
        if (args.size()  == 1) {
            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
                showAll = true;
@@ -68,18 +78,19 @@ public class WhoCommand extends MultiverseCommand {

                sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
                        world.getColoredWorldString(), ChatColor.AQUA));
-                sender.sendMessage(buildPlayerString(world));
+                sender.sendMessage(this.buildPlayerString(world, p, visiblePlayers));
                return;
            }
        }

        // multiworld mode
-        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players ---");
+        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
+                + visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
        boolean shownOne = false;
        for (MultiverseWorld world : this.worldManager.getMVWorlds()) {
            if (this.plugin.getMVPerms().canEnterWorld(p, world)) { // only show world if the player can access it
                if (showAll || !world.getCBWorld().getPlayers().isEmpty()) { // either show all or show if the world is not empty
-                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world)));
+                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world, p, visiblePlayers)));
                    shownOne = true;
                }
            }
@@ -90,17 +101,18 @@ public class WhoCommand extends MultiverseCommand {
        return;
    }

-    private static String buildPlayerString(MultiverseWorld world) {
+    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
+        // Retrieve the players in this world
        List<Player> players = world.getCBWorld().getPlayers();
-        if (players.size() == 0) {
-            return "No players found.";
-        } else {
-            StringBuilder playerBuilder = new StringBuilder();
-            for (Player player : players) {
+        StringBuilder playerBuilder = new StringBuilder();
+        for (Player player : players) {
+            // If the viewer is the console or the viewier is allowed to see the player, show them.
+            // Make sure we're also ONLY showing online players.
+            // Since we already checked visible players, we'll just make sure who we're about to show is in that.
+            if (visiblePlayers.contains(player))
                playerBuilder.append(player.getDisplayName()).append(", ");
-            }
-            String bString = playerBuilder.toString();
-            return bString.substring(0, bString.length() - 2);
        }
+        String bString = playerBuilder.toString();
+        return (bString.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
    }
 }
@@ -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();
-}
@@ -17,6 +17,8 @@ public class SubSpawnSettings extends SerializationConfig {
    @Property
    private boolean spawn;
    @Property
+    private int spawnrate;
+    @Property
    private List<String> exceptions;

    public SubSpawnSettings() {
@@ -34,6 +36,7 @@ public class SubSpawnSettings extends SerializationConfig {
    public void setDefaults() {
        spawn = true;
        exceptions = new ArrayList<String>();
+        spawnrate = -1;
    }

    /**
@@ -51,9 +54,23 @@ public class SubSpawnSettings extends SerializationConfig {
    }

    /**
-     * @return the exceptions
+     * @return The exceptions
     */
    public List<String> getExceptions() {
        return exceptions;
    }
+
+    /**
+     * @param rate The new spawn rate
+     */
+    public void setSpawnRate(int rate) {
+        this.spawnrate = rate;
+    }
+
+    /**
+     * @return The spawn rate
+     */
+    public int getSpawnRate() {
+        return this.spawnrate;
+    }
 }
@@ -7,8 +7,13 @@

 package com.onarandombox.MultiverseCore.destination;

+import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+
+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.plugin.java.JavaPlugin;
@@ -18,9 +23,11 @@ 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;

    /**
     * {@inheritDoc}
@@ -36,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;
    }

@@ -46,7 +61,14 @@ public class BedDestination implements MVDestination {
    @Override
    public Location getLocation(Entity entity) {
        if (entity instanceof Player) {
-            this.knownBedLoc = ((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("The bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
+            }
            return this.knownBedLoc;
        }
        return null;
@@ -65,7 +87,7 @@ public class BedDestination implements MVDestination {
     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
-        // Not needed.
+        this.plugin = (MultiverseCore) plugin;
    }

    /**
@@ -114,6 +136,6 @@ public class BedDestination implements MVDestination {

    @Override
    public String toString() {
-        return "b:playerbed";
+        return playername.isEmpty() ? OLD_BED_STRING : ("b:" + playername);
    }
 }
@@ -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();
+}
@@ -21,9 +21,10 @@ import java.util.List;
 * An exact {@link MVDestination}.
 */
 public class ExactDestination implements MVDestination {
-    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
+    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~)";
    private boolean isValid;
    private Location location;
+    private boolean relativeX, relativeY, relativeZ;

    /**
     * {@inheritDoc}
@@ -88,7 +89,20 @@ public class ExactDestination implements MVDestination {
     */
    @Override
    public Location getLocation(Entity e) {
-        return this.location;
+        Location loc = this.location.clone();
+        if (relativeX || relativeY || relativeZ) {
+            Location eLoc = e.getLocation();
+            loc.add(relativeX ? eLoc.getX() : 0, relativeY ? eLoc.getY() : 0, relativeZ ? eLoc.getZ() : 0);
+            // Since the location is relative, it makes sense to use the entity's pitch and yaw unless those were
+            // specified in the destination.
+            if (loc.getPitch() == 0) {
+                loc.setPitch(eLoc.getPitch());
+            }
+            if (loc.getYaw() == 0) {
+                loc.setYaw(eLoc.getYaw());
+            }
+        }
+        return loc;
    }

    /**
@@ -134,11 +148,42 @@ public class ExactDestination implements MVDestination {
        double[] coords = new double[3];
        String[] coordString = parsed.get(2).split(",");
        for (int i = 0; i < 3; i++) {
-            try {
-                coords[i] = Double.parseDouble(coordString[i]);
-            } catch (NumberFormatException e) {
-                this.isValid = false;
-                return;
+            String[] relSplit = coordString[i].split("~");
+            boolean relative = false;
+            if (relSplit.length == 0) {
+                // coord is "~" form
+                relative = true;
+                coords[i] = 0;
+            } else if (relSplit.length == 1) {
+                // coord is "123" form
+                try {
+                    coords[i] = Double.parseDouble(relSplit[0]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            } else {
+                // coord is "~123" form
+                relative = true;
+                try {
+                    coords[i] = Double.parseDouble(relSplit[1]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            }
+            if (relative) {
+                switch (i) {
+                    case 0:
+                        relativeX = true;
+                        break;
+                    case 1:
+                        relativeY = true;
+                        break;
+                    case 2:
+                        relativeZ = true;
+                        break;
+                }
            }
        }
        this.location.setX(coords[0]);
@@ -184,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;
    }

    /**
@@ -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);
+    }
 }
@@ -11,49 +11,33 @@ import org.bukkit.ChatColor;

 /**
 * A regular {@link ChatColor} represented by an english string.
+ * @see ChatColor
 */
 public enum EnglishChatColor {
-    /*
-     * I know. this is quite ugly.
-     */
-    /** AQUA. */
-    AQUA("AQUA", ChatColor.AQUA),
-    /** BLACK. */
-    BLACK("BLACK", ChatColor.BLACK),
-    /** BLUE. */
-    BLUE("BLUE", ChatColor.BLUE),
-    /** DARKAQUA. */
-    DARKAQUA("DARKAQUA", ChatColor.DARK_AQUA),
-    /** DARKBLUE. */
-    DARKBLUE("DARKBLUE", ChatColor.DARK_BLUE),
-    /** DARKGRAY. */
-    DARKGRAY("DARKGRAY", ChatColor.DARK_GRAY),
-    /** DARKGREEN. */
-    DARKGREEN("DARKGREEN", ChatColor.DARK_GREEN),
-    /** DARKPURPLE. */
-    DARKPURPLE("DARKPURPLE", ChatColor.DARK_PURPLE),
-    /** DARKRED. */
-    DARKRED("DARKRED", ChatColor.DARK_RED),
-    /** GOLD. */
-    GOLD("GOLD", ChatColor.GOLD),
-    /** GRAY. */
-    GRAY("GRAY", ChatColor.GRAY),
-    /** GREEN. */
-    GREEN("GREEN", ChatColor.GREEN),
-    /** LIGHTPURPLE. */
-    LIGHTPURPLE("LIGHTPURPLE", ChatColor.LIGHT_PURPLE),
-    /** RED. */
-    RED("RED", ChatColor.RED),
-    /** YELLOW. */
-    YELLOW("YELLOW", ChatColor.YELLOW),
-    /** WHITE. */
-    WHITE("WHITE", ChatColor.WHITE);
-    private ChatColor color;
-    private String text;
+    // BEGIN CHECKSTYLE-SUPPRESSION: JavadocVariable
+    AQUA(ChatColor.AQUA),
+    BLACK(ChatColor.BLACK),
+    BLUE(ChatColor.BLUE),
+    DARKAQUA(ChatColor.DARK_AQUA),
+    DARKBLUE(ChatColor.DARK_BLUE),
+    DARKGRAY(ChatColor.DARK_GRAY),
+    DARKGREEN(ChatColor.DARK_GREEN),
+    DARKPURPLE(ChatColor.DARK_PURPLE),
+    DARKRED(ChatColor.DARK_RED),
+    GOLD(ChatColor.GOLD),
+    GRAY(ChatColor.GRAY),
+    GREEN(ChatColor.GREEN),
+    LIGHTPURPLE(ChatColor.LIGHT_PURPLE),
+    RED(ChatColor.RED),
+    YELLOW(ChatColor.YELLOW),
+    WHITE(ChatColor.WHITE);
+    // END CHECKSTYLE-SUPPRESSION: JavadocVariable

-    EnglishChatColor(String name, ChatColor color) {
+    private final ChatColor color;
+    //private final String text;
+
+    EnglishChatColor(ChatColor color) {
        this.color = color;
-        this.text = name;
    }

    /**
@@ -61,7 +45,7 @@ public enum EnglishChatColor {
     * @return The text.
     */
    public String getText() {
-        return this.text;
+        return this.name();
    }

    /**
@@ -92,7 +76,7 @@ public enum EnglishChatColor {
    public static EnglishChatColor fromString(String text) {
        if (text != null) {
            for (EnglishChatColor c : EnglishChatColor.values()) {
-                if (text.equalsIgnoreCase(c.text)) {
+                if (text.equalsIgnoreCase(c.name())) {
                    return c;
                }
            }
@@ -0,0 +1,49 @@
+package com.onarandombox.MultiverseCore.enums;
+
+import org.bukkit.ChatColor;
+
+/**
+ * A regular {@link ChatColor} represented by an english string.
+ * @see ChatColor
+ */
+public enum EnglishChatStyle {
+    // BEGIN CHECKSTYLE-SUPPRESSION: JavadocVariable
+    /** No style. */
+    NORMAL(null),
+    MAGIC(ChatColor.MAGIC),
+    BOLD(ChatColor.BOLD),
+    STRIKETHROUGH(ChatColor.STRIKETHROUGH),
+    UNDERLINE(ChatColor.UNDERLINE),
+    ITALIC(ChatColor.ITALIC);
+    // END CHECKSTYLE-SUPPRESSION: JavadocVariable
+
+    private final ChatColor color;
+
+    EnglishChatStyle(ChatColor color) {
+        this.color = color;
+    }
+
+    /**
+     * Gets the color.
+     * @return The color as {@link ChatColor}.
+     */
+    public ChatColor getColor() {
+        return color;
+    }
+
+    /**
+     * Constructs an {@link EnglishChatStyle} from a {@link String}.
+     * @param text The {@link String}.
+     * @return The {@link EnglishChatStyle}.
+     */
+    public static EnglishChatStyle fromString(String text) {
+        if (text != null) {
+            for (EnglishChatStyle c : EnglishChatStyle.values()) {
+                if (text.equalsIgnoreCase(c.name())) {
+                    return c;
+                }
+            }
+        }
+        return null;
+    }
+}
@@ -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'.
@@ -0,0 +1,35 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+
+/**
+ * A wrapper for the {@link AsyncPlayerChatEvent}.
+ */
+public class AsyncChatEvent implements ChatEvent {
+    private final AsyncPlayerChatEvent event;
+
+    public AsyncChatEvent(AsyncPlayerChatEvent event) {
+        this.event = event;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return event.isCancelled();
+    }
+
+    @Override
+    public String getFormat() {
+        return event.getFormat();
+    }
+
+    @Override
+    public void setFormat(String s) {
+        event.setFormat(s);
+    }
+
+    @Override
+    public Player getPlayer() {
+        return event.getPlayer();
+    }
+}
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+
+/**
+ * A wrapper for the two chat-events in Bukkit.
+ */
+public interface ChatEvent {
+    /**
+     * @return Whether this event is cancelled.
+     */
+    boolean isCancelled();
+
+    /**
+     * @return The format.
+     */
+    String getFormat();
+
+    /**
+     * Sets the format.
+     * @param s The new format.
+     */
+    void setFormat(String s);
+
+    /**
+     * @return The player.
+     */
+    Player getPlayer();
+}
@@ -0,0 +1,34 @@
+/******************************************************************************
+ * 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 java.util.logging.Level;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+
+/**
+ * Multiverse's {@link org.bukkit.event.Listener} for players.
+ */
+public class MVAsyncPlayerChatListener extends MVChatListener {
+    public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
+        super(plugin, playerListener);
+        plugin.log(Level.FINE, "Created AsyncPlayerChatEvent listener.");
+    }
+
+    /**
+     * This method is called when a player wants to chat.
+     * @param event The Event that was fired.
+     */
+    @EventHandler
+    public void playerChat(AsyncPlayerChatEvent event) {
+        this.playerChat(new AsyncChatEvent(event));
+    }
+}
@@ -0,0 +1,59 @@
+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;
+
+/**
+ * Multiverse's {@link org.bukkit.event.Listener} for players.
+ */
+public abstract class MVChatListener implements Listener {
+    private final MultiverseCore plugin;
+    private final MVWorldManager worldManager;
+    private final MVPlayerListener playerListener;
+
+    public MVChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
+        this.plugin = plugin;
+        this.worldManager = plugin.getMVWorldManager();
+        this.playerListener = playerListener;
+    }
+
+    /**
+     * This handles a {@link ChatEvent}.
+     * @param event The {@link ChatEvent}.
+     */
+    public void playerChat(ChatEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+        // Check whether the Server is set to prefix the chat with the World name.
+        // If not we do nothing, if so we need to check if the World has an Alias.
+        if (plugin.getMVConfig().getPrefixChat()) {
+            String world = playerListener.getPlayerWorld().get(event.getPlayer().getName());
+            if (world == null) {
+                world = event.getPlayer().getWorld().getName();
+                playerListener.getPlayerWorld().put(event.getPlayer().getName(), world);
+            }
+            String prefix = "";
+            // If we're not a MV world, don't do anything
+            if (!this.worldManager.isMVWorld(world)) {
+                return;
+            }
+            MultiverseWorld mvworld = this.worldManager.getMVWorld(world);
+            if (mvworld.isHidden()) {
+                return;
+            }
+            prefix = mvworld.getColoredWorldString();
+            String chat = event.getFormat();
+            
+            String prefixChatFormat = plugin.getMVConfig().getPrefixChatFormat();
+            prefixChatFormat = prefixChatFormat.replace("%world%", prefix).replace("%chat%", chat);
+            prefixChatFormat = ChatColor.translateAlternateColorCodes('&', prefixChatFormat);
+            
+            event.setFormat(prefixChatFormat);
+        }
+    }
+}
@@ -11,13 +11,8 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.World;
-import org.bukkit.entity.Animals;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Ghast;
-import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Squid;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
@@ -26,14 +21,12 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.FoodLevelChangeEvent;

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

 /**
 * Multiverse's Entity {@link Listener}.
 */
 public class MVEntityListener implements Listener {
-
    private MultiverseCore plugin;
    private MVWorldManager worldManager;

@@ -87,7 +80,8 @@ public class MVEntityListener implements Listener {
    public void creatureSpawn(CreatureSpawnEvent event) {
        // Check to see if the Creature is spawned by a plugin, we don't want to prevent this behaviour.
        // TODO: Allow the egg thing to be a config param. Doubt this will be per world; seems silly.
-        if (event.getSpawnReason() == SpawnReason.CUSTOM || event.getSpawnReason() == SpawnReason.SPAWNER_EGG) {
+        if (event.getSpawnReason() == SpawnReason.CUSTOM || event.getSpawnReason() == SpawnReason.SPAWNER_EGG
+                || event.getSpawnReason() == SpawnReason.BREEDING) {
            return;
        }

@@ -100,53 +94,16 @@ public class MVEntityListener implements Listener {
            return;

        EntityType type = event.getEntityType();
-        MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
-
        /**
         * Handle people with non-standard animals: ie a patched craftbukkit.
         */
-        if (type == null) {
+        if (type == null || type.getName() == null) {
            this.plugin.log(Level.FINER, "Found a null typed creature.");
            return;
        }

-        /**
-         * Animal Handling
-         */
-        if (!event.isCancelled() && (event.getEntity() instanceof Animals || event.getEntity() instanceof Squid)) {
-            event.setCancelled(shouldWeKillThisCreature(mvworld.getAnimalList(), mvworld.canAnimalsSpawn(), type.getName().toUpperCase()));
-        }
-        /**
-         * Monster Handling
-         */
-        if (!event.isCancelled() && (event.getEntity() instanceof Monster || event.getEntity() instanceof Ghast || event.getEntity() instanceof Slime)) {
-            event.setCancelled(shouldWeKillThisCreature(mvworld.getMonsterList(), mvworld.canMonstersSpawn(), type.getName().toUpperCase()));
-        }
-    }
-
-    private static boolean shouldWeKillThisCreature(List<String> creatureList, boolean allowCreatureSpawning, String creature) {
-        if (creatureList.isEmpty() && allowCreatureSpawning) {
-            // 1. There are no exceptions and animals are allowed. Save it.
-            return false;
-        } else if (creatureList.isEmpty()) {
-            // 2. There are no exceptions and animals are NOT allowed. Kill it.
-            return true;
-        } else if (creatureList.contains(creature.toUpperCase()) && allowCreatureSpawning) {
-            // 3. There ARE exceptions and animals ARE allowed. Kill it.
-            return true;
-        } else if (!creatureList.contains(creature.toUpperCase()) && allowCreatureSpawning) {
-            // 4. There ARE exceptions and animals ARE NOT allowed. SAVE it.
-            return false;
-        } else if (creatureList.contains(creature.toUpperCase()) && !allowCreatureSpawning) {
-            // 5. No animals are allowed to be spawned, BUT this one can stay...
-            return false;
-        } else if (!creatureList.contains(creature.toUpperCase()) && !allowCreatureSpawning) {
-            // 6. Animals are NOT allowed to spawn, and this creature is not in the save list... KILL IT
-            return true;
-        } else {
-            // This code should NEVER execute. I just left the verbose conditions in right now.
-            throw new UnsupportedOperationException();
-        }
+        MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
+        event.setCancelled(this.plugin.getMVWorldManager().getTheWorldPurger().shouldWeKillThisCreature(mvworld, event.getEntity()));
    }

 }
@@ -0,0 +1,43 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.MapInitializeEvent;
+import org.bukkit.map.MapView;
+
+/**
+ * A listener for bukkit map events.
+ */
+public class MVMapListener implements Listener {
+
+    private final MultiverseCore plugin;
+
+    public MVMapListener(final MultiverseCore plugin) {
+        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().getDurability() == event.getMap().getId()) {
+                final Location playerLoc = player.getLocation();
+                final MapView map = event.getMap();
+                map.setCenterX(playerLoc.getBlockX());
+                map.setCenterZ(playerLoc.getBlockZ());
+                map.setWorld(playerLoc.getWorld());
+                return;
+            }
+        }
+    }
+}
@@ -0,0 +1,35 @@
+/******************************************************************************
+ * 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 java.util.logging.Level;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerChatEvent;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+
+/**
+ * Multiverse's {@link org.bukkit.event.Listener} for players.
+ */
+@SuppressWarnings("deprecation") // this exists only for downwards compatibility
+public class MVPlayerChatListener extends MVChatListener {
+    public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
+        super(plugin, playerListener);
+        plugin.log(Level.FINE, "Registered PlayerChatEvent listener.");
+    }
+
+    /**
+     * This method is called when a player wants to chat.
+     * @param event The Event that was fired.
+     */
+    @EventHandler
+    public void playerChat(PlayerChatEvent event) {
+        this.playerChat(new NormalChatEvent(event));
+    }
+}
@@ -7,11 +7,17 @@

 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 org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -21,55 +27,33 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;

-import java.util.logging.Level;
-
 /**
 * Multiverse's {@link Listener} for players.
 */
 public class MVPlayerListener implements Listener {
-    private MultiverseCore plugin;
-    private MVWorldManager worldManager;
-    private PermissionTools pt;
+    private final MultiverseCore plugin;
+    private final MVWorldManager worldManager;
+    private final PermissionTools pt;

+    private final Map<String, String> playerWorld = new ConcurrentHashMap<String, String>();

    public MVPlayerListener(MultiverseCore plugin) {
        this.plugin = plugin;
        worldManager = plugin.getMVWorldManager();
        pt = new PermissionTools(plugin);
    }
+
    /**
-     * This method is called when a player wants to chat.
-     * @param event The Event that was fired.
+     * @return the playerWorld-map
     */
-    @EventHandler
-    public void playerChat(PlayerChatEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        // Check whether the Server is set to prefix the chat with the World name.
-        // If not we do nothing, if so we need to check if the World has an Alias.
-        if (plugin.getMVConfig().getPrefixChat()) {
-            String world = event.getPlayer().getWorld().getName();
-            String prefix = "";
-            // If we're not a MV world, don't do anything
-            if (!this.worldManager.isMVWorld(world)) {
-                return;
-            }
-            MultiverseWorld mvworld = this.worldManager.getMVWorld(world);
-            if (mvworld.isHidden()) {
-                return;
-            }
-            prefix = mvworld.getColoredWorldString();
-            String format = event.getFormat();
-            event.setFormat("[" + prefix + "]" + format);
-        }
+    public Map<String, String> getPlayerWorld() {
+        return playerWorld;
    }

    /**
@@ -128,8 +112,8 @@ public class MVPlayerListener implements Listener {
        if (!p.hasPlayedBefore()) {
            this.plugin.log(Level.FINER, "Player joined for the FIRST time!");
            if (plugin.getMVConfig().getFirstSpawnOverride()) {
-                this.plugin.log(Level.FINE, String.format("Moving NEW player to(firstspawnoverride): %s",
-                        worldManager.getFirstSpawnWorld().getSpawnLocation()));
+                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): "
+                        + worldManager.getFirstSpawnWorld().getSpawnLocation());
                this.sendPlayerToDefaultWorld(p);
            }
            return;
@@ -142,7 +126,8 @@ public class MVPlayerListener implements Listener {
            }
        }
        // Handle the Players GameMode setting for the new world.
-        this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
+        this.handleGameModeAndFlight(event.getPlayer(), event.getPlayer().getWorld());
+        playerWorld.put(p.getName(), p.getWorld().getName());
    }

    /**
@@ -152,7 +137,8 @@ public class MVPlayerListener implements Listener {
    @EventHandler(priority = EventPriority.MONITOR)
    public void playerChangedWorld(PlayerChangedWorldEvent event) {
        // Permissions now determine whether or not to handle a gamemode.
-        this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
+        this.handleGameModeAndFlight(event.getPlayer(), event.getPlayer().getWorld());
+        playerWorld.put(event.getPlayer().getName(), event.getPlayer().getWorld().getName());
    }

    /**
@@ -170,9 +156,8 @@ public class MVPlayerListener implements Listener {
     */
    @EventHandler(priority = EventPriority.HIGHEST)
    public void playerTeleport(PlayerTeleportEvent event) {
-        this.plugin.log(Level.FINER, String.format(
-                "Got teleport event for player '%s' with cause '%s'",
-                event.getPlayer().getName(), event.getCause()));
+        this.plugin.log(Level.FINER, "Got teleport event for player '"
+                + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
        if (event.isCancelled()) {
            return;
        }
@@ -187,14 +172,19 @@ public class MVPlayerListener implements Listener {
                teleporter = this.plugin.getServer().getPlayer(teleporterName);
            }
        }
-        this.plugin.log(Level.FINER, String.format("Inferred sender '%s' from name '%s', fetched from name '%s'",
-                teleporter, teleporterName, teleportee.getName()));
+        this.plugin.log(Level.FINER, "Inferred sender '" + teleporter + "' from name '"
+                + teleporterName + "', fetched from name '" + teleportee.getName() + "'");
        MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());
        MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
+        if (toWorld == null) {
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' is teleporting to world '"
+                    + 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, String.format("Player '%s' is teleporting to the same world.",
-                    teleportee.getName()));
+            this.plugin.log(Level.FINER, "Player '" + teleportee.getName() + "' is teleporting to the same world.");
            this.stateSuccess(teleportee.getName(), toWorld.getAlias());
            return;
        }
@@ -202,33 +192,51 @@ public class MVPlayerListener implements Listener {
        // Charge the teleporter
        event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, teleporter, teleportee, true));
        if (event.isCancelled() && teleporter != null) {
-            this.plugin.log(Level.FINE, String.format(
-                    "Player '%s' was DENIED ACCESS to '%s' because '%s' don't have the FUNDS required to enter it.",
-                    teleportee.getName(), toWorld.getAlias(), teleporter.getName()));
-
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+                    + "' was DENIED ACCESS to '" + toWorld.getAlias()
+                    + "' because '" + teleporter.getName()
+                    + "' don't have the FUNDS required to enter it.");
            return;
        }
+
+        // Check if player is allowed to enter the world if we're enforcing permissions
        if (plugin.getMVConfig().getEnforceAccess()) {
            event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, teleporter, teleportee));
            if (event.isCancelled() && teleporter != null) {
-                this.plugin.log(Level.FINE, String.format(
-                        "Player '%s' was DENIED ACCESS to '%s' because '%s' don't have: multiverse.access.%s",
-                        teleportee.getName(), toWorld.getAlias(), teleporter.getName(),
-                        event.getTo().getWorld().getName()));
-            } else {
-                this.stateSuccess(teleportee.getName(), toWorld.getAlias());
+                this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+                        + "' was DENIED ACCESS to '" + toWorld.getAlias()
+                        + "' because '" + teleporter.getName()
+                        + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
+                return;
            }
        } else {
-            this.plugin.log(Level.FINE, String.format(
-                    "Player '%s' was allowed to go to '%s' because enforceaccess is off.",
-                    teleportee.getName(), toWorld.getAlias()));
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+                    + "' was allowed to go to '" + toWorld.getAlias() + "' because enforceaccess is off.");
        }
+
+        // Does a limit actually exist?
+        if (toWorld.getPlayerLimit() > -1) {
+            // Are there equal or more people on the world than the limit?
+            if (toWorld.getCBWorld().getPlayers().size() >= toWorld.getPlayerLimit()) {
+                // Ouch the world is full, lets see if the player can bypass that limitation
+                if (!pt.playerCanBypassPlayerLimit(toWorld, teleporter, teleportee)) {
+                    this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+                            + "' 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;
+                }
+            }
+        }
+
+        // By this point anything cancelling the event has returned on the method, meaning the teleport is a success \o/
+        this.stateSuccess(teleportee.getName(), toWorld.getAlias());
    }

    private void stateSuccess(String playerName, String worldName) {
-        this.plugin.log(Level.FINE, String.format(
-                                        "MV-Core is allowing Player '%s' to go to '%s'.",
-                                        playerName, worldName));
+        this.plugin.log(Level.FINE, "MV-Core is allowing Player '" + playerName
+                + "' to go to '" + worldName + "'.");
    }

    /**
@@ -279,19 +287,33 @@ public class MVPlayerListener implements Listener {
        }
        event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, event.getPlayer(), event.getPlayer(), true));
        if (event.isCancelled()) {
-            this.plugin.log(Level.FINE, String.format("Player '%s' was DENIED ACCESS to '%s' because they don't have the FUNDS required to enter.",
-                    event.getPlayer().getName(), event.getTo().getWorld().getName()));
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
+                    + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
+                    + "' because they don't have the FUNDS required to enter.");
            return;
        }
        if (plugin.getMVConfig().getEnforceAccess()) {
            event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
            if (event.isCancelled()) {
-                this.plugin.log(Level.FINE, String.format("Player '%s' was DENIED ACCESS to '%s' because they don't have: multiverse.access.%s",
-                        event.getPlayer().getName(), event.getTo().getWorld().getName(), event.getTo().getWorld().getName()));
+                this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
+                        + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
+                        + "' because they don't have: multiverse.access." + event.getTo().getWorld().getName());
            }
        } else {
-            this.plugin.log(Level.FINE, String.format("Player '%s' was allowed to go to '%s' because enforceaccess is off.",
-                    event.getPlayer().getName(), event.getTo().getWorld().getName()));
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
+                    + "' was allowed to go to '" + event.getTo().getWorld().getName()
+                    + "' because enforceaccess is off.");
+        }
+        if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
+            try {
+                Class.forName("org.bukkit.TravelAgent");
+                if (event.getPortalTravelAgent() != null) {
+                    event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
+                }
+            } catch (ClassNotFoundException ignore) {
+                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
+            }
+
        }
    }

@@ -307,14 +329,14 @@ public class MVPlayerListener implements Listener {
    }

    // FOLLOWING 2 Methods and Private class handle Per Player GameModes.
-    private void handleGameMode(Player player, World world) {
+    private void handleGameModeAndFlight(Player player, World world) {

        MultiverseWorld mvWorld = this.worldManager.getMVWorld(world.getName());
        if (mvWorld != null) {
-            this.handleGameMode(player, mvWorld);
+            this.handleGameModeAndFlight(player, mvWorld);
        } else {
-            this.plugin.log(Level.FINER, String.format(
-                    "Not handling gamemode for world '%s' not managed by Multiverse.", world.getName()));
+            this.plugin.log(Level.FINER, "Not handling gamemode and flight for world '" + world.getName()
+                    + "' not managed by Multiverse.");
        }
    }

@@ -323,61 +345,40 @@ public class MVPlayerListener implements Listener {
     * @param player The {@link Player}.
     * @param world The world the player is in.
     */
-    public void handleGameMode(final Player player, final MultiverseWorld world) {
+    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 haven't moved anywhere.
-        if (!this.pt.playerCanIgnoreGameModeRestriction(world, player)) {
-            this.plugin.log(Level.FINE, "Handeling gamemode for player: " + player.getName());
-            this.plugin.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin,
+        // destination world, otherwise we'd be changing the player mode if they havent moved anywhere.
+        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()) {
-                            MultiverseCore.staticLog(Level.FINEST, "From World: " + player.getWorld());
-                            MultiverseCore.staticLog(Level.FINEST, "To World: " + 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 {
-                            MultiverseCore.staticLog(Level.FINE,
-                                    String.format("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, String.format("Player: %s is IMMUNE to gamemode changes!", player.getName()));
-        }
-    }
-
-    /**
-     * Handles the allowflight attribute for the specified {@link Player}.
-     * @param player The {@link Player}.
-     * @param world The world the player is in.
-     */
-    public void handleAllowFlight(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 haven't moved anywhere.
-        if (!this.pt.playerCanIgnoreAllowFlightRestriction(world, player)) {
-            this.plugin.log(Level.FINE, "Handeling flight for player: " + player.getName());
-            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()) {
-                            player.setAllowFlight(world.isFlightAllowed());
-                            MultiverseCore.staticLog(Level.FINER,
-                                    String.format("%s's allowFlight was set to %b!",
-                                            player.getName(), world.isFlightAllowed()));
-                        } else {
-                            MultiverseCore.staticLog(Level.FINE,
-                                    String.format("allowFlight was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'",
-                                    player.getName(), player.getWorld().getName(), world.getName()));
-                        }
-                    }
-                }, 1L);
-        } else {
-            this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to flight changes!");
-        }
    }
 }
@@ -1,59 +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) {
-        // 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.ENDER_PORTAL_FRAME) {
+            return;
+        }
+        if (event.getItem() == null || event.getItem().getType() != Material.EYE_OF_ENDER) {
+            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());
+            }
+        }
+    }
+}
@@ -0,0 +1,37 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerChatEvent;
+
+/**
+ * A wrapper for the {@link PlayerChatEvent}.
+ * @deprecated This is deprecated like the {@link PlayerChatEvent}.
+ */
+@Deprecated
+public class NormalChatEvent implements ChatEvent {
+    private final PlayerChatEvent event;
+
+    public NormalChatEvent(PlayerChatEvent event) {
+        this.event = event;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return event.isCancelled();
+    }
+
+    @Override
+    public String getFormat() {
+        return event.getFormat();
+    }
+
+    @Override
+    public void setFormat(String s) {
+        event.setFormat(s);
+    }
+
+    @Override
+    public Player getPlayer() {
+        return event.getPlayer();
+    }
+}
@@ -7,6 +7,7 @@

 package com.onarandombox.MultiverseCore.utils;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
@@ -16,7 +17,6 @@ import org.bukkit.entity.Player;

 import java.io.File;
 import java.io.IOException;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -50,10 +50,10 @@ public class AnchorManager {
            //world:x,y,z:pitch:yaw
            Location anchorLocation = plugin.getLocationManipulation().stringToLocation(anchorsSection.getString(key, ""));
            if (anchorLocation != null) {
-                MultiverseCore.staticLog(Level.INFO, "Loading anchor:  '" + key + "'...");
+                Logging.config("Loading anchor:  '%s'...", key);
                this.anchors.put(key, anchorLocation);
            } else {
-                MultiverseCore.staticLog(Level.WARNING, "The location for anchor '" + key + "' is INVALID.");
+                Logging.warning("The location for anchor '%s' is INVALID.", key);
            }

        }
@@ -140,8 +140,17 @@ public class AnchorManager {
            if (ancLoc == null) {
                continue;
            }
-            if (p.hasPermission("multiverse.access." + ancLoc.getWorld().getName())) {
+            String worldPerm = "multiverse.access." + ancLoc.getWorld().getName();
+            // Add to the list if we're not enforcing access
+            // OR
+            // We are enforcing access and the user has the permission.
+            if (!this.plugin.getMVConfig().getEnforceAccess() ||
+                    (this.plugin.getMVConfig().getEnforceAccess() && p.hasPermission(worldPerm))) {
                myAnchors.add(anchor);
+            } else {
+                Logging.finer(String.format("Not adding anchor %s to the list, user %s doesn't have the %s " +
+                        "permission and 'enforceaccess' is enabled!",
+                        anchor, p.getName(), worldPerm));
            }
        }
        return Collections.unmodifiableSet(myAnchors);
@@ -1,283 +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 org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Vehicle;
-
-import java.util.logging.Level;
-
-/**
- * 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())) {
-            MultiverseCore.staticLog(Level.FINER, "Error Here (Actual)? ("
-                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
-            MultiverseCore.staticLog(Level.FINER, "Error Here (upOne)? ("
-                + upOne.getBlock().getType() + ")[" + this.isSolidBlock(upOne.getBlock().getType()) + "]");
-            return false;
-        }
-
-        if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            MultiverseCore.staticLog(Level.FINER, "Error Here (downOne)? ("
-                + downOne.getBlock().getType() + ")[" + this.isSolidBlock(downOne.getBlock().getType()) + "]");
-            return false;
-        }
-
-        if (downOne.getBlock().getType() == Material.FIRE) {
-            MultiverseCore.staticLog(Level.FINER, "There's fire below! ("
-                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
-            return false;
-        }
-
-        if (isBlockAboveAir(actual)) {
-            MultiverseCore.staticLog(Level.FINER, "Is block above air [" + isBlockAboveAir(actual) + "]");
-            MultiverseCore.staticLog(Level.FINER, "Has 2 blocks of water below [" + 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);
+    }
+}
@@ -7,10 +7,14 @@

 package com.onarandombox.MultiverseCore.utils;

+import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.List;
 import java.util.logging.FileHandler;
 import java.util.logging.Formatter;
 import java.util.logging.Handler;
@@ -20,11 +24,13 @@ import java.util.logging.Logger;

 /**
 * The Multiverse debug-logger.
+ * @deprecated Deprecated in favor of new Logging lib.  See {@link com.dumptruckman.minecraft.util.Logging}.
 */
-public class DebugLog {
-
+@Deprecated
+public class DebugLog extends Logger {
    private FileHandler fh;
-    private Logger log;
+    private Logger standardLog = null;
+    private String prefix = "[MVCore-Debug] ";

    /**
     * Creates a new debug logger.
@@ -33,16 +39,16 @@ public class DebugLog {
     * @param file   The file to log to.
     */
    public DebugLog(String logger, String file) {
-        this.log = Logger.getLogger(logger);
-
+        super(logger, null);
        try {
            this.fh = new FileHandler(file, true);
-            this.log.setUseParentHandlers(false);
-            for (Handler handler : this.log.getHandlers()) {
-                this.log.removeHandler(handler);
+            this.setUseParentHandlers(false);
+            List<Handler> toRemove = Arrays.asList(this.getHandlers());
+            for (Handler handler : toRemove) {
+                this.removeHandler(handler);
            }
-            this.log.addHandler(this.fh);
-            this.log.setLevel(Level.ALL);
+            this.addHandler(this.fh);
+            this.setLevel(Level.ALL);
            this.fh.setFormatter(new LogFormatter());
        } catch (SecurityException e) {
            e.printStackTrace();
@@ -51,14 +57,39 @@ public class DebugLog {
        }
    }

+    /**
+     * Sets the log-tag.
+     * @param tag The new tag.
+     */
+    public void setTag(String tag) {
+        this.prefix = tag + " ";
+    }
+
+    /**
+     * Specifies the logger to use to send debug messages to as the debug logger itself only sends messages to a file.
+     *
+     * @param logger Logger to send debug messages to.
+     */
+    public void setStandardLogger(Logger logger) {
+        this.standardLog = logger;
+    }
+
    /**
     * Log a message at a certain level.
     *
     * @param level The log-{@link Level}.
     * @param msg the message.
     */
-    public void log(Level level, String msg) {
-        this.log.log(level, msg);
+    @Override
+    public void log(final Level level, final String msg) {
+        if (MultiverseCoreConfiguration.isSet() && MultiverseCoreConfiguration.getInstance().getGlobalDebug() > 0) {
+            // only redirect to standardLog if it's lower than INFO so we don't log that twice!
+            if ((level.intValue() < Level.INFO.intValue()) && (standardLog != null)) {
+                standardLog.log(Level.INFO, prefix + msg);
+            }
+
+            super.log(level, prefix + msg);
+        }
    }

    /**
@@ -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,7 +7,21 @@

 package com.onarandombox.MultiverseCore.utils;

+import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
+
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Comparator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import com.dumptruckman.minecraft.util.Logging;

 /**
 * File-utilities.
@@ -24,17 +38,79 @@ 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;
        }
    }
+
+    /**
+     * Used to delete the contents of a folder, without deleting the folder itself.
+     *
+     * @param file The folder whose contents to delete.
+     * @return true if the contents were successfully deleted
+     */
+    public static boolean deleteFolderContents(File file) {
+        try (Stream<Path> files = Files.walk(file.toPath())){
+            files.sorted(Comparator.reverseOrder())
+                    .map(Path::toFile)
+                    .filter(f -> !f.equals(file))
+                    .forEach(File::delete);
+            return true;
+        } catch (IOException e) {
+            Logging.warning(e.getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * Helper method to copy the world-folder.
+     * @param source Source-File
+     * @param target Target-File
+     * @param log A logger that logs the operation
+     *
+     * @return if it had success
+     */
+    public static boolean copyFolder(File source, File target, Logger log) {
+        Path sourceDir = source.toPath();
+        Path targetDir = target.toPath();
+
+        try {
+            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir));
+            return true;
+        } catch (IOException e) {
+            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;
+        }
+    }
 }
@@ -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."));
+            }
+        }
+    }
+}
@@ -47,21 +47,6 @@ public class MVPermissions implements PermissionsInterface {
        return p.hasPermission("mv.bypass.gamemode." + w.getName());
    }

-    /**
-     * 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 canIgnoreAllowFlightRestriction(Player p, MultiverseWorld w) {
-        if (p.hasPermission("mv.bypass.allowflight.*")) {
-            this.plugin.log(Level.FINER, "Player has mv.bypass.allowflight.* they can fly!");
-            return true;
-        }
-        return p.hasPermission("mv.bypass.allowflight." + w.getName());
-    }
-
    /**
     * Check if a Player can teleport to the Destination world from there current world.
     *
@@ -91,6 +76,10 @@ public class MVPermissions implements PermissionsInterface {
     * @return Whether the {@link CommandSender} can travel to the specified {@link Location}.
     */
    public boolean canTravelFromLocation(CommandSender sender, Location location) {
+        // Now The Bed destination can return null now.
+        if (location == null) {
+            return false;
+        }
        if (!(sender instanceof Player)) {
            return true;
        }
@@ -241,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,15 +7,16 @@

 package com.onarandombox.MultiverseCore.utils;

-import java.util.logging.Level;
-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;
 import org.bukkit.permissions.Permission;

+import java.util.logging.Level;
+
 /**
 * Utility-class for permissions.
 */
@@ -134,26 +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 (price == 0D) {
+                return true;
+            }
            // If the player does not have to pay, return now.
            if (this.plugin.getMVPerms().hasPermission(teleporter, toWorld.getExemptPermission().getName(), true)) {
                return true;
            }
-            GenericBank bank = plugin.getBank();
-            String errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency())
-                    + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
-            if (teleportee.equals(teleporter)) {
-                errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency())
-                        + " to enter " + toWorld.getColoredWorldString();
-            }
-            if (!bank.hasEnough(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
+
+            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 {
+                        economist.withdraw(teleporterPlayer, price, currency);
+                    }
+                    sendTeleportPaymentMessage(economist, teleporterPlayer, teleportee, toWorld.getColoredWorldString(), price, currency);
+                }
+            } else {
+                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;
-            } else if (pay) {
-                bank.give(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
            }
        }
        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.
@@ -230,6 +257,32 @@ public class PermissionTools {
        return true;
    }

+    /**
+     * Checks to see if a player can bypass the player limit.
+     *
+     * @param toWorld The world travelling to.
+     * @param teleporter The player that initiated the teleport.
+     * @param teleportee The player travelling.
+     * @return True if they can bypass the player limit.
+     */
+    public boolean playerCanBypassPlayerLimit(MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
+        if (teleporter == null) {
+            teleporter = teleportee;
+        }
+
+        if (!(teleporter instanceof Player)) {
+            return true;
+        }
+
+        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");
+            return false;
+        }
+    }
+
    /**
     * Checks to see if a player should bypass game mode restrictions.
     *
@@ -246,21 +299,4 @@ public class PermissionTools {
            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 this.plugin.getMVPerms().canIgnoreAllowFlightRestriction(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.
-            return true;
-        }
-    }
 }
@@ -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;
-    }
-
-}
@@ -7,23 +7,38 @@

 package com.onarandombox.MultiverseCore.utils;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.Core;
-
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
+import org.bukkit.material.Bed;

-import java.util.logging.Level;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Set;

 /**
 * The default-implementation of {@link BlockSafety}.
 */
 public class SimpleBlockSafety implements BlockSafety {
    private final Core plugin;
+    private static final Set<BlockFace> AROUND_BLOCK = EnumSet.noneOf(BlockFace.class);
+
+    static {
+        AROUND_BLOCK.add(BlockFace.NORTH);
+        AROUND_BLOCK.add(BlockFace.NORTH_EAST);
+        AROUND_BLOCK.add(BlockFace.EAST);
+        AROUND_BLOCK.add(BlockFace.SOUTH_EAST);
+        AROUND_BLOCK.add(BlockFace.SOUTH);
+        AROUND_BLOCK.add(BlockFace.SOUTH_WEST);
+        AROUND_BLOCK.add(BlockFace.WEST);
+        AROUND_BLOCK.add(BlockFace.NORTH_WEST);
+    }

    public SimpleBlockSafety(Core plugin) {
        this.plugin = plugin;
@@ -67,33 +82,88 @@ public class SimpleBlockSafety implements BlockSafety {

        if (isSolidBlock(world.getBlockAt(actual).getType())
                || isSolidBlock(upOne.getBlock().getType())) {
-            MultiverseCore.staticLog(Level.FINER, "Error Here (Actual)? ("
-                + actual.getBlock().getType() + ")[" + isSolidBlock(actual.getBlock().getType()) + "]");
-            MultiverseCore.staticLog(Level.FINER, "Error Here (upOne)? ("
-                + upOne.getBlock().getType() + ")[" + isSolidBlock(upOne.getBlock().getType()) + "]");
+            Logging.finer("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
+                    isSolidBlock(actual.getBlock().getType()));
+            Logging.finer("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
+                    isSolidBlock(upOne.getBlock().getType()));
            return false;
        }

-        if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            MultiverseCore.staticLog(Level.FINER, "Error Here (downOne)? ("
-                + downOne.getBlock().getType() + ")[" + isSolidBlock(downOne.getBlock().getType()) + "]");
+        if (downOne.getBlock().getType() == Material.LAVA) {
+            Logging.finer("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(), isSolidBlock(downOne.getBlock().getType()));
            return false;
        }

        if (downOne.getBlock().getType() == Material.FIRE) {
-            MultiverseCore.staticLog(Level.FINER, "There's fire below! ("
-                + actual.getBlock().getType() + ")[" + isSolidBlock(actual.getBlock().getType()) + "]");
+            Logging.finer("There's fire below! (%s)[%s]", actual.getBlock().getType(), isSolidBlock(actual.getBlock().getType()));
            return false;
        }

        if (isBlockAboveAir(actual)) {
-            MultiverseCore.staticLog(Level.FINER, "Is block above air [" + isBlockAboveAir(actual) + "]");
-            MultiverseCore.staticLog(Level.FINER, "Has 2 blocks of water below [" + this.hasTwoBlocksofWaterBelow(actual) + "]");
+            Logging.finer("Is block above air [%s]", isBlockAboveAir(actual));
+            Logging.finer("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
            return this.hasTwoBlocksofWaterBelow(actual);
        }
        return true;
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getSafeBedSpawn(Location l) {
+        // The passed location, may be null (if the bed is invalid)
+        if (l == null) {
+            return null;
+        }
+        final Location trySpawn = this.getSafeSpawnAroundABlock(l);
+        if (trySpawn != null) {
+            return trySpawn;
+        }
+        Location otherBlock = this.findOtherBedPiece(l);
+        if (otherBlock == null) {
+            return null;
+        }
+        // Now we have 2 locations, check around each, if the type is bed, skip it.
+        return this.getSafeSpawnAroundABlock(otherBlock);
+    }
+
+    /**
+     * Find a safe spawn around a location. (N,S,E,W,NE,NW,SE,SW)
+     * @param l Location to check around
+     * @return A safe location, or none if it wasn't found.
+     */
+    private Location getSafeSpawnAroundABlock(Location l) {
+        Iterator<BlockFace> checkblock = AROUND_BLOCK.iterator();
+        while (checkblock.hasNext()) {
+            final BlockFace face = checkblock.next();
+            if (this.playerCanSpawnHereSafely(l.getBlock().getRelative(face).getLocation())) {
+                // Don't forget to center the player.
+                return l.getBlock().getRelative(face).getLocation().add(.5, 0, .5);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Find the other bed block.
+     * @param checkLoc The location to check for the other piece at
+     * @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) {
+            return null;
+        }
+        // Construct a bed object at this location
+        final Bed b = new Bed(Material.BED_BLOCK, checkLoc.getBlock().getData());
+        if (b.isHeadOfBed()) {
+            return checkLoc.getBlock().getRelative(b.getFacing().getOppositeFace()).getLocation();
+        }
+        // We shouldn't ever be looking at the foot, but here's the code for it.
+        return checkLoc.getBlock().getRelative(b.getFacing()).getLocation();
+    }
+
+
    /**
     * {@inheritDoc}
     */
@@ -129,69 +199,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();
    }

    /**
@@ -215,10 +224,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) {
@@ -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);
+    }
 }
@@ -7,23 +7,26 @@

 package com.onarandombox.MultiverseCore.utils;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
-
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Ghast;
+import org.bukkit.entity.Golem;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
+import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
 import org.bukkit.entity.Squid;

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

 /**
 * Utility class that removes animals from worlds that don't belong there.
@@ -32,8 +35,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) { }
    }

    /**
@@ -62,6 +73,16 @@ public class SimpleWorldPurger implements WorldPurger {
        purgeWorld(world, allMobs, !world.canAnimalsSpawn(), !world.canMonstersSpawn());
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean shouldWeKillThisCreature(MultiverseWorld world, Entity e) {
+        ArrayList<String> allMobs = new ArrayList<String>(world.getAnimalList());
+        allMobs.addAll(world.getMonsterList());
+        return this.shouldWeKillThisCreature(e, allMobs, !world.canAnimalsSpawn(), !world.canMonstersSpawn());
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -75,61 +96,98 @@ public class SimpleWorldPurger implements WorldPurger {
        if (world == null) {
            return;
        }
+        int projectilesKilled = 0;
        int entitiesKilled = 0;
        boolean specifiedAll = thingsToKill.contains("ALL");
        boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
        boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
-        for (Entity e : world.getEntities()) {
-            boolean negate = false;
-            boolean specified = false;
-            if (e instanceof Squid || e instanceof Animals) {
-                // it's an animal
-                if (specifiedAnimals && !negateAnimals) {
-                    this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all animals: " + e);
-                    e.remove();
-                    entitiesKilled++;
-                    continue;
+        List<Entity> worldEntities = world.getEntities();
+        List<LivingEntity> livingEntities = new ArrayList<LivingEntity>(worldEntities.size());
+        List<Projectile> projectiles = new ArrayList<Projectile>(worldEntities.size());
+        for (final Entity e : worldEntities) {
+            if (e instanceof Projectile) {
+                final Projectile p = (Projectile) e;
+                if (p.getShooter() != null) {
+                    projectiles.add((Projectile) e);
                }
-                if (specifiedAnimals)
-                    specified = true;
-                negate = negateAnimals;
-            } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
-                // it's a monster
-                if (specifiedMonsters && !negateMonsters) {
-                    this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all monsters: " + e);
-                    e.remove();
-                    entitiesKilled++;
-                    continue;
-                }
-                if (specifiedMonsters)
-                    specified = true;
-                negate = negateMonsters;
+            } else if (e instanceof LivingEntity) {
+                livingEntities.add((LivingEntity) e);
            }
-            for (String s : thingsToKill) {
-                EntityType type = EntityType.fromName(s);
-                if (type != null && type.equals(e.getType())) {
-                    specified = true;
-                    if (!negate) {
-                        this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e);
-                        e.remove();
-                        entitiesKilled++;
-                        continue;
+        }
+        for (final LivingEntity e : livingEntities) {
+            if (killDecision(e, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters)) {
+                final Iterator<Projectile> it = projectiles.iterator();
+                while (it.hasNext()) {
+                    final Projectile p = it.next();
+                    if (p.getShooter().equals(e)) {
+                        p.remove();
+                        it.remove();
+                        projectilesKilled++;
                    }
-                    break;
                }
-            }
-            if (!specified && negate) {
-                this.plugin.log(Level.FINEST, "Removing an entity because it was NOT specified and we ARE negating: " + e);
                e.remove();
                entitiesKilled++;
-                continue;
            }
        }
        if (sender != null) {
-            sender.sendMessage(entitiesKilled + " entities purged from the world '" + world.getName() + "'");
+            sender.sendMessage(entitiesKilled + " entities purged from the world '" + world.getName() + "' along with " + projectilesKilled + " projectiles that belonged to them.");
        }
    }

+    private boolean killDecision(Entity e, List<String> thingsToKill, boolean negateAnimals,
+            boolean negateMonsters, boolean specifiedAnimals, boolean specifiedMonsters) {
+        boolean negate = false;
+        boolean specified = false;
+        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);
+                return true;
+            }
+            if (specifiedAnimals)
+                specified = true;
+            negate = negateAnimals;
+        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
+            // 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);
+                return true;
+            }
+            if (specifiedMonsters)
+                specified = true;
+            negate = negateMonsters;
+        }
+        for (String s : thingsToKill) {
+            EntityType type = EntityType.fromName(s);
+            if (type != null && type.equals(e.getType())) {
+                specified = true;
+                if (!negate) {
+                    Logging.finest("Removing an entity because it WAS specified and we are NOT negating in world %s: %s", e.getWorld().getName(), e);
+                    return true;
+                }
+                break;
+            }
+        }
+        if (!specified && negate) {
+            Logging.finest("Removing an entity because it was NOT specified and we ARE negating in world %s: %s", e.getWorld().getName(), e);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters) {
+        boolean specifiedAll = thingsToKill.contains("ALL");
+        boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
+        boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
+        return this.killDecision(e, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters);
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -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,128 +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 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) {
-                log.info("[" + this.name + "]" + " - Update Available (" + 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
- */
@@ -0,0 +1,81 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import com.dumptruckman.minecraft.util.Logging;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+
+/**
+ * A class we use to interface with Vault when it is present.
+ */
+public class VaultHandler implements Listener {
+
+    private Economy economy;
+
+    public VaultHandler(final Plugin plugin) {
+        Bukkit.getPluginManager().registerEvents(new VaultListener(), plugin);
+        setupVaultEconomy();
+    }
+
+    private boolean setupVaultEconomy() {
+        if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
+            final RegisteredServiceProvider<Economy> economyProvider =
+                    Bukkit.getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
+            if (economyProvider != null) {
+                Logging.fine("Vault economy enabled.");
+                economy = economyProvider.getProvider();
+            } else {
+                Logging.finer("Vault economy not detected.");
+                economy = null;
+            }
+        } else {
+            Logging.finer("Vault was not found.");
+            economy = null;
+        }
+
+        return (economy != null);
+    }
+
+    /**
+     * Listens for Vault plugin events.
+     */
+    private class VaultListener implements Listener {
+        @EventHandler
+        private void vaultEnabled(PluginEnableEvent event) {
+            if (event.getPlugin() != null && event.getPlugin().getName().equals("Vault")) {
+                setupVaultEconomy();
+            }
+        }
+
+        @EventHandler
+        private void vaultDisabled(PluginDisableEvent event) {
+            if (event.getPlugin() != null && event.getPlugin().getName().equals("Vault")) {
+                Logging.fine("Vault economy disabled");
+                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.
+     *
+     * @return The vault economy system or null if not configured.
+     */
+    public Economy getEconomy() {
+        return economy;
+    }
+}
@@ -7,13 +7,18 @@

 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 org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldCreator;
@@ -35,26 +40,29 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.Set;
 import java.util.Stack;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;

 /**
 * Public facing API to add/remove Multiverse worlds.
 */
 public class WorldManager implements MVWorldManager {
-    private MultiverseCore plugin;
-    private WorldPurger worldPurger;
-    private Map<String, MVWorld> worldsFromTheConfig;
-    private Map<String, MultiverseWorld> worlds;
+    private final MultiverseCore plugin;
+    private final WorldPurger worldPurger;
+    private final Map<String, MultiverseWorld> worlds;
+    private Map<String, WorldProperties> worldsFromTheConfig;
    private FileConfiguration configWorlds = null;
    private Map<String, String> defaultGens;
    private String firstSpawn;

    public WorldManager(MultiverseCore core) {
        this.plugin = core;
-        this.worldsFromTheConfig = new HashMap<String, MVWorld>();
-        this.worlds = new HashMap<String, MultiverseWorld>();
+        this.worldsFromTheConfig = new HashMap<String, WorldProperties>();
+        this.worlds = new ConcurrentHashMap<String, MultiverseWorld>();
        this.worldPurger = new SimpleWorldPurger(plugin);
    }

@@ -83,6 +91,122 @@ public class WorldManager implements MVWorldManager {
        }
    }

+    /**
+     * {@inheritDoc}
+     * @deprecated Use {@link #cloneWorld(String, String)} instead.
+     */
+    @Override
+    @Deprecated
+    public boolean cloneWorld(String oldName, String newName, String generator) {
+        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;
+            }
+        }
+        if (this.isMVWorld(newName)) {
+            Logging.warning("New world '%s' already exists", newName);
+            return false;
+        }
+
+        final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
+        final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
+
+        // 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;
+        }
+
+        // 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);
+            }
+            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;
+        }
+        if (oldWorld != null && wasAutoSave) {
+            oldWorld.getCBWorld().setAutoSave(true);
+        }
+
+        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;
+        }
+
+        if (newWorldFile.exists()) {
+            Logging.fine("Succeeded at copying files");
+            if (this.addWorld(newName, environment, seedString, worldType, generateStructures, generator, useSpawnAdjust)) {
+                // getMVWorld() doesn't actually return an MVWorld
+                Logging.fine("Succeeded at importing world");
+                MVWorld newWorld = (MVWorld) this.getMVWorld(newName);
+                newWorld.copyValues(this.worldsFromTheConfig.get(oldName));
+                // don't keep the alias the same -- that would be useless
+                newWorld.setAlias(null);
+                return true;
+            }
+        }
+        Logging.warning("Failed to copy files for world '%s', see the log info", newName);
+        return false;
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -98,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) {
@@ -122,8 +249,10 @@ public class WorldManager implements MVWorldManager {
        }

        // Important: doLoad() needs the MVWorld-object in worldsFromTheConfig
-        if (!worldsFromTheConfig.containsKey(name))
-            worldsFromTheConfig.put(name, new MVWorld(useSpawnAdjust));
+        if (!worldsFromTheConfig.containsKey(name)) {
+            WorldProperties props = new WorldProperties(useSpawnAdjust, env);
+            worldsFromTheConfig.put(name, props);
+        }

        StringBuilder builder = new StringBuilder();
        builder.append("Loading World & Settings - '").append(name).append("'");
@@ -135,9 +264,9 @@ public class WorldManager implements MVWorldManager {
        if (generator != null) {
            builder.append(" & generator: ").append(generator);
        }
-        this.plugin.log(Level.INFO, builder.toString());
+        Logging.info(builder.toString());

-        if (!doLoad(c)) {
+        if (!doLoad(c, true)) {
            this.plugin.log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
            return false;
        }
@@ -153,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");
        }
    }

@@ -176,12 +310,12 @@ public class WorldManager implements MVWorldManager {
        }
        if (this.worldsFromTheConfig.containsKey(name)) {
            this.worldsFromTheConfig.remove(name);
-            this.plugin.log(Level.INFO, "World '" + name + "' was removed from config.yml");
+            Logging.info("World '%s' was removed from config.yml", name);

            this.saveWorldsConfig();
            return true;
        } else {
-            this.plugin.log(Level.INFO, "World '" + name + "' was already removed from config.yml");
+            Logging.info("World '%s' was already removed from config.yml", name);
        }
        return false;
    }
@@ -222,23 +356,35 @@ 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)) {
-            if (this.unloadWorldFromBukkit(name, true)) {
+            this.worldsFromTheConfig.get(name).cacheVirtualProperties();
+            if (unloadBukkit && this.unloadWorldFromBukkit(name, true)) {
                this.worlds.remove(name);
-                this.plugin.log(Level.INFO, "World '" + name + "' was unloaded from memory.");
-
-                this.worldsFromTheConfig.get(name).tearDown();
-
+                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;
            } else {
-                this.plugin.log(Level.WARNING, "World '" + name + "' could not be unloaded. Is it a default world?");
+                Logging.warning("World '%s' could not be unloaded. Is it a default world?", name);
            }
        } else if (this.plugin.getServer().getWorld(name) != null) {
-            this.plugin.log(Level.WARNING, "Hmm Multiverse does not know about this world but it's loaded in memory.");
-            this.plugin.log(Level.WARNING, "To let Multiverse know about it, use:");
-            this.plugin.log(Level.WARNING, String.format("/mv import %s %s", name, this.plugin.getServer().getWorld(name).getEnvironment().toString()));
+            Logging.warning("Hmm Multiverse does not know about this world but it's loaded in memory.");
+            Logging.warning("To let Multiverse know about it, use:");
+            Logging.warning("/mv import %s %s", name, this.plugin.getServer().getWorld(name).getEnvironment().toString());
+        } else if (this.worldsFromTheConfig.containsKey(name)) {
+            return true; // it's already unloaded
        } else {
-            this.plugin.log(Level.INFO, "Multiverse does not know about " + name + " and it's not loaded by Bukkit.");
+            Logging.info("Multiverse does not know about '%s' and it's not loaded by Bukkit.", name);
        }
        return false;
    }
@@ -262,32 +408,60 @@ 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) {
+        return doLoad(name, false, null);
+    }
+
+    private boolean doLoad(String name, boolean ignoreExists, WorldType type) {
        if (!worldsFromTheConfig.containsKey(name))
            throw new IllegalArgumentException("That world doesn't exist!");

-        MVWorld 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 ((world.getGenerator() != null) && (!world.getGenerator().equals("null")))
-            creator.generator(world.getGenerator());
+        if (type != null) {
+            creator.type(type);
+        }

-        return doLoad(creator);
+        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) {
+    private boolean doLoad(WorldCreator creator, boolean ignoreExists) {
        String worldName = creator.name();
        if (!worldsFromTheConfig.containsKey(worldName))
            throw new IllegalArgumentException("That world doesn't exist!");
        if (worlds.containsKey(worldName))
            throw new IllegalArgumentException("That world is already loaded!");
-        MVWorld mvworld = worldsFromTheConfig.get(worldName);
+
+        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;
+        }
+
+        WorldProperties mvworld = worldsFromTheConfig.get(worldName);
        World cbworld;
        try {
            cbworld = creator.createWorld();
@@ -296,9 +470,15 @@ public class WorldManager implements MVWorldManager {
            brokenWorld(worldName);
            return false;
        }
-        mvworld.init(cbworld, plugin);
-        this.worldPurger.purgeWorld(mvworld);
-        this.worlds.put(worldName, mvworld);
+        if (cbworld == null) {
+            nullWorld(worldName);
+            return false;
+        }
+        MVWorld world = new MVWorld(plugin, cbworld, mvworld);
+        if (MultiverseCoreConfiguration.getInstance().isAutoPurgeEnabled()) {
+            this.worldPurger.purgeWorld(world);
+        }
+        this.worlds.put(worldName, world);
        return true;
    }

@@ -306,7 +486,7 @@ public class WorldManager implements MVWorldManager {
     * {@inheritDoc}
     */
    @Override
-    public boolean deleteWorld(String name, boolean removeFromConfig) {
+    public boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder) {
        World world = this.plugin.getServer().getWorld(name);
        if (world == null) {
            // We can only delete loaded worlds
@@ -334,25 +514,33 @@ public class WorldManager implements MVWorldManager {
        try {
            File worldFile = world.getWorldFolder();
            plugin.log(Level.FINER, "deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
-            boolean deletedWorld = FileUtils.deleteFolder(worldFile);
-            if (deletedWorld) {
-                this.plugin.log(Level.INFO, "World " + name + " was DELETED.");
+            if (deleteWorldFolder ? FileUtils.deleteFolder(worldFile) : FileUtils.deleteFolderContents(worldFile)) {
+                Logging.info("World '%s' was DELETED.", name);
+                return true;
            } else {
-                this.plugin.log(Level.SEVERE, "World " + name + " was NOT deleted.");
-                this.plugin.log(Level.SEVERE, "Are you sure the folder " + name + " exists?");
-                this.plugin.log(Level.SEVERE, "Please check your file permissions on " + name);
+                Logging.severe("World '%s' was NOT deleted.", name);
+                Logging.severe("Are you sure the folder %s exists?", name);
+                Logging.severe("Please check your file permissions on '%s'", name);
+                return false;
            }
-            return deletedWorld;
        } catch (Throwable e) {
-            this.plugin.log(Level.SEVERE, "Hrm, something didn't go as planned. Here's an exception for ya.");
-            this.plugin.log(Level.SEVERE, "You can go politely explain your situation in #multiverse on esper.net");
-            this.plugin.log(Level.SEVERE, "But from here, it looks like your folder is oddly named.");
-            this.plugin.log(Level.SEVERE, "This world has been removed from Multiverse-Core so your best bet is to go delete the folder by hand. Sorry.");
-            this.plugin.log(Level.SEVERE, e.getMessage());
+            Logging.severe("Hrm, something didn't go as planned. Here's an exception for ya.");
+            Logging.severe("You can go politely explain your situation in #multiverse on esper.net");
+            Logging.severe("But from here, it looks like your folder is oddly named.");
+            Logging.severe("This world has been removed from Multiverse-Core so your best bet is to go delete the folder by hand. Sorry.");
+            Logging.severe(e.getMessage());
            return false;
        }
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean deleteWorld(String name, boolean removeFromConfig) {
+        return this.deleteWorld(name, removeFromConfig, true);
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -403,8 +591,12 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public MultiverseWorld getMVWorld(String name) {
-        if (this.worlds.containsKey(name)) {
-            return this.worlds.get(name);
+        if (name == null) {
+            return null;
+        }
+        MultiverseWorld world = this.worlds.get(name);
+        if (world != null) {
+            return world;
        }
        return this.getMVWorldByAlias(name);
    }
@@ -439,7 +631,7 @@ public class WorldManager implements MVWorldManager {
     * {@inheritDoc}
     */
    @Override
-    public boolean isMVWorld(String name) {
+    public boolean isMVWorld(final String name) {
        return (this.worlds.containsKey(name) || isMVWorldAlias(name));
    }

@@ -457,7 +649,7 @@ public class WorldManager implements MVWorldManager {
     * @param alias The alias of the world to check.
     * @return True if the world exists, false if not.
     */
-    private boolean isMVWorldAlias(String alias) {
+    private boolean isMVWorldAlias(final String alias) {
        for (MultiverseWorld w : this.worlds.values()) {
            if (w.getAlias().equalsIgnoreCase(alias)) {
                return true;
@@ -526,9 +718,10 @@ public class WorldManager implements MVWorldManager {
            this.worlds.clear();
        }

-        for (Map.Entry<String, MVWorld> entry : worldsFromTheConfig.entrySet()) {
-            if (worlds.containsKey(entry.getKey()))
+        for (Map.Entry<String, WorldProperties> entry : worldsFromTheConfig.entrySet()) {
+            if (worlds.containsKey(entry.getKey())) {
                continue;
+            }
            if (!entry.getValue().getAutoLoad())
                continue;

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

        // Simple Output to the Console to show how many Worlds were loaded.
-        this.plugin.log(Level.INFO, count + " - World(s) loaded.");
+        Logging.config("%s - World(s) loaded.", count);
        this.saveWorldsConfig();
    }

@@ -569,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}
     */
@@ -585,26 +783,23 @@ public class WorldManager implements MVWorldManager {
        // load world-objects
        Stack<String> worldKeys = new Stack<String>();
        worldKeys.addAll(this.configWorlds.getConfigurationSection("worlds").getKeys(false));
-        Map<String, MVWorld> newWorldsFromTheConfig = new HashMap<String, MVWorld>();
+        Map<String, WorldProperties> newWorldsFromTheConfig = new HashMap<String, WorldProperties>();
        while (!worldKeys.isEmpty()) {
            String key = worldKeys.pop();
            String path = "worlds" + SEPARATOR + key;
            Object obj = this.configWorlds.get(path);
-            if ((obj != null) && (obj instanceof MVWorld)) {
+            if ((obj != null) && (obj instanceof WorldProperties)) {
                String worldName = key.replaceAll(String.valueOf(SEPARATOR), ".");
+                WorldProperties props = (WorldProperties) obj;
                if (this.worldsFromTheConfig.containsKey(worldName)) {
                    // Object-Recycling :D
-                    MVWorld oldMVWorld = (MVWorld) this.worlds.get(worldName);
-                    oldMVWorld.copyValues((MVWorld) obj);
-                    newWorldsFromTheConfig.put(worldName, oldMVWorld);
-                } else {
-                    // we have to use a new one
-                    World cbworld = this.plugin.getServer().getWorld(worldName);
-                    MVWorld mvworld = (MVWorld) obj;
-                    if (cbworld != null)
-                        mvworld.init(cbworld, this.plugin);
-                    newWorldsFromTheConfig.put(worldName, mvworld);
+                    // TODO Why is is checking worldsFromTheConfig and then getting from worlds?  So confused... (DTM)
+                    MVWorld mvWorld = (MVWorld) this.worlds.get(worldName);
+                    if (mvWorld != null) {
+                        mvWorld.copyValues((WorldProperties) obj);
+                    }
                }
+                newWorldsFromTheConfig.put(worldName, props);
            } else if (this.configWorlds.isConfigurationSection(path)) {
                ConfigurationSection section = this.configWorlds.getConfigurationSection(path);
                Set<String> subkeys = section.getKeys(false);
@@ -626,7 +821,7 @@ public class WorldManager implements MVWorldManager {
        try {
            this.configWorlds.options().pathSeparator(SEPARATOR);
            this.configWorlds.set("worlds", null);
-            for (Map.Entry<String, ? extends MultiverseWorld> entry : worldsFromTheConfig.entrySet()) {
+            for (Map.Entry<String, WorldProperties> entry : worldsFromTheConfig.entrySet()) {
                this.configWorlds.set("worlds" + SEPARATOR + entry.getKey(), entry.getValue());
            }
            this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
@@ -655,6 +850,47 @@ public class WorldManager implements MVWorldManager {
        return allNames;
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed) {
+        MultiverseWorld world = this.getMVWorld(name);
+        if (world == null)
+            return false;
+
+        List<Player> ps = world.getCBWorld().getPlayers();
+
+        if (useNewSeed) {
+            long theSeed;
+
+            if (randomSeed) {
+                theSeed = new Random().nextLong();
+            } else {
+                try {
+                    theSeed = Long.parseLong(seed);
+                } catch (NumberFormatException e) {
+                    theSeed = seed.hashCode();
+                }
+            }
+
+            world.setSeed(theSeed);
+        }
+        WorldType type = world.getWorldType();
+
+        if (this.deleteWorld(name, false, false)) {
+            this.doLoad(name, true, type);
+            SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
+            Location newSpawn = world.getSpawnLocation();
+            // Send all players that were in the old world, BACK to it!
+            for (Player p : ps) {
+                teleporter.safelyTeleport(null, p, newSpawn, true);
+            }
+            return true;
+        }
+        return false;
+    }
+
    /**
     * Gets the {@link FileConfiguration} that this {@link WorldManager} is using.
     * @return The {@link FileConfiguration} that this {@link WorldManager} is using.
@@ -662,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,7 @@
 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'
 version: maven-version-number
 commands:
  mv:
@@ -202,3 +203,33 @@ commands:
    description: Regenerates a world Multiverse already knows about.
    usage: |
            /<command> {WORLD}
+  mvscript:
+    description: Runs a script from the Multiverse scripts directory.
+    usage: |
+            /<command> {script} [target]
+  mvclone:
+    description: World clone command
+    usage: |
+            /<command> <world> <environment>
+            /<command> creative grieftastic -- Creates a world called 'grieftastic' exactly identical to the world 'creative'.
+  mvsilent:
+    description: Reduces startup messages
+    usage: |
+            /<command> [true|false]
+  
+  mvgamerule:
+    description: Sets a gamerule.
+    usage: |
+            /<command> {RULE} {VALUE} [WORLD]
+  mvrule:
+    description: Sets a gamerule.
+    usage: |
+            /<command> {RULE} {VALUE} [WORLD]
+  mvgamerules:
+    description: Lists the gamerules.
+    usage: |
+            /<command> [WORLD]
+  mvrules:
+    description: Lists the gamerules.
+    usage: |
+            /<command> [WORLD]
@@ -5,36 +5,35 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.MultiverseCore.test;
+package com.onarandombox.MultiverseCore;
+
+import com.onarandombox.MultiverseCore.api.Core;
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
+import junit.framework.Assert;
+import org.bukkit.Server;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.File;

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

-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.bukkit.Server;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.Core;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
-
@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;
@@ -0,0 +1,162 @@
+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;
+import org.bukkit.entity.Sheep;
+import org.bukkit.entity.Zombie;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPluginLoader;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class, JavaPluginLoader.class})
+@PowerMockIgnore("javax.script.*")
+public class TestEntitySpawnRules {
+    TestInstanceCreator creator;
+    MultiverseCore core;
+    MVEntityListener listener;
+
+    MultiverseWorld mvWorld;
+    World cbworld;
+
+    Sheep sheep;
+    Zombie zombie;
+
+    CreatureSpawnEvent sheepEvent;
+    CreatureSpawnEvent zombieEvent;
+
+    @Before
+    public void setUp() throws Exception {
+        creator = new TestInstanceCreator();
+        assertTrue(creator.setUp());
+        core = creator.getCore();
+        listener = core.getEntityListener();
+
+        mvWorld = mock(MultiverseWorld.class);
+        cbworld = MockWorldFactory.makeNewMockWorld("world", World.Environment.NORMAL, WorldType.NORMAL);
+        when(mvWorld.getCBWorld()).thenReturn(cbworld);
+
+        MVWorldManager worldman = mock(MVWorldManager.class);
+        when(worldman.isMVWorld(anyString())).thenReturn(true);
+        when(worldman.getMVWorld(anyString())).thenReturn(mvWorld);
+        Field worldmanfield = MVEntityListener.class.getDeclaredField("worldManager");
+        worldmanfield.setAccessible(true);
+        worldmanfield.set(listener, worldman);
+
+        core.getMVConfig().setGlobalDebug(3);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        creator.tearDown();
+    }
+
+    private static CreatureSpawnEvent mockSpawnEvent(LivingEntity e, SpawnReason reason) {
+        CreatureSpawnEvent event = mock(CreatureSpawnEvent.class);
+        when(event.getEntity()).thenReturn(e);
+        EntityType type = e.getType();
+        when(event.getEntityType()).thenReturn(type);
+        when(event.getSpawnReason()).thenReturn(reason);
+        return event;
+    }
+
+    private void spawnAll(SpawnReason reason) {
+        sheepEvent = mockSpawnEvent(sheep, reason);
+        zombieEvent = mockSpawnEvent(zombie, reason);
+        listener.creatureSpawn(sheepEvent);
+        listener.creatureSpawn(zombieEvent);
+    }
+
+    private void spawnAllNatural() {
+        spawnAll(SpawnReason.NATURAL);
+    }
+
+    private void adjustSettings(boolean animalSpawn, boolean monsterSpawn,
+            List<String> animalExceptions, List<String> monsterExceptions) {
+        when(this.mvWorld.canAnimalsSpawn()).thenReturn(animalSpawn);
+        when(this.mvWorld.canMonstersSpawn()).thenReturn(monsterSpawn);
+        when(this.mvWorld.getAnimalList()).thenReturn(animalExceptions);
+        when(this.mvWorld.getMonsterList()).thenReturn(monsterExceptions);
+    }
+
+    @Test
+    public void test() {
+        // test 1: no spawning at all allowed
+        adjustSettings(false, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        createAnimals();
+        spawnAllNatural();
+        verify(sheepEvent).setCancelled(true);
+        verify(zombieEvent).setCancelled(true);
+
+        // test 2: only monsters
+        adjustSettings(false, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        createAnimals();
+        spawnAllNatural();
+        verify(sheepEvent).setCancelled(true);
+        verify(zombieEvent).setCancelled(false);
+
+        // test 3: all spawning allowed
+        adjustSettings(true, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        createAnimals();
+        spawnAllNatural();
+        verify(sheepEvent).setCancelled(false);
+        verify(zombieEvent).setCancelled(false);
+
+        // test 4: no spawning with zombie exception
+        adjustSettings(false, false, Collections.EMPTY_LIST, Arrays.asList("ZOMBIE"));
+        createAnimals();
+        spawnAllNatural();
+        verify(sheepEvent).setCancelled(true);
+        verify(zombieEvent).setCancelled(false);
+
+        // test 5: all spawning with sheep exception
+        adjustSettings(true, true, Arrays.asList("SHEEP"), Collections.EMPTY_LIST);
+        createAnimals();
+        spawnAllNatural();
+        verify(sheepEvent).setCancelled(true);
+        verify(zombieEvent).setCancelled(false);
+
+        // test 6: eggs
+        adjustSettings(false, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        createAnimals();
+        spawnAll(SpawnReason.SPAWNER_EGG);
+        verify(sheepEvent, never()).setCancelled(anyBoolean());
+        verify(zombieEvent, never()).setCancelled(anyBoolean());
+    }
+
+    private void createAnimals() {
+        sheep = mock(Sheep.class);
+        when(sheep.getType()).thenReturn(EntityType.SHEEP);
+        when(sheep.getWorld()).thenReturn(this.cbworld);
+        zombie = mock(Zombie.class);
+        when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
+        when(zombie.getWorld()).thenReturn(this.cbworld);
+
+        when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie));
+    }
+}
@@ -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());
+    }
+}