Fix merge error, Add correct dependency versions

Update dynmap branch with master
A broadcast is not needed if we're not doing anything
2012-10-22 17:22:33 -06:00 · 2012-10-21 20:42:54 -06:00 · 2012-10-21 18:57:54 -06:00 · 2012-10-21 18:49:48 -06:00 · 2012-10-21 17:55:41 -04:00 · 2012-10-21 17:49:51 -04:00
126 changed files with 7669 additions and 3776 deletions
@@ -1,7 +0,0 @@
-[submodule "lib/allpay"]
-	path = lib/allpay
-	url = git://github.com/FernFerret/AllPay.git
-[submodule "lib/commandhandler"]
-	path = lib/commandhandler
-	url = git://github.com/PneumatiCraft/CommandHandler.git
-        branch = notrie
@@ -1,11 +1,8 @@
 Building
 ========
-Update the submodules after you clone and before you build with maven.
+Simply build the source with maven:

-```
-$ git submodule update --init --recursive
-$ mvn install
-```
+    $ mvn install

 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).

@@ -13,9 +13,7 @@
    <module name="JavadocPackage">
        <property name="allowLegacy" value="true"/>
    </module>
-    <module name="NewlineAtEndOfFile">
-        <property name="severity" value="info"/>
-    </module>
+    <module name="NewlineAtEndOfFile" />
    <module name="Translation"/>
    <module name="FileLength"/>
    <module name="FileTabCharacter">
@@ -78,7 +76,10 @@
        <module name="UnusedImports">
            <property name="processJavadoc" value="true"/>
        </module>
-        <module name="MethodLength"/>
+        <module name="MethodLength">
+            <property name="severity" value="warning"/>
+            <property name="countEmpty" value="false"/>
+        </module>
        <module name="ParameterNumber"/>
        <module name="EmptyForIteratorPad"/>
        <module name="MethodParamPad"/>
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.onarandombox.multiversecore</groupId>
    <artifactId>Multiverse-Core</artifactId>
-    <version>2.3</version>
+    <version>2.5</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
@@ -16,6 +16,25 @@
            <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>
+        </repository>
+        <!-- I've been told they'll have a repo this weekend :D
+        <repository>
+            <id>DynMap</id>
+            <url>TBD</url>
+        </repository> -->
+        <!-- Required for Metrics -->
+        <repository>
+            <id>mcstats</id>
+            <url>http://repo.mcstats.org/content/repositories/snapshots</url>
+        </repository>
+        <!-- Required for Vault -->
+        <repository>
+            <id>herocraft</id>
+            <url>http://ci.herocraftonline.com/plugin/repository/everything/</url>
+        </repository>
    </repositories>

    <pluginRepositories>
@@ -63,28 +82,6 @@
                    <target>1.6</target>
                </configuration>
            </plugin>
-            <!-- Build Helper - Additional Source Folders -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>add-wsdl-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.basedir}/lib/allpay/src/main/java</source>
-                                <source>${project.basedir}/lib/commandhandler/src</source>
-                                <source>${project.basedir}/lib/commandhandler/lib/ShellParser/src</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
            <plugin>
                <groupId>com.google.code.maven-replacer-plugin</groupId>
                <artifactId>maven-replacer-plugin</artifactId>
@@ -119,12 +116,6 @@
                    </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>
@@ -154,6 +145,88 @@
                    <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</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.8.1</version>
+                <executions>
+                    <execution>
+                        <id>javadoc-jar</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>me.main__.util:SerializationConfig</include>
+                                    <include>com.pneumaticraft.commandhandler:CommandHandler</include>
+                                    <include>com.dumptruckman.minecraft:buscript</include>
+                                    <include>org.mcstats:metrics</include>
+                                    <include>com.dumptruckman.minecraft:Logging</include>
+                                    <include>com.fernferret.allpay:AllPay</include>
+                                </includes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.fernferret.allpay</pattern>
+                                    <shadedPattern>com.fernferret.allpay.multiverse</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>me.main__.util</pattern>
+                                    <shadedPattern>me.main__.util.multiverse</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.pneumaticraft.commandhandler</pattern>
+                                    <shadedPattern>com.pneumaticraft.commandhandler.multiverse</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>buscript</pattern>
+                                    <shadedPattern>buscript.multiverse</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.mcstats</pattern>
+                                    <shadedPattern>org.mcstats.multiverse</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>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
    </build>

@@ -162,81 +235,97 @@
        <dependency>
            <groupId>org.bukkit</groupId>
            <artifactId>bukkit</artifactId>
-            <version>1.1-R1-SNAPSHOT</version>
+            <version>1.3.2-R2.1-SNAPSHOT</version>
+            <!-- If you want the lates, use this -->
+            <!-- <version>LATEST</version> -->
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
        <!-- Bukkit Dependency -->
-        <!-- Start of Spout -->
+        <!-- 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 -->
-        <!-- Start of Economy Dependencies -->
+             End of Spout -->
+        <!-- SerializationConfig Dependency -->
        <dependency>
-            <groupId>cosine.boseconomy</groupId>
-            <artifactId>BOSEconomy</artifactId>
-            <version>0.6.2</version>
+            <groupId>me.main__.util</groupId>
+            <artifactId>SerializationConfig</artifactId>
+            <version>1.6b</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
-
+        <!-- End of SerializationConfig Dependency -->
+        <!-- Start of Economy Dependency -->
        <dependency>
-            <groupId>fr.crafter.tickleman.RealShop</groupId>
-            <artifactId>RealShop</artifactId>
-            <version>0.63</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iCo6</groupId>
-            <artifactId>iConomy</artifactId>
-            <version>6.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iConomy</groupId>
-            <artifactId>iConomy</artifactId>
-            <version>5.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.nijiko.coelho.iConomy</groupId>
-            <artifactId>iConomy</artifactId>
-            <version>4.65</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.earth2me.essentials</groupId>
-            <artifactId>Essentials</artifactId>
-            <version>2.4.2</version>
+            <groupId>com.fernferret.allpay</groupId>
+            <artifactId>AllPay</artifactId>
+            <version>10</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
        <dependency>
-            <groupId>me.ashtheking.currency</groupId>
-            <artifactId>MultiCurrency</artifactId>
-            <version>0.09</version>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>Vault</artifactId>
+            <version>1.2.19-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <!-- End of Economy Dependency -->
+        <!-- Start of CommandHandler Dependency -->
+        <dependency>
+            <groupId>com.pneumaticraft.commandhandler</groupId>
+            <artifactId>CommandHandler</artifactId>
+            <version>7</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <!-- End of CommandHandler Dependency -->
+        <!-- Start DynMap Dependency -->
+        <dependency>
+            <groupId>org.dynmap</groupId>
+            <artifactId>DynmapCoreAPI</artifactId>
+            <version>1.0</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
        <dependency>
-            <groupId>ca.agnate</groupId>
-            <artifactId>EconXP</artifactId>
-            <version>1.0.0</version>
+            <groupId>org.dynmap</groupId>
+            <artifactId>dynmap</artifactId>
+            <version>1.0</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
-        <!-- End of Economy Dependencies -->
+        <!-- End DynMap Dependency -->
+        <!-- Start of Buscript Dependency -->
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>buscript</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <!-- End of Buscript Dependency -->
+        <!-- Start of Metrics Dependency -->
+        <dependency>
+            <groupId>org.mcstats</groupId>
+            <artifactId>metrics</artifactId>
+            <version>1.2-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <!-- End of Metrics Dependency -->
+        <!-- Start of Logging Dependency -->
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>Logging</artifactId>
+            <version>1.0.6</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <!-- End of Logging Dependency -->
        <!-- Start of Test Dependencies -->
        <dependency>
            <groupId>junit</groupId>
@@ -0,0 +1,278 @@
+package com.onarandombox.MultiverseCore;
+
+import com.dumptruckman.minecraft.util.Logging;
+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.Map;
+
+/**
+ * Our configuration.
+ */
+public class MultiverseCoreConfiguration extends SerializationConfig implements MultiverseCoreConfig {
+    private static MultiverseCoreConfiguration instance;
+
+    /**
+     * Sets the statically saved instance.
+     * @param instance The new instance.
+     */
+    public static void setInstance(MultiverseCoreConfiguration instance) {
+        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.
+     */
+    public static MultiverseCoreConfiguration getInstance() {
+        if (instance == null)
+            throw new IllegalStateException("The instance wasn't set!");
+        return instance;
+    }
+
+    @Property
+    private volatile boolean enforceaccess;
+    @Property
+    private volatile boolean prefixchat;
+    @Property
+    private volatile boolean useasyncchat;
+    @Property
+    private volatile boolean teleportintercept;
+    @Property
+    private volatile boolean firstspawnoverride;
+    @Property
+    private volatile boolean displaypermerrors;
+    @Property
+    private volatile int globaldebug;
+    @Property
+    private volatile int messagecooldown;
+    @Property
+    private volatile double version;
+    @Property
+    private volatile String firstspawnworld;
+    @Property
+    private volatile int teleportcooldown;
+
+    public MultiverseCoreConfiguration() {
+        super();
+        MultiverseCoreConfiguration.setInstance(this);
+    }
+
+    public MultiverseCoreConfiguration(Map<String, Object> values) {
+        super(values);
+        MultiverseCoreConfiguration.setInstance(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        enforceaccess = false;
+        useasyncchat = true;
+        prefixchat = true;
+        teleportintercept = true;
+        firstspawnoverride = true;
+        displaypermerrors = true;
+        globaldebug = 0;
+        messagecooldown = 5000;
+        teleportcooldown = 1000;
+        this.version = 2.9;
+        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setConfigProperty(String property, String value) {
+        try {
+            return this.setProperty(property, value, true);
+        } catch (NoSuchPropertyException e) {
+            return false;
+        }
+    }
+
+    // And here we go:
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getEnforceAccess() {
+        return this.enforceaccess;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setEnforceAccess(boolean enforceAccess) {
+        this.enforceaccess = enforceAccess;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getPrefixChat() {
+        return this.prefixchat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPrefixChat(boolean prefixChat) {
+        this.prefixchat = prefixChat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getTeleportIntercept() {
+        return this.teleportintercept;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setTeleportIntercept(boolean teleportIntercept) {
+        this.teleportintercept = teleportIntercept;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getFirstSpawnOverride() {
+        return this.firstspawnoverride;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setFirstSpawnOverride(boolean firstSpawnOverride) {
+        this.firstspawnoverride = firstSpawnOverride;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getDisplayPermErrors() {
+        return this.displaypermerrors;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDisplayPermErrors(boolean displayPermErrors) {
+        this.displaypermerrors = displayPermErrors;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getGlobalDebug() {
+        return this.globaldebug;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setGlobalDebug(int globalDebug) {
+        this.globaldebug = globalDebug;
+        Logging.setDebugLevel(globalDebug);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getMessageCooldown() {
+        return this.messagecooldown;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setMessageCooldown(int messageCooldown) {
+        this.messagecooldown = messageCooldown;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public double getVersion() {
+        return this.version;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getFirstSpawnWorld() {
+        return this.firstspawnworld;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setFirstSpawnWorld(String firstSpawnWorld) {
+        this.firstspawnworld = firstSpawnWorld;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getTeleportCooldown() {
+        return this.teleportcooldown;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setTeleportCooldown(int teleportCooldown) {
+        this.teleportcooldown = teleportCooldown;
+    }
+
+    @Override
+    public void setUseAsyncChat(boolean useAsyncChat) {
+        this.useasyncchat = useAsyncChat;
+    }
+
+    @Override
+    public boolean getUseAsyncChat() {
+        return this.useasyncchat;
+    }
+}
@@ -0,0 +1,79 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Minecart;
+import org.bukkit.entity.Vehicle;
+
+/**
+ * Used to get block/location-related information.
+ */
+public interface 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.
+     */
+    boolean isBlockAboveAir(Location l);
+
+    /**
+     * 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.
+     */
+    boolean playerCanSpawnHereSafely(World world, double x, double y, double z);
+
+    /**
+     * 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}
+     */
+    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}.
+     * @return The {@link Location} of the top-block.
+     */
+    Location getTopBlock(Location l);
+
+    /**
+     * 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.
+     */
+    Location getBottomBlock(Location l);
+
+    /**
+     * 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}.
+     */
+    boolean isEntitiyOnTrack(Location l);
+
+    /**
+     * Checks if the specified {@link Minecart} can spawn safely.
+     * @param cart The {@link Minecart}.
+     * @return True if the minecart can spawn safely.
+     */
+    boolean canSpawnCartSafely(Minecart cart);
+
+    /**
+     * Checks if the specified {@link Vehicle} can spawn safely.
+     * @param vehicle The {@link Vehicle}.
+     * @return True if the vehicle can spawn safely.
+     */
+    boolean canSpawnVehicleSafely(Vehicle vehicle);
+}
@@ -7,11 +7,19 @@

 package com.onarandombox.MultiverseCore.api;

+import buscript.Buscript;
 import com.fernferret.allpay.AllPay;
 import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.*;
+import com.onarandombox.MultiverseCore.utils.AnchorManager;
+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.WorldManager;
 import com.pneumaticraft.commandhandler.CommandHandler;
+import net.milkbowl.vault.economy.Economy;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;

@@ -26,16 +34,27 @@ public interface Core {
     * Gets the Multiverse config file.
     *
     * @return The Multiverse config file.
+     * @deprecated Don't modify the config-file manually!
     */
+    @Deprecated
    FileConfiguration getMVConfiguration();

    /**
     * Gets the Banking system that Multiverse-Core has hooked into.
     *
     * @return A {@link GenericBank} that can be used for payments.
+     * @deprecated Now using vault, see {@link #getVaultEconomy}
     */
+    @Deprecated
    GenericBank getBank();

+    /**
+     * 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.
+     */
+    Economy getVaultEconomy();
+
    /**
     * Reloads the Multiverse Configuration files:
     * worlds.yml and config.yml.
@@ -46,9 +65,9 @@ public interface Core {
     * Gets the Multiverse message system. This allows you to send messages
     * to users at specified intervals.
     *
-     * @return The loaded {@link MVMessaging}.
+     * @return The loaded {@link MultiverseMessaging}.
     */
-    MVMessaging getMessaging();
+    MultiverseMessaging getMessaging();

    /**
     * Gets the {@link MVPlayerSession} for the given player.
@@ -66,8 +85,11 @@ public interface Core {
     * safe teleports.
     *
     * @return A non-null {@link SafeTTeleporter}.
+     *
+     * @deprecated Use {@link #getSafeTTeleporter()} instead.
     */
-    SafeTTeleporter getTeleporter();
+    @Deprecated
+    com.onarandombox.MultiverseCore.utils.SafeTTeleporter getTeleporter();

    /**
     * Multiverse uses an advanced permissions setup, this object
@@ -123,21 +145,28 @@ 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}
+     * @deprecated Now using vault, see {@link #getVaultEconomy}
     */
+    @Deprecated
    void setBank(GenericBank bank);

    /**
     * Gets this plugin's {@link AllPay}-Banker.
     *
     * @return An {@link AllPay}-Banker
+     * @deprecated Now using vault, see {@link #getVaultEconomy}
     */
+    @Deprecated
    AllPay getBanker();

    /**
@@ -163,4 +192,65 @@ public interface Core {
     * @return The readable authors-{@link String}
     */
    String getAuthors();
+
+    /**
+     * Gets the {@link BlockSafety} this {@link Core} is using.
+     * @return The {@link BlockSafety} this {@link Core} is using.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    BlockSafety getBlockSafety();
+
+    /**
+     * Sets the {@link BlockSafety} this {@link Core} is using.
+     * @param blockSafety The new {@link BlockSafety}.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    void setBlockSafety(BlockSafety blockSafety);
+
+    /**
+     * Gets the {@link LocationManipulation} this {@link Core} is using.
+     * @return The {@link LocationManipulation} this {@link Core} is using.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    LocationManipulation getLocationManipulation();
+
+    /**
+     * Sets the {@link LocationManipulation} this {@link Core} is using.
+     * @param locationManipulation The new {@link LocationManipulation}.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    void setLocationManipulation(LocationManipulation locationManipulation);
+
+    /**
+     * Gets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @return The {@link SafeTTeleporter} this {@link Core} is using.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    SafeTTeleporter getSafeTTeleporter();
+
+    /**
+     * Sets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @param safeTTeleporter The new {@link SafeTTeleporter}.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    void setSafeTTeleporter(SafeTTeleporter safeTTeleporter);
+
+    /**
+     * Gets the {@link MultiverseCoreConfig}.
+     * @return The configuration.
+     */
+    MultiverseCoreConfig getMVConfig();
+
+    /**
+     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
+     *
+     * @return The Multiverse buscript object.
+     */
+    Buscript getScriptAPI();
 }
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.util.Vector;
+
+/**
+ * Used to manipulate locations.
+ */
+public interface LocationManipulation {
+    /**
+     * Convert a Location into a Colon separated string to allow us to store it in text.
+     * <p>
+     * WORLD:X,Y,Z:yaw:pitch
+     * <p>
+     * The corresponding String2Loc function is {@link #stringToLocation}
+     *
+     * @param location The Location to save.
+     * @return The location as a string in this format: WORLD:x,y,z:yaw:pitch
+     */
+    String locationToString(Location location);
+
+    /**
+     * This method simply does some rounding, rather than forcing a call to the server to get the blockdata.
+     *
+     * @param l The location to round to the block location
+     * @return A rounded location.
+     */
+    Location getBlockLocation(Location l);
+
+    /**
+     * Returns a new location from a given string. The format is as follows:
+     * <p>
+     * WORLD:X,Y,Z:yaw:pitch
+     * <p>
+     * The corresponding Location2String function is {@link #stringToLocation}
+     *
+     * @param locationString The location represented as a string (WORLD:X,Y,Z:yaw:pitch)
+     * @return A new location defined by the string or null if the string was invalid.
+     */
+    Location stringToLocation(String locationString);
+
+    /**
+     * Returns a colored string with the coords.
+     *
+     * @param l The {@link Location}
+     * @return The {@link String}
+     */
+    String strCoords(Location l);
+
+    /**
+     * Converts a location to a printable readable formatted string including pitch/yaw.
+     *
+     * @param l The {@link Location}
+     * @return The {@link String}
+     */
+    String strCoordsRaw(Location l);
+
+    /**
+     * Return the NESW Direction a Location is facing.
+     *
+     * @param location The {@link Location}
+     * @return The NESW Direction
+     */
+    String getDirection(Location location);
+
+    /**
+     * Returns the float yaw position for the given cardinal direction.
+     *
+     * @param orientation The cardinal direction
+     * @return The yaw
+     */
+    float getYaw(String orientation);
+
+    /**
+     * Returns a speed float from a given vector.
+     *
+     * @param v The {@link Vector}
+     * @return The speed
+     */
+    float getSpeed(Vector v);
+
+    /**
+     * Returns a translated vector from the given direction.
+     *
+     * @param v The old {@link Vector}
+     * @param direction The new direction
+     * @return The translated {@link Vector}
+     */
+    Vector getTranslatedVector(Vector v, String direction);
+
+    /**
+     * Returns the next Location that a {@link Vehicle} is traveling at.
+     *
+     * @param v The {@link Vehicle}
+     * @return The {@link Location}
+     */
+    Location getNextBlock(Vehicle v);
+}
@@ -45,7 +45,7 @@ public interface MVDestination {
    boolean isThisType(JavaPlugin plugin, String destination);

    /**
-     * Returns the location a specific entity will spawn at.
+     * Returns the location a specific entity will spawn at when being teleported to this Destination.
     * <p>
     * To just retrieve the location as it is stored you can just pass null, but be warned some destinations may return
     * null back to you if you do this. It is always safer to pass an actual entity. This is used so things like
@@ -8,6 +8,8 @@
 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;
@@ -28,31 +30,45 @@ public interface MVWorldManager {
    /**
     * Add a new World to the Multiverse Setup.
     *
-     * @param name       World Name
-     * @param env        Environment Type
-     * @param seedString The seed in the form of a string.
-     *                   If the seed is a Long,
-     *                   it will be interpreted as such.
-     * @param type       The Type of the world to be made.
-     * @param generator  The Custom generator plugin to use.
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
     * @return True if the world is added, false if not.
     */
-    boolean addWorld(String name, Environment env, String seedString, WorldType type, String generator);
+    boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
+                     String generator);

    /**
     * Add a new World to the Multiverse Setup.
     *
-     * @param name           World Name
-     * @param env            Environment Type
-     * @param seedString     The seed in the form of a string.
-     *                       If the seed is a Long,
-     *                       it will be interpreted as such.
-     * @param type       The Type of the world to be made.
-     * @param generator      The Custom generator plugin to use.
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
     * @param useSpawnAdjust If true, multiverse will search for a safe spawn. If not, It will not modify the level.dat.
     * @return True if the world is added, false if not.
     */
-    boolean addWorld(String name, Environment env, String seedString, WorldType type, String generator, boolean useSpawnAdjust);
+    boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
+                     String generator, boolean useSpawnAdjust);
+
+    /**
+     * Make a copy of a world.
+     *
+     * @param oldName            Name of world to be copied
+     * @param newName            Name of world to be created
+     * @param generator          The Custom generator plugin to use.
+     * @return True if the world is copied successfully, false if not.
+     */
+    boolean cloneWorld(String oldName, String newName, String generator);

    /**
     * Remove the world from the Multiverse list, from the
@@ -168,9 +184,21 @@ public interface MVWorldManager {
     * Return the World Purger.
     *
     * @return A valid {@link PurgeWorlds}.
+     * @deprecated {@link PurgeWorlds} is deprecated!
     */
+    @Deprecated
    PurgeWorlds getWorldPurger();

+    /**
+     * Gets the {@link WorldPurger}.
+     * <p>
+     * TODO: Remove {@link #getWorldPurger()} and replace it with this method.
+     * @return The {@link WorldPurger} this {@link MVWorldManager} is using.
+     * @see WorldPurger
+     * @see SimpleWorldPurger
+     */
+    WorldPurger getTheWorldPurger();
+
    /**
     * Gets the world players will spawn in on first join.
     * Currently this always returns worlds.get(0) from Bukkit.
@@ -227,4 +255,16 @@ 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);
 }
@@ -0,0 +1,148 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+
+/**
+ * The configuration of MultiverseCore.
+ */
+public interface MultiverseCoreConfig extends ConfigurationSerializable {
+    /**
+     * Sets a property using a {@link String}.
+     * @param property The name of the property.
+     * @param value The value.
+     * @return True on success, false if the operation failed.
+     */
+    boolean setConfigProperty(String property, String value);
+
+    /**
+     * Sets portalCooldown.
+     * @param portalCooldown The new value.
+     */
+    void setTeleportCooldown(int portalCooldown);
+
+    /**
+     * Gets portalCooldown.
+     * @return portalCooldown.
+     */
+    int getTeleportCooldown();
+
+    /**
+     * Sets firstSpawnWorld.
+     * @param firstSpawnWorld The new value.
+     */
+    void setFirstSpawnWorld(String firstSpawnWorld);
+
+    /**
+     * Gets firstSpawnWorld.
+     * @return firstSpawnWorld.
+     */
+    String getFirstSpawnWorld();
+
+    /**
+     * Sets version.
+     * @param version The new value.
+     */
+    void setVersion(int version);
+
+    /**
+     * Gets version.
+     * @return version.
+     */
+    double getVersion();
+
+    /**
+     * Sets messageCooldown.
+     * @param messageCooldown The new value.
+     */
+    void setMessageCooldown(int messageCooldown);
+
+    /**
+     * Gets messageCooldown.
+     * @return messageCooldown.
+     */
+    int getMessageCooldown();
+
+    /**
+     * Sets globalDebug.
+     * @param globalDebug The new value.
+     */
+    void setGlobalDebug(int globalDebug);
+
+    /**
+     * Gets globalDebug.
+     * @return globalDebug.
+     */
+    int getGlobalDebug();
+
+    /**
+     * Sets displayPermErrors.
+     * @param displayPermErrors The new value.
+     */
+    void setDisplayPermErrors(boolean displayPermErrors);
+
+    /**
+     * Gets displayPermErrors.
+     * @return displayPermErrors.
+     */
+    boolean getDisplayPermErrors();
+
+    /**
+     * Sets firstSpawnOverride.
+     * @param firstSpawnOverride The new value.
+     */
+    void setFirstSpawnOverride(boolean firstSpawnOverride);
+
+    /**
+     * Gets firstSpawnOverride.
+     * @return firstSpawnOverride.
+     */
+    boolean getFirstSpawnOverride();
+
+    /**
+     * Sets teleportIntercept.
+     * @param teleportIntercept The new value.
+     */
+    void setTeleportIntercept(boolean teleportIntercept);
+
+    /**
+     * Gets teleportIntercept.
+     * @return teleportIntercept.
+     */
+    boolean getTeleportIntercept();
+
+    /**
+     * Sets prefixChat.
+     * @param prefixChat The new value.
+     */
+    void setPrefixChat(boolean prefixChat);
+
+    /**
+     * Gets prefixChat.
+     * @return prefixChat.
+     */
+    boolean getPrefixChat();
+
+    /**
+     * Sets enforceAccess.
+     * @param enforceAccess The new value.
+     */
+    void setEnforceAccess(boolean enforceAccess);
+
+    /**
+     * Gets enforceAccess.
+     * @return enforceAccess.
+     */
+    boolean getEnforceAccess();
+
+    /**
+     * Sets useasyncchat.
+     * @param useAsyncChat The new value.
+     */
+    void setUseAsyncChat(boolean useAsyncChat);
+
+    /**
+     * Gets useasyncchat.
+     * @return useasyncchat.
+     */
+    boolean getUseAsyncChat();
+}
@@ -0,0 +1,56 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.Collection;
+
+import org.bukkit.command.CommandSender;
+
+/**
+ * Multiverse-messaging.
+ */
+public interface MultiverseMessaging {
+    /**
+     * Sets the message-cooldown.
+     * @param milliseconds The new message-cooldown in milliseconds.
+     */
+    void setCooldown(int milliseconds);
+
+    /**
+     * Sends a message to the specified sender if the cooldown has passed.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param message        The message to send.
+     * @param ignoreCooldown If true this message will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessage(CommandSender sender, String message, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, Collection<String> messages, boolean ignoreCooldown);
+
+    /**
+     * Gets the message-cooldown.
+     * @return The message-cooldown.
+     */
+    int getCooldown();
+}
@@ -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;
+    }
+}
@@ -7,7 +7,7 @@

 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.configuration.MVConfigProperty;
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;

 import org.bukkit.ChatColor;
@@ -25,7 +25,6 @@ import java.util.List;
 * The API for a Multiverse Handled World.
 */
 public interface MultiverseWorld {
-
    /**
     * Returns the Bukkit world object that this world describes.
     *
@@ -34,79 +33,24 @@ public interface MultiverseWorld {
    World getCBWorld();

    /**
-     * Adds the property to the given value.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
+     * Gets the name of this world. The name cannot be changed.
+     * <p>
+     * Note for plugin developers: Usually {@link #getAlias()}
+     * is what you want to use instead of this method.
     *
-     * @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.
+     * @return The name of the world as a String.
     */
-    boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException;
+    String getName();

    /**
-     * Gets the actual MVConfigProperty from this world.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
+     * Gets the type of this world. As of 1.2 this will be:
+     * FLAT, NORMAL or VERSION_1_1
+     * <p>
+     * This is <b>not</b> the generator.
     *
-     * @param property The name of a world property to get.
-     * @return A valid MVWorldProperty.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     * @deprecated Use {@link #getProperty(String, Class)} instead
+     * @return The Type of this world.
     */
-    @Deprecated
-    MVConfigProperty<?> getProperty(String property) throws PropertyDoesNotExistException;
-
-    /**
-     * Gets the string representation of a property.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
-     *
-     * @param property The name of a world property to get.
-     * @return A valid MVWorldProperty.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     */
-    String getPropertyValue(String property) 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.
-     */
-    <T> MVConfigProperty<T> getProperty(String property, Class<T> expected) throws PropertyDoesNotExistException;
-
-    /**
-     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
-     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
-     * @return True if it was cleared, false if not.
-     */
-    boolean clearVariable(String property);
-
-    /**
-     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
-     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @return True if the value was added, false if not.
-     */
-    boolean addToVariable(String property, String value);
-
-    /**
-     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
-     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
-     *                 from.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @return True if the value was removed, false if not.
-     */
-    boolean removeFromVariable(String property, String value);
+    WorldType getWorldType();

    /**
     * Gets the environment of this world.
@@ -124,27 +68,168 @@ public interface MultiverseWorld {
     */
    void setEnvironment(World.Environment environment);

+    /**
+     * Gets the difficulty of this world.
+     *
+     * @return The difficulty of this world.
+     */
+    Difficulty getDifficulty();
+
+    /**
+     * Sets the difficulty of this world and returns true if success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. {@code PEACEFUL}
+     *
+     * @param difficulty The difficulty to set the world to as a string.
+     * @return True if success, false if the provided string
+     *         could not be translated to a difficulty.
+     * @deprecated Use {@link #setDifficulty(Difficulty)} or, if you have to
+     * pass a string, use {@link #setPropertyValue(String, String)} instead.
+     */
+    @Deprecated
+    boolean setDifficulty(String difficulty);
+
+    /**
+     * Sets the difficulty of this world and returns {@code true} on success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. PEACEFUL
+     *
+     * @param difficulty The new difficulty.
+     * @return True if success, false if the operation failed... for whatever reason.
+     */
+    boolean setDifficulty(Difficulty difficulty);
+
    /**
     * Gets the world seed of this world.
     *
     * @return The Long version of the seed.
     */
-    Long getSeed();
+    long getSeed();

    /**
     * Sets the seed of this world.
     *
     * @param seed A Long that is the seed.
     */
-    void setSeed(Long seed);
+    void setSeed(long seed);

    /**
-     * Gets the name of this world. This cannot be changed.
+     * Gets the generator of this world.
     *
-     * @return The name of the world as a String.
+     * @return The name of the generator.
     */
-    String getName();
+    String getGenerator();

+    /**
+     * Sets the generator of this world.
+     *
+     * @param generator The new generator's name.
+     */
+    void setGenerator(String generator);
+
+    /**
+     * Gets the help-message for a property.
+     * @param property The name of the property.
+     * @return The help-message.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found.
+     */
+    String getPropertyHelp(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets a property as {@link String}.
+     *
+     * @param property The name of a world property to get.
+     * @return The string-representation of that property.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    String getPropertyValue(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Sets a property to a given value.
+     *
+     * @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.
+     * @return True if the value was set, false if not.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    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}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was added, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean addToVariable(String property, String value);
+
+    /**
+     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
+     *                 from.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was removed, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean removeFromVariable(String property, String value);
+
+    /**
+     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
+     * @return True if it was cleared, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean clearVariable(String property);
+
+    /**
+     * Clears a list property (sets it to []).
+     *
+     * @param property The property to clear.
+     * @return True if success, false if fail.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean clearList(String property);
+    // end of old config stuff
+
+    // permission stuff
    /**
     * Gets the lowercased name of the world. This method is required, since the permissables
     * lowercase all permissions when recalculating.
@@ -157,6 +242,21 @@ public interface MultiverseWorld {
     */
    String getPermissibleName();

+    /**
+     * Gets the permission required to enter this world.
+     *
+     * @return The permission required to be exempt from charges to/from this world.
+     */
+    Permission getAccessPermission();
+
+    /**
+     * Gets the permission required to be exempt when entering.
+     *
+     * @return The permission required to be exempt when entering.
+     */
+    Permission getExemptPermission();
+    // end of permission stuff
+
    /**
     * Gets the alias of this world.
     * <p>
@@ -173,6 +273,13 @@ public interface MultiverseWorld {
     */
    void setAlias(String alias);

+    /**
+     * Gets the color that this world's name/alias will display as.
+     *
+     * @return The color of this world.
+     */
+    ChatColor getColor();
+
    /**
     * Sets the color that this world's name/alias will display as.
     *
@@ -182,18 +289,29 @@ public interface MultiverseWorld {
    boolean setColor(String color);

    /**
-     * Gets the color that this world's name/alias will display as.
+     * Gets the style that this world's name/alias will display as.
     *
-     * @return The color of this world.
+     * @return The style of this world. {@code null} for "normal" style.
     */
-    ChatColor getColor();
+    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.
     *
     * @param color A string that may translate to a color.
     * @return True if it is a color, false if not.
+     *
+     * @deprecated This has been moved: {@link com.onarandombox.MultiverseCore.enums.EnglishChatColor#isValidAliasColor(String)}
     */
+    @Deprecated
    boolean isValidAliasColor(String color);

    /**
@@ -203,6 +321,7 @@ public interface MultiverseWorld {
     */
    String getColoredWorldString();

+    // animals&monster stuff
    /**
     * Gets whether or not animals are allowed to spawn in this world.
     *
@@ -210,6 +329,22 @@ public interface MultiverseWorld {
     */
    boolean canAnimalsSpawn();

+    /**
+     * Sets whether or not animals can spawn.
+     * If there are values in {@link #getAnimalList()} and this is false,
+     * those animals become the exceptions, and will spawn
+     *
+     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowAnimalSpawn(boolean allowAnimalSpawn);
+
+    /**
+     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
+     *
+     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
+     */
+    List<String> getAnimalList();
+
    /**
     * Gets whether or not monsters are allowed to spawn in this world.
     *
@@ -218,7 +353,31 @@ public interface MultiverseWorld {
    boolean canMonstersSpawn();

    /**
-     * Turn pvp on or off. This setting is used to set the world's PVP mode, and thus relies on fakePVP
+     * Sets whether or not monsters can spawn.
+     * If there are values in {@link #getMonsterList()} and this is false,
+     * those monsters become the exceptions, and will spawn
+     *
+     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowMonsterSpawn(boolean allowMonsterSpawn);
+
+    /**
+     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} result.
+     *
+     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
+     */
+    List<String> getMonsterList();
+    // end of animal&monster stuff
+
+    /**
+     * Gets whether or not PVP is enabled in this world in some form (fake or not).
+     *
+     * @return True if players can take damage from other players.
+     */
+    boolean isPVPEnabled();
+
+    /**
+     * Turn pvp on or off. This setting is used to set the world's PVP mode.
     *
     * @param pvpMode True to enable PVP damage, false to disable it.
     */
@@ -233,13 +392,6 @@ public interface MultiverseWorld {
    @Deprecated
    boolean getFakePVP();

-    /**
-     * Gets whether or not PVP is enabled in this world in some form (fake or not).
-     *
-     * @return True if players can take damage from other players.
-     */
-    boolean isPVPEnabled();
-
    /**
     * Gets whether or not this world will display in chat, mvw and mvl regardless if a user has the
     * access permissions to go to this world.
@@ -256,6 +408,13 @@ public interface MultiverseWorld {
     */
    void setHidden(boolean hidden);

+    /**
+     * Gets whether weather is enabled in this world.
+     *
+     * @return True if weather events will occur, false if not.
+     */
+    boolean isWeatherEnabled();
+
    /**
     * Sets whether or not there will be weather events in a given world.
     * If set to false, Multiverse will disable the weather in the world immediately.
@@ -265,11 +424,11 @@ public interface MultiverseWorld {
    void setEnableWeather(boolean enableWeather);

    /**
-     * Gets whether weather is enabled in this world.
+     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
     *
-     * @return True if weather events will occur, false if not.
+     * @return True if CraftBukkit is keeping spawn chunks in memory.
     */
-    boolean isWeatherEnabled();
+    boolean isKeepingSpawnInMemory();

    /**
     * If true, tells Craftbukkit to keep a worlds spawn chunks loaded in memory (default: true)
@@ -281,29 +440,11 @@ public interface MultiverseWorld {
    void setKeepSpawnInMemory(boolean keepSpawnInMemory);

    /**
-     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
+     * Gets the spawn location of this world.
     *
-     * @return True if CraftBukkit is keeping spawn chunks in memory.
+     * @return The spawn location of this world.
     */
-    boolean isKeepingSpawnInMemory();
-
-    /**
-     * Sets the difficulty of this world and returns true if success.
-     * Valid string values are either an integer of difficulty(0-3) or
-     * the name that resides in the Bukkit enum, ex. PEACEFUL
-     *
-     * @param difficulty The difficulty to set the world to as a string.
-     * @return True if success, false if the provided string
-     *         could not be translated to a difficulty.
-     */
-    boolean setDifficulty(String difficulty);
-
-    /**
-     * Gets the difficulty of this world.
-     *
-     * @return The difficulty of this world.
-     */
-    Difficulty getDifficulty();
+    Location getSpawnLocation();

    /**
     * Sets the spawn location for a world.
@@ -313,11 +454,11 @@ public interface MultiverseWorld {
    void setSpawnLocation(Location spawnLocation);

    /**
-     * Gets the spawn location of this world.
+     * Gets whether or not the hunger level of players will go down in a world.
     *
-     * @return The spawn location of this world.
+     * @return True if it will go down, false if it will remain steady.
     */
-    Location getSpawnLocation();
+    boolean getHunger();

    /**
     * Sets whether or not the hunger level of players will go down in a world.
@@ -327,22 +468,6 @@ public interface MultiverseWorld {
     */
    void setHunger(boolean hungerEnabled);

-    /**
-     * Gets whether or not the hunger level of players will go down in a world.
-     *
-     * @return True if it will go down, false if it will remain steady.
-     */
-    boolean getHunger();
-
-    /**
-     * Sets the game mode of this world.
-     *
-     * @param gameMode A valid game mode string (either
-     *                 an int ex. 0 or a string ex. creative).
-     * @return True if the game mode was successfully changed, false if not.
-     */
-    boolean setGameMode(String gameMode);
-
    /**
     * Gets the GameMode of this world.
     *
@@ -351,18 +476,31 @@ public interface MultiverseWorld {
    GameMode getGameMode();

    /**
-     * Gets the permission required to enter this world.
+     * Sets the game mode of this world.
     *
-     * @return The permission required to be exempt from charges to/from this world.
+     * @param gameMode A valid game mode string (either
+     *                 an int ex. 0 or a string ex. creative).
+     * @return True if the game mode was successfully changed, false if not.
+     * @deprecated Use {@link #setGameMode(GameMode)} instead. If you have to
+     * pass a string, use {@link #setPropertyValue(String, String)}.
     */
-    Permission getAccessPermission();
+    @Deprecated
+    boolean setGameMode(String gameMode);

    /**
-     * Gets the permission required to be exempt when entering.
+     * Sets the game mode of this world.
     *
-     * @return The permission required to be exempt when entering.
+     * @param gameMode The new {@link GameMode}.
+     * @return True if the game mode was successfully changed, false if not.
     */
-    Permission getExemptPermission();
+    boolean setGameMode(GameMode gameMode);
+
+    /**
+     * Gets the amount of currency it requires to enter this world.
+     *
+     * @return The amount it costs to enter this world.
+     */
+    double getPrice();

    /**
     * Sets the price for entry to this world.
@@ -374,11 +512,11 @@ public interface MultiverseWorld {
    void setPrice(double price);

    /**
-     * Gets the amount of currency it requires to enter this world.
+     * Gets the Type of currency that will be used when users enter this world.
     *
-     * @return The amount it costs to enter this world.
+     * @return The Type of currency that will be used when users enter this world.
     */
-    double getPrice();
+    int getCurrency();

    /**
     * Sets the type of item that will be required given the price is not 0.
@@ -389,11 +527,11 @@ public interface MultiverseWorld {
    void setCurrency(int item);

    /**
-     * Gets the Type of currency that will be used when users enter this world.
+     * Gets the world players will respawn in if they die in this one.
     *
-     * @return The Type of currency that will be used when users enter this world.
+     * @return A world that exists on the server.
     */
-    int getCurrency();
+    World getRespawnToWorld();

    /**
     * Sets the world players will respawn in if they die in this one.
@@ -405,11 +543,12 @@ public interface MultiverseWorld {
    boolean setRespawnToWorld(String respawnWorld);

    /**
-     * Gets the world players will respawn in if they die in this one.
+     * Gets the scaling value of this world.Really only has an effect if you use
+     * Multiverse-NetherPortals.
     *
-     * @return A world that exists on the server.
+     * @return This world's non-negative, non-zero scale.
     */
-    World getRespawnToWorld();
+    double getScaling();

    /**
     * Sets the scale of this world. Really only has an effect if you use
@@ -421,60 +560,11 @@ public interface MultiverseWorld {
    boolean setScaling(double scaling);

    /**
-     * Gets the scaling value of this world.Really only has an effect if you use
-     * Multiverse-NetherPortals.
+     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
     *
-     * @return This world's non-negative, non-zero scale.
+     * @return True if the world should heal (default), false if not.
     */
-    double getScaling();
-
-    /**
-     * Gets a list of all the worlds that players CANNOT travel to from this world,
-     * regardless of their access permissions.
-     *
-     * @return A List of world names.
-     */
-    List<String> getWorldBlacklist();
-
-    /**
-     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
-     *
-     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
-     */
-    List<String> getAnimalList();
-
-    /**
-     * Sets whether or not animals can spawn.
-     * If there are values in {@link #getAnimalList()} and this is false,
-     * those animals become the exceptions, and will spawn
-     *
-     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
-     */
-    void setAllowAnimalSpawn(boolean allowAnimalSpawn);
-
-    /**
-     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} ()} result.
-     *
-     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
-     */
-    List<String> getMonsterList();
-
-    /**
-     * Sets whether or not monsters can spawn.
-     * If there are values in {@link #getMonsterList()} and this is false,
-     * those monsters become the exceptions, and will spawn
-     *
-     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
-     */
-    void setAllowMonsterSpawn(boolean allowMonsterSpawn);
-
-    /**
-     * Clears a list property (sets it to []).
-     *
-     * @param property The property to clear.
-     * @return True if success, false if fail.
-     */
-    boolean clearList(String property);
+    boolean getAutoHeal();

    /**
     * Sets whether or not a world will auto-heal players if the difficulty is on peaceful.
@@ -484,11 +574,11 @@ public interface MultiverseWorld {
    void setAutoHeal(boolean heal);

    /**
-     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
+     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
     *
-     * @return True if the world should heal (default), false if not.
+     * @return True if Multiverse should adjust the spawn, false if not.
     */
-    boolean getAutoHeal();
+    boolean getAdjustSpawn();

    /**
     * Sets whether or not Multiverse should auto-adjust the spawn for this world.
@@ -498,11 +588,11 @@ public interface MultiverseWorld {
    void setAdjustSpawn(boolean adjust);

    /**
-     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
+     * Gets whether or not Multiverse should auto-load this world.
     *
-     * @return True if Multiverse should adjust the spawn, false if not.
+     * @return True if Multiverse should auto-load this world.
     */
-    boolean getAdjustSpawn();
+    boolean getAutoLoad();

    /**
     * Sets whether or not Multiverse should auto-load this world.
@@ -514,11 +604,12 @@ public interface MultiverseWorld {
    void setAutoLoad(boolean autoLoad);

    /**
-     * Gets whether or not Multiverse should auto-load this world.
+     * Gets whether or not a player who dies in this world will respawn in their
+     * bed or follow the normal respawn pattern.
     *
-     * @return True if Multiverse should auto-load this world.
+     * @return True if players dying in this world should respawn at their bed.
     */
-    boolean getAutoLoad();
+    boolean getBedRespawn();

    /**
     * Sets whether or not a player who dies in this world will respawn in their
@@ -531,19 +622,10 @@ public interface MultiverseWorld {
    void setBedRespawn(boolean autoLoad);

    /**
-     * Gets whether or not a player who dies in this world will respawn in their
-     * bed or follow the normal respawn pattern.
-     *
-     * @return True if players dying in this world should respawn at their bed.
+     * Same as {@link #getTime()}, but returns a string.
+     * @return The time as a short string: 12:34pm
     */
-    boolean getBedRespawn();
-
-    /**
-     * Gets all the names of all properties that can be SET.
-     *
-     * @return All property names, with alternating colors.
-     */
-    String getAllPropertyNames();
+    String getTime();

    /**
     * Sets the current time in a world.
@@ -559,18 +641,32 @@ public interface MultiverseWorld {
    boolean setTime(String timeAsString);

    /**
-     * Same as {@link #getTime()}, but returns a string.
-     * @return The time as a short string: 12:34pm
+     * Sets The types of portals that are allowed in this world.
+     *
+     * @param type The type of portals allowed in this world.
     */
-    String getTime();
+    void allowPortalMaking(AllowedPortalType type);

    /**
-     * Gets the type of this world. As of 1.1-R1 this will be:
-     * FLAT or NORMAL
-     * <p>
-     * This is *not* the generator.
+     * Gets which type(s) of portals are allowed to be constructed in this world.
     *
-     * @return The Type of this world.
+     * @return The type of portals that are allowed.
     */
-    WorldType getWorldType();
+    AllowedPortalType getAllowedPortals();
+
+    // properties that are not "getter+setter" style
+    /**
+     * Gets a list of all the worlds that players CANNOT travel to from this world,
+     * regardless of their access permissions.
+     *
+     * @return A List of world names.
+     */
+    List<String> getWorldBlacklist();
+
+    /**
+     * Gets all the names of all properties that can be SET.
+     *
+     * @return All property names, with alternating colors.
+     */
+    String getAllPropertyNames();
 }
@@ -0,0 +1,71 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+
+/**
+ * Used to safely teleport people.
+ */
+public interface SafeTTeleporter {
+
+    /**
+     * Gets the next safe location around the given location.
+     * @param l A {@link Location}.
+     * @return A safe {@link Location}.
+     */
+    Location getSafeLocation(Location l);
+
+    /**
+     * 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}.
+     */
+    Location getSafeLocation(Location l, int tolerance, int radius);
+
+    /**
+     * 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
+     */
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d);
+
+    /**
+     * 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.
+     */
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, Location location,
+            boolean safely);
+
+    /**
+     * 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.
+     */
+    Location getSafeLocation(Entity e, MVDestination d);
+
+    /**
+     * Finds a portal-block next to the specified {@link Location}.
+     * @param l The {@link Location}
+     * @return The next portal-block's {@link Location}.
+     */
+    Location findPortalBlockNextTo(Location l);
+
+}
@@ -0,0 +1,68 @@
+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 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.
+     *
+     * @param world The {@link MultiverseWorld}.
+     */
+    void purgeWorld(MultiverseWorld world);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MultiverseWorld}.
+     * @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.
+     */
+    void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
+            boolean negateMonsters);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MultiverseWorld}.
+     * @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.
+     * @param sender The {@link CommandSender} that initiated the action. He will/should be notified.
+     */
+    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) {
@@ -85,6 +95,8 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {

        if (filterObject.getPage() > totalPages) {
            filterObject.setPage(totalPages);
+        } else if (filterObject.getPage() < 1) {
+            filterObject.setPage(1);
        }

        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
@@ -98,11 +110,19 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
            this.showList(sender, args);
            return;
        }
-        if (args.size() == 2) {
-            if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
-                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
+        if (args.size() == 1 && (this.getPageAndFilter(args).getPage() != 1 || args.get(0).equals("1"))) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
+            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;
        }
@@ -111,13 +131,17 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
            sender.sendMessage("You must be a player to create Anchors.");
            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!");
-        } else {
-            sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "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 {
+            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
@@ -45,18 +45,13 @@ public class CheckCommand extends MultiverseCommand {
        }
        MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
        if (dest instanceof InvalidDestination) {
-            sender.sendMessage("You asked if '" + args.get(0) + "' could go to " + ChatColor.GREEN + args.get(0) + ChatColor.WHITE + ",");
+            sender.sendMessage(String.format("You asked if '%s' could go to %s%s%s,",
+                    args.get(0), ChatColor.GREEN, args.get(0), ChatColor.WHITE));
            sender.sendMessage("but I couldn't find a Destination of that name? Did you type it correctly?");
            return;
        }

        MVPermissions perms = this.plugin.getMVPerms();
-        if (perms.canEnterDestination(p, dest)) {
-            sender.sendMessage(ChatColor.GREEN + args.get(0) + ChatColor.WHITE + " can travel to " + ChatColor.GREEN + args.get(1));
-        } else {
-            sender.sendMessage(ChatColor.AQUA + args.get(0) + ChatColor.RED + " CANNOT travel to " + ChatColor.AQUA + args.get(1));
-            sender.sendMessage("Please turn debug mode to 3 then watch the console to find out why!");
-            sender.sendMessage("Use: " + ChatColor.GREEN + "/mv debug 3");
-        }
+        perms.tellMeWhyICantDoThis(sender, p, dest);
    }
 }
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.pneumaticraft.commandhandler.CommandHandler;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 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.addCommandExample("To clone a world that uses a generator:");
+        this.addCommandExample("/mv clone " + ChatColor.GOLD + "CleanRoom"
+                + ChatColor.GREEN + " CleanRoomCopy" + ChatColor.DARK_AQUA + " -g CleanRoomGenerator");
+        this.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Class<?>[] paramTypes = {String.class, String.class, String.class};
+        List<Object> objectArgs = new ArrayList<Object>();
+        objectArgs.add(args.get(0));
+        objectArgs.add(args.get(1));
+        objectArgs.add(CommandHandler.getFlag("-g", args));
+        if (!this.worldManager.isMVWorld(args.get(0))) {
+            // If no world was found, we can't clone.
+            sender.sendMessage("Sorry, Multiverse doesn't know about world " + args.get(0) + ", so we can't clone it!");
+            sender.sendMessage("Check the " + ChatColor.GREEN + "/mv list" + ChatColor.WHITE + " command to verify it is listed.");
+            return;
+        }
+        this.plugin.getCommandHandler().queueCommand(sender, "mvclone", "cloneWorld", objectArgs,
+                paramTypes, ChatColor.GREEN + "World Cloned!", ChatColor.RED + "World could NOT be cloned!");
+    }
+}
@@ -8,12 +8,12 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.enums.ConfigProperty;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

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

 /**
 * Allows you to set Global MV Variables.
@@ -28,7 +28,6 @@ public class ConfigCommand extends MultiverseCommand {
        this.addKey("mvconfig");
        this.addKey("mv conf");
        this.addKey("mvconf");
-        this.addCommandExample("All values: " + ConfigProperty.getAllValues());
        this.addCommandExample("/mv config show");
        this.addCommandExample("/mv config " + ChatColor.GREEN + "debug" + ChatColor.AQUA + " 3");
        this.addCommandExample("/mv config " + ChatColor.GREEN + "enforceaccess" + ChatColor.AQUA + " false");
@@ -38,55 +37,31 @@ public class ConfigCommand extends MultiverseCommand {
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        if (args.size() <= 1) {
-            String[] allProps = ConfigProperty.getAllValues().split(" ");
-            String currentvals = "";
-            for (String prop : allProps) {
-                currentvals += ChatColor.GREEN;
-                currentvals += prop;
-                currentvals += ChatColor.WHITE;
-                currentvals += " = ";
-                currentvals += ChatColor.GOLD;
-                currentvals += this.plugin.getMVConfiguration().get(prop, "NOT SET");
-                currentvals += ChatColor.WHITE;
-                currentvals += ", ";
+            StringBuilder builder = new StringBuilder();
+            Map<String, Object> serializedConfig = this.plugin.getMVConfig().serialize();
+            for (Map.Entry<String, Object> entry : serializedConfig.entrySet()) {
+                builder.append(ChatColor.GREEN);
+                builder.append(entry.getKey());
+                builder.append(ChatColor.WHITE).append(" = ").append(ChatColor.GOLD);
+                builder.append(entry.getValue().toString());
+                builder.append(ChatColor.WHITE).append(", ");
            }
-            sender.sendMessage(currentvals.substring(0, currentvals.length() - 2));
+            String message = builder.toString();
+            message = message.substring(0, message.length() - 2);
+            sender.sendMessage(message);
            return;
        }
+        if (!this.plugin.getMVConfig().setConfigProperty(args.get(0).toLowerCase(), args.get(1))) {
+            sender.sendMessage(String.format("%sSetting '%s' to '%s' failed!", ChatColor.RED, args.get(0).toLowerCase(), args.get(1)));
+            return;
+        }
+
+        // special rule
        if (args.get(0).equalsIgnoreCase("firstspawnworld")) {
-            this.plugin.getMVConfiguration().set(args.get(0).toLowerCase(), args.get(1));
            // Don't forget to set the world!
            this.plugin.getMVWorldManager().setFirstSpawnWorld(args.get(1));
-        } else if (args.get(0).equalsIgnoreCase("messagecooldown") || args.get(0).equalsIgnoreCase("teleportcooldown")
-                || args.get(0).equalsIgnoreCase("debug")) {
-            try {
-                this.plugin.getMVConfiguration().set(args.get(0).toLowerCase(), Integer.parseInt(args.get(1)));
-            } catch (NumberFormatException e) {
-                sender.sendMessage(ChatColor.RED + "Sorry, " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE + " must be an integer!");
-                return;
-            }
-        } else {
-            ConfigProperty property = null;
-            try {
-                property = ConfigProperty.valueOf(args.get(0).toLowerCase());
-            } catch (IllegalArgumentException e) {
-                sender.sendMessage(ChatColor.RED + "Sorry, " + ChatColor.AQUA
-                        + args.get(0) + ChatColor.WHITE + " you can't set " + ChatColor.AQUA + args.get(0));
-                sender.sendMessage(ChatColor.GREEN + "Valid values are:");
-                sender.sendMessage(ConfigProperty.getAllValues());
-                return;
-            }
-
-            if (property != null) {
-                try {
-                    this.plugin.getMVConfiguration().set(args.get(0).toLowerCase(), Boolean.parseBoolean(args.get(1)));
-                } catch (Exception e) {
-                    sender.sendMessage(ChatColor.RED + "Sorry, " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE + " must be true or false!");
-                    return;
-                }
-
-            }
        }
+
        if (this.plugin.saveMVConfigs()) {
            sender.sendMessage(ChatColor.GREEN + "SUCCESS!" + ChatColor.WHITE + " Values were updated successfully!");
            this.plugin.loadConfigs();
@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -61,8 +60,8 @@ public class CoordCommand extends MultiverseCommand {
            DecimalFormat df = new DecimalFormat();
            df.setMinimumFractionDigits(0);
            df.setMaximumFractionDigits(2);
-            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + LocationManipulation.strCoords(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + LocationManipulation.getDirection(p.getLocation()));
+            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())));
        } 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;

 /**
@@ -29,8 +31,9 @@ public class CreateCommand extends MultiverseCommand {
    public CreateCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Create World");
-        this.setCommandUsage("/mv create" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -s [SEED] -g [GENERATOR[:ID]] -t [WORLDTYPE] [-n]");
-        this.setArgRange(2, 9); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.setCommandUsage(String.format("/mv create %s{NAME} {ENV} %s-s [SEED] -g [GENERATOR[:ID]] -t [WORLDTYPE] [-n] -a [true|false]",
+                ChatColor.GREEN, ChatColor.GOLD));
+        this.setArgRange(2, 11); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        this.addKey("mvcreate");
        this.addKey("mvc");
        this.addKey("mv create");
@@ -51,6 +54,11 @@ public class CreateCommand extends MultiverseCommand {
        String env = args.get(1);
        String seed = CommandHandler.getFlag("-s", args);
        String generator = CommandHandler.getFlag("-g", args);
+        boolean allowStructures = true;
+        String structureString = CommandHandler.getFlag("-a", args);
+        if (structureString != null) {
+            allowStructures = Boolean.parseBoolean(structureString);
+        }
        String typeString = CommandHandler.getFlag("-t", args);
        boolean useSpawnAdjust = true;
        for (String s : args) {
@@ -58,7 +66,13 @@ public class CreateCommand extends MultiverseCommand {
                useSpawnAdjust = false;
            }
        }
-        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;
@@ -81,10 +95,22 @@ 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, generator, useSpawnAdjust)) {
+        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
            Command.broadcastCommandMessage(sender, "Complete!");
        } else {
            Command.broadcastCommandMessage(sender, "FAILED.");
@@ -36,29 +36,29 @@ public class DebugCommand extends MultiverseCommand {
    public void runCommand(CommandSender sender, List<String> args) {
        if (args.size() == 1) {
            if (args.get(0).equalsIgnoreCase("off")) {
-                MultiverseCore.GlobalDebug = 0;
+                plugin.getMVConfig().setGlobalDebug(0);
            } else {
                try {
                    int debugLevel = Integer.parseInt(args.get(0));
                    if (debugLevel > 3 || debugLevel < 0) {
                        throw new NumberFormatException();
                    }
-                    MultiverseCore.GlobalDebug = debugLevel;
+                    plugin.getMVConfig().setGlobalDebug(debugLevel);
                } catch (NumberFormatException e) {
                    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 (MultiverseCore.GlobalDebug == 0) {
+        if (plugin.getMVConfig().getGlobalDebug() == 0) {
            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
        } else {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + MultiverseCore.GlobalDebug);
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + plugin.getMVConfig().getGlobalDebug());
            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
        }
    }
@@ -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 %sor %sFLAT",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA));
+        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
@@ -75,6 +75,9 @@ public class EnvironmentCommand extends MultiverseCommand {
            type = "NORMAL";
        if (type.equalsIgnoreCase("flat"))
            type = "FLAT";
+        if (type.equalsIgnoreCase("largebiomes")) {
+            type = "LARGE_BIOMES";
+        }
        try {
            // Now that we've converted a potentially unfriendly value
            // to a friendly one, get it from the ENUM!
@@ -91,6 +94,7 @@ public class EnvironmentCommand extends MultiverseCommand {
     * @return The environment as {@link org.bukkit.World.Environment}
     */
    public static World.Environment getEnvFromString(String env) {
+        env = env.toUpperCase();
        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
            env = "NETHER";
@@ -13,7 +13,6 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
-import org.bukkit.WorldType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
@@ -33,14 +32,14 @@ public class ImportCommand extends MultiverseCommand {
    public ImportCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Import World");
-        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n] -t [TYPE]");
-        this.setArgRange(2, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n]");
+        this.setArgRange(1, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        this.addKey("mvimport");
        this.addKey("mvim");
        this.addKey("mv import");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal");
-        this.addCommandExample("/mv import " + ChatColor.GOLD + "flatroom" + ChatColor.GREEN + " normal" + ChatColor.AQUA + " -t flat");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "hell_world" + ChatColor.GREEN + " nether");
+        this.addCommandExample("To import a world that uses a generator, you'll need the generator:");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "CleanRoom" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " CleanRoomGenerator");
        this.setPermission("multiverse.core.import", "Imports a new world of the specified type.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
@@ -53,7 +52,7 @@ public class ImportCommand extends MultiverseCommand {
     * @param worldFolder The File that may be a world.
     * @return True if it looks like a world, false if not.
     */
-    private boolean checkIfIsWorld(File worldFolder) {
+    private static boolean checkIfIsWorld(File worldFolder) {
        if (worldFolder.isDirectory()) {
            File[] files = worldFolder.listFiles(new FilenameFilter() {
                @Override
@@ -128,7 +127,6 @@ public class ImportCommand extends MultiverseCommand {
        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);

        String generator = CommandHandler.getFlag("-g", args);
-        String typeString = CommandHandler.getFlag("-t", args);
        boolean useSpawnAdjust = true;
        for (String s : args) {
            if (s.equalsIgnoreCase("-n")) {
@@ -144,20 +142,9 @@ public class ImportCommand extends MultiverseCommand {
            return;
        }

-        // If they didn't specify a type, default to NORMAL
-        if (typeString == null) {
-            typeString = "NORMAL";
-        }
-        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
-        if (type == null) {
-            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
-            EnvironmentCommand.showWorldTypes(sender);
-            return;
-        }
-
        if (worldFile.exists() && env != null) {
            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
-            if (this.worldManager.addWorld(worldName, environment, null, type, generator, useSpawnAdjust))
+            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
            else
                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
@@ -14,7 +14,6 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.utils.FancyColorScheme;
 import com.onarandombox.MultiverseCore.utils.FancyHeader;
 import com.onarandombox.MultiverseCore.utils.FancyMessage;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -62,9 +61,13 @@ public class InfoCommand extends MultiverseCommand {
                return;
            }
        } else if (args.size() == 1) {
-            if (this.worldManager.getMVWorld(args.get(0)) != null) {
+            if (this.worldManager.isMVWorld(args.get(0))) {
                // then we have a world!
                worldName = args.get(0);
+            } else if (this.worldManager.getUnloadedWorlds().contains(args.get(0))) {
+                sender.sendMessage("That world exists, but it is unloaded!");
+                sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, args.get(0)));
+                return;
            } else {
                if (sender instanceof Player) {
                    Player p = (Player) sender;
@@ -72,7 +75,8 @@ public class InfoCommand extends MultiverseCommand {
                    try {
                        pageNum = Integer.parseInt(args.get(0)) - 1;
                    } catch (NumberFormatException e) {
-                        pageNum = 0;
+                        sender.sendMessage("That world does not exist.");
+                        return;
                    }
                } else {
                    sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
@@ -94,8 +98,11 @@ public class InfoCommand extends MultiverseCommand {
                p = (Player) sender;
            }
            showPage(pageNum, sender, this.buildEntireCommand(this.worldManager.getMVWorld(worldName), p));
+        } else if (this.worldManager.getUnloadedWorlds().contains(worldName)) {
+            sender.sendMessage("That world exists, but it is unloaded!");
+            sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, worldName));
        } else if (this.plugin.getServer().getWorld(worldName) != null) {
-            sender.sendMessage("That world exists, but multiverse does not know about it!");
+            sender.sendMessage("That world exists, but Multiverse does not know about it!");
            sender.sendMessage("You can import it with" + ChatColor.AQUA + "/mv import " + ChatColor.GREEN + worldName + ChatColor.LIGHT_PURPLE + "{ENV}");
            sender.sendMessage("For available environments type " + ChatColor.GREEN + "/mv env");
        }
@@ -110,14 +117,20 @@ public class InfoCommand extends MultiverseCommand {
        message.add(new FancyMessage("World Name: ", world.getName(), colors));
        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
        message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
-        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
+
        //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
        Location spawn = world.getSpawnLocation();
-        message.add(new FancyMessage("Spawn Location: ", LocationManipulation.strCoords(spawn), colors));
+        message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
        message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
        if (world.getPrice() > 0) {
-            message.add(new FancyMessage("Price to enter this world: ",
-                    this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
+            final String formattedAmount;
+            if (world.getCurrency() <= 0 && plugin.getVaultEconomy() != null) {
+                formattedAmount = plugin.getVaultEconomy().format(world.getPrice());
+            } else {
+                formattedAmount = this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency());
+            }
+            message.add(new FancyMessage("Price to enter this world: ", formattedAmount, colors));
        } else {
            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
        }
@@ -136,7 +149,8 @@ public class InfoCommand extends MultiverseCommand {
        // Page 2
        message = new ArrayList<FancyText>();
        message.add(new FancyHeader("More World Settings", colors));
-        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
+        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
        message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
        message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
        message.add(new FancyMessage("Keep spawn in memory: ", world.isKeepingSpawnInMemory() + "", colors));
@@ -181,7 +195,7 @@ public class InfoCommand extends MultiverseCommand {
        return worldInfo;
    }

-    private String toCommaSeperated(List<String> list) {
+    private static String toCommaSeperated(List<String> list) {
        if (list == null || list.size() == 0) {
            return "";
        }
@@ -207,7 +221,7 @@ public class InfoCommand extends MultiverseCommand {
        return positive ? ChatColor.GREEN : ChatColor.RED;
    }

-    private void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
+    private static void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
        page = page < 0 ? 0 : page;
        page = page > doc.size() - 1 ? doc.size() - 1 : page;
        boolean altColor = false;
@@ -52,14 +52,16 @@ public class ListCommand extends PaginatedCoreCommand<String> {
            } else if (env == Environment.THE_END) {
                color = ChatColor.AQUA;
            }
-            String outputCache = world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment();
+            StringBuilder builder = new StringBuilder();
+            builder.append(world.getColoredWorldString()).append(ChatColor.WHITE);
+            builder.append(" - ").append(color).append(world.getEnvironment());
            if (world.isHidden()) {
-                if (p == null || p.hasPermission("multiverse.core.modify")) {
+                if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.core.modify", true)) {
                    // Prefix hidden worlds with an "[H]"
-                    worldList.add(ChatColor.GRAY + "[H]" + outputCache);
+                    worldList.add(ChatColor.GRAY + "[H]" + builder.toString());
                }
            } else {
-                worldList.add(outputCache);
+                worldList.add(builder.toString());
            }
        }
        for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
@@ -81,9 +81,13 @@ public class ModifyAddCommand extends MultiverseCommand {
            return;
        }

+        // TODO fix this
        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);
        }
@@ -75,10 +75,14 @@ public class ModifyClearCommand extends MultiverseCommand {
            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/cgB2B");
            return;
        }
+        // TODO fix this
        if (world.clearList(property)) {
            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.");
@@ -81,9 +81,13 @@ public class ModifyRemoveCommand extends MultiverseCommand {
            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
            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);
@@ -102,22 +102,24 @@ public class ModifySetCommand extends MultiverseCommand {
            return;
        }

-        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) {
+        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !EnglishChatColor.isValidAliasColor(value)) {
            sender.sendMessage(value + " is not a valid color. Please pick one of the following:");
            sender.sendMessage(EnglishChatColor.getAllColors());
            return;
        }
        try {
-            if (world.setProperty(property, value, sender)) {
+            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(world.getProperty(property, Object.class).getHelp());
+                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
            }
        } catch (PropertyDoesNotExistException e) {
            sender.sendMessage(ChatColor.RED + "Sorry, You can't set: '" + ChatColor.GRAY + property + ChatColor.RED + "'");
-            // TODO: Display the list
-            sender.sendMessage(ChatColor.GOLD + "For a full list of thingys, see our wiki.");
+            sender.sendMessage("Valid world-properties: " + world.getAllPropertyNames());
        }
    }
 }
@@ -8,7 +8,7 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.MVMessaging;
+import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
 import com.pneumaticraft.commandhandler.Command;
 import org.bukkit.command.CommandSender;

@@ -24,9 +24,9 @@ public abstract class MultiverseCommand extends Command {
     */
    protected MultiverseCore plugin;
    /**
-     * The reference to {@link MVMessaging}.
+     * The reference to {@link MultiverseMessaging}.
     */
-    protected MVMessaging messaging;
+    protected MultiverseMessaging messaging;

    public MultiverseCommand(MultiverseCore plugin) {
        super(plugin);
@@ -10,7 +10,7 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
+import com.onarandombox.MultiverseCore.api.WorldPurger;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -65,7 +65,7 @@ public class PurgeCommand extends MultiverseCommand {
        }

        if (!worldName.equalsIgnoreCase("all") && !this.worldManager.isMVWorld(worldName)) {
-            ((MultiverseCore) this.plugin).showNotMVWorldMessage(sender, worldName);
+            this.plugin.showNotMVWorldMessage(sender, worldName);
            sender.sendMessage("It cannot be purged.");
            return;
        }
@@ -78,7 +78,7 @@ public class PurgeCommand extends MultiverseCommand {
            worldsToRemoveEntitiesFrom.add(this.worldManager.getMVWorld(worldName));
        }

-        PurgeWorlds purger = this.worldManager.getWorldPurger();
+        WorldPurger purger = this.worldManager.getTheWorldPurger();
        ArrayList<String> thingsToKill = new ArrayList<String>();
        if (deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
            thingsToKill.add(deathName.toUpperCase());
@@ -86,7 +86,7 @@ public class PurgeCommand extends MultiverseCommand {
            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
        }
        for (MultiverseWorld w : worldsToRemoveEntitiesFrom) {
-            purger.purgeWorld(sender, w, thingsToKill, false, false);
+            purger.purgeWorld(w, thingsToKill, false, false, sender);
        }
    }
 }
@@ -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));
+    }
+}
@@ -8,9 +8,8 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.BlockSafety;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -56,7 +55,7 @@ public class SetSpawnCommand extends MultiverseCommand {
            MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
            if (foundWorld != null) {
                foundWorld.setSpawnLocation(p.getLocation());
-                BlockSafety bs = new BlockSafety();
+                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.");
@@ -64,7 +63,7 @@ public class SetSpawnCommand extends MultiverseCommand {
                    sender.sendMessage(ChatColor.AQUA + "/mvm set adjustspawn true " + foundWorld.getAlias());
                    foundWorld.setAdjustSpawn(false);
                }
-                sender.sendMessage("Spawn was set to: " + LocationManipulation.strCoords(p.getLocation()));
+                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).");
@@ -85,6 +85,6 @@ public class SpawnCommand extends MultiverseCommand {
        } else {
            spawnLocation = player.getWorld().getSpawnLocation();
        }
-        this.plugin.getTeleporter().safelyTeleport(player, player, spawnLocation, false);
+        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
    }
 }
@@ -4,7 +4,7 @@
 * For more information please check the README.md file included              *
 * with this project.                                                         *
 ******************************************************************************/
-
+/*
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -21,7 +21,7 @@ import java.util.List;

 /**
 * Edit a world with spout.
- */
+ * /
 public class SpoutCommand extends MultiverseCommand {

    public SpoutCommand(MultiverseCore plugin) {
@@ -51,7 +51,7 @@ public class SpoutCommand extends MultiverseCommand {
        }
        PopupScreen pop = new GenericPopup();
        GenericButton button = new GenericButton("Fish");
-        // TODO maybe use constants for these
+        // TO-DO maybe use constants for these
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        button.setX(50);
        button.setY(50);
@@ -63,3 +63,4 @@ public class SpoutCommand extends MultiverseCommand {
        p.getMainScreen().attachPopupScreen(pop);
    }
 }
+*/
@@ -14,8 +14,7 @@ import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.enums.TeleportResult;
 import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
-import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -43,7 +42,7 @@ public class TeleportCommand extends MultiverseCommand {
        this.setArgRange(1, 2);
        this.addKey("mvtp");
        this.addKey("mv tp");
-        this.playerTeleporter = new SafeTTeleporter(this.plugin);
+        this.playerTeleporter = this.plugin.getSafeTTeleporter();
        this.setPermission(menu);
    }

@@ -51,12 +50,8 @@ public class TeleportCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
        CommandSender teleporter = sender;
        Player teleportee = null;
-        if (sender instanceof Player) {
-            teleporter = (Player) sender;
-        }

        String destinationName;

@@ -111,7 +106,7 @@ public class TeleportCommand extends MultiverseCommand {
            return;
        }

-        if (MultiverseCore.EnforceAccess && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
+        if (plugin.getMVConfig().getEnforceAccess() && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
            if (teleportee.equals(teleporter)) {
                teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
            } else {
@@ -163,7 +158,8 @@ public class TeleportCommand extends MultiverseCommand {
        }
        TeleportResult result = this.playerTeleporter.safelyTeleport(teleporter, teleportee, d);
        if (result == TeleportResult.FAIL_UNSAFE) {
-            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName() + " to " + LocationManipulation.strCoordsRaw(d.getLocation(teleportee)));
+            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName()
+                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
            this.plugin.log(Level.FINE, "Queueing Command");
            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
            List<Object> items = new ArrayList<Object>();
@@ -9,10 +9,12 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
+import com.onarandombox.MultiverseCore.utils.webpaste.BitlyURLShortener;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -25,6 +27,7 @@ import java.util.logging.Level;
 * Dumps version info to the console.
 */
 public class VersionCommand extends MultiverseCommand {
+    private static final URLShortener SHORTENER = new BitlyURLShortener();

    public VersionCommand(MultiverseCore plugin) {
        super(plugin);
@@ -39,7 +42,7 @@ public class VersionCommand extends MultiverseCommand {
    }

    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
+    public void runCommand(final CommandSender sender, final List<String> args) {
        // Check if the command was sent from a Player.
        if (sender instanceof Player) {
            sender.sendMessage("Version info dumped to console. Please check your server logs.");
@@ -48,46 +51,57 @@ public class VersionCommand extends MultiverseCommand {
        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] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds()).append('\n');
        buffer.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
-        buffer.append("[Multiverse-Core] Economy being used: ").append(this.plugin.getBank().getEconUsed()).append('\n');
+        final boolean usingVault = this.plugin.getVaultEconomy() != null;
+        buffer.append("[Multiverse-Core] Using Vault: ").append(usingVault).append('\n');
+        if (usingVault) {
+            buffer.append("[Multiverse-Core] Economy being used: ").append(this.plugin.getVaultEconomy().getName()).append('\n');
+        } else {
+            buffer.append("[Multiverse-Core] Economy being used: ").append(this.plugin.getBank().getEconUsed()).append('\n');
+        }
        buffer.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
        buffer.append("[Multiverse-Core] Dumping Config Values: (version ")
-                .append(this.plugin.getMVConfiguration().getDouble("version", -1)).append(")").append('\n');
-        buffer.append("[Multiverse-Core]  messagecooldown: ").append(this.plugin.getMessaging().getCooldown()).append('\n');
-        buffer.append("[Multiverse-Core]  teleportcooldown: ").append("Not yet IMPLEMENTED").append('\n');
-        buffer.append("[Multiverse-Core]  worldnameprefix: ").append(MultiverseCore.PrefixChat).append('\n');
-        buffer.append("[Multiverse-Core]  enforceaccess: ").append(MultiverseCore.EnforceAccess).append('\n');
-        buffer.append("[Multiverse-Core]  displaypermerrors: ").append(MultiverseCore.DisplayPermErrors).append('\n');
-        buffer.append("[Multiverse-Core]  teleportintercept: ").append(MultiverseCore.TeleportIntercept).append('\n');
-        buffer.append("[Multiverse-Core]  firstspawnoverride: ").append(MultiverseCore.FirstSpawnOverride).append('\n');
-        buffer.append("[Multiverse-Core]  firstspawnworld: ").append(this.plugin.getMVConfiguration().getString("firstspawnworld", "NOT SET")).append('\n');
-        buffer.append("[Multiverse-Core]  debug: ").append(MultiverseCore.GlobalDebug).append('\n');
+                .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());
        this.plugin.getServer().getPluginManager().callEvent(versionEvent);

        // log to console
-        String data = versionEvent.getVersionInfo();
+        final String data = versionEvent.getVersionInfo();
        String[] lines = data.split("\n");
        for (String line : lines) {
            this.plugin.log(Level.INFO, line);
        }

-        if (args.size() == 1) {
-            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
-            } else {
-                return;
-            }
+        this.plugin.getServer().getScheduler().scheduleAsyncDelayedTask(this.plugin, new Runnable() {
+            @Override
+            public void run() {
+                if (args.size() == 1) {
+                    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
+                    } else {
+                        return;
+                    }

-            sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
-            this.plugin.log(Level.INFO, "Version info dumped here: " + pasteUrl);
-        }
+                    sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+                    plugin.log(Level.INFO, "Version info dumped here: " + pasteUrl);
+                }
+            }
+        });
    }

    /**
@@ -100,7 +114,7 @@ public class VersionCommand extends MultiverseCommand {
    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData) {
        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
        try {
-            return ps.postData(ps.encodeData(pasteData), ps.getPostURL());
+            return SHORTENER.shorten(ps.postData(ps.encodeData(pasteData), ps.getPostURL()));
        } catch (PasteFailedException e) {
            System.out.print(e);
            return "Error posting to service";
@@ -15,7 +15,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

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

 /**
@@ -28,11 +29,14 @@ public class WhoCommand extends MultiverseCommand {
    public WhoCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Who?");
-        this.setCommandUsage("/mv who" + ChatColor.GOLD + " [WORLD]");
+        this.setCommandUsage("/mv who" + ChatColor.GOLD + " [WORLD|--all]");
        this.setArgRange(0, 1);
        this.addKey("mv who");
        this.addKey("mvw");
        this.addKey("mvwho");
+        this.addCommandExample("/mv who");
+        this.addCommandExample(String.format("/mv who %s--all", ChatColor.GREEN));
+        this.addCommandExample(String.format("/mv who %smyworld", ChatColor.GOLD));
        this.setPermission("multiverse.core.list.who", "States who is in what world.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
    }
@@ -48,57 +52,67 @@ public class WhoCommand extends MultiverseCommand {
            showAll = false;
        }

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

-        if (args.size() > 0) {
-            MultiverseWorld world = this.worldManager.getMVWorld(args.get(0));
+        if (args.size()  == 1) {
            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
                showAll = true;
-                worlds = new ArrayList<MultiverseWorld>(this.worldManager.getMVWorlds());
-            } else if (world != null) {
-                if (!world.isHidden()) {
-                    worlds.add(world);
-                }
            } else {
-                sender.sendMessage(ChatColor.RED + "World does not exist");
+                // single world mode
+                MultiverseWorld world = this.worldManager.getMVWorld(args.get(0));
+                if (world == null) {
+                    sender.sendMessage(ChatColor.RED + "That world does not exist.");
+                    return;
+                }
+
+                if (!this.plugin.getMVPerms().canEnterWorld(p, world)) {
+                    sender.sendMessage(ChatColor.RED + "You aren't allowed to access to this world!");
+                    return;
+                }
+
+                sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
+                        world.getColoredWorldString(), ChatColor.AQUA));
+                sender.sendMessage(this.buildPlayerString(world, p, visiblePlayers));
                return;
            }
-        } else {
-            worlds = new ArrayList<MultiverseWorld>(this.worldManager.getMVWorlds());
        }

-        if (worlds.size() == 0) {
-            sender.sendMessage("Multiverse does not know about any of your worlds :(");
-        } else if (worlds.size() == 1) {
-            sender.sendMessage(ChatColor.AQUA + "--- Players in" + worlds.get(0).getColoredWorldString() + ChatColor.AQUA + " ---");
-        } else {
-            sender.sendMessage(ChatColor.AQUA + "--- There are players in ---");
-        }
-
-        for (MultiverseWorld world : worlds) {
-            if (!(this.worldManager.isMVWorld(world.getName()))) {
-                continue;
-            }
-
-            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
-                continue;
-            }
-            List<Player> players = world.getCBWorld().getPlayers();
-
-            String result = "";
-            if (players.size() <= 0 && !showAll) {
-                continue;
-            }
-
-            if (players.size() <= 0) {
-                result = "Empty";
-            } else {
-                for (Player player : players) {
-                    result += player.getDisplayName() + " " + ChatColor.WHITE;
+        // multiworld mode
+        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, p, visiblePlayers)));
+                    shownOne = true;
                }
            }
-
-            sender.sendMessage(world.getColoredWorldString() + ChatColor.WHITE + " - " + result);
        }
+        if (!shownOne) {
+            sender.sendMessage("No worlds found.");
+        }
+        return;
+    }
+
+    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
+        // Retrieve the players in this world
+        List<Player> players = world.getCBWorld().getPlayers();
+        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.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
    }
 }
@@ -1,115 +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;
-
-/**
- * A {@link String} config-property that will NOT be saved to the config.
- */
-public class ActiveStringConfigProperty implements MVActiveConfigProperty<String> {
-    private String name;
-    private String value;
-    private String method;
-    private String help;
-
-    public ActiveStringConfigProperty(String name, String defaultValue, String help) {
-        this.name = name;
-        this.help = help;
-        this.value = defaultValue;
-        this.parseValue(defaultValue);
-    }
-
-    public ActiveStringConfigProperty(String name, String defaultValue, String help, String method) {
-        this(name, defaultValue, help);
-        this.method = method;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getMethod() {
-        return this.method;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setMethod(String methodName) {
-        this.method = methodName;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Class<?> getPropertyClass() {
-        return String.class;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        if (value == null) {
-            return false;
-        }
-        this.setValue(value);
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return "";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(String value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-}
@@ -1,135 +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;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link Boolean} config-property.
- */
-public class BooleanConfigProperty implements MVActiveConfigProperty<Boolean> {
-    private String name;
-    private Boolean value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-    private String method;
-
-    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String help) {
-        this(section, name, defaultValue, name, help);
-    }
-
-    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.setValue(this.section.getBoolean(this.configNode, defaultValue));
-    }
-
-    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String configNode, String help, String method) {
-        this(section, name, defaultValue, configNode, help);
-        this.method = method;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Boolean getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(Boolean value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode, this.value);
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        if (value == null) {
-            return false;
-        }
-        if (value.toLowerCase().equals("true") || value.toLowerCase().equals("false")) {
-            this.setValue(Boolean.parseBoolean(value));
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    /**
-     * Gets the method that will be executed.
-     *
-     * @return The name of the method in MVWorld to be called.
-     */
-    @Override
-    public String getMethod() {
-        return this.method;
-    }
-
-    /**
-     * Sets the method that will be executed.
-     *
-     * @param methodName The name of the method in MVWorld to be called.
-     */
-    @Override
-    public void setMethod(String methodName) {
-        this.method = methodName;
-    }
-
-    /**
-     * Returns the class of the object we're looking at.
-     *
-     * @return the class of the object we're looking at.
-     */
-    @Override
-    public Class<?> getPropertyClass() {
-        return Boolean.class;
-    }
-}
@@ -1,98 +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;
-
-import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link EnglishChatColor} config-property.
- */
-public class ColorConfigProperty implements MVConfigProperty<EnglishChatColor> {
-    private String name;
-    private EnglishChatColor value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-
-    public ColorConfigProperty(ConfigurationSection section, String name, EnglishChatColor defaultValue, String help) {
-        this(section, name, defaultValue, name, help);
-    }
-
-    public ColorConfigProperty(ConfigurationSection section, String name, EnglishChatColor defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public EnglishChatColor getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(EnglishChatColor value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode, this.value.getText());
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        EnglishChatColor color = EnglishChatColor.fromString(value);
-        if (color == null) {
-            return false;
-        }
-        this.setValue(color);
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-}
@@ -1,292 +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;
-
-import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
-import org.bukkit.Difficulty;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-
-/** A factory to create config properties for a given world. */
-public class ConfigPropertyFactory {
-    private ConfigurationSection section;
-
-    public ConfigPropertyFactory(ConfigurationSection section) {
-        this.section = section;
-    }
-
-    // Booleans
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String help) {
-        return new BooleanConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String node, String help) {
-        return new BooleanConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    /**
-     * Constructs a new ActiveBooleanConfigProperty
-     *
-     * This property will execute 'method' after it has been successfully set.
-     *
-     * @param name The name of this ConifgProperty
-     * @param defaultValue The default value.
-     * @param help What string is shown for help.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param method The method that should be executed.
-     * @return The ActiveStringConfigProperty
-     */
-    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String help, String node, String method) {
-        return new BooleanConfigProperty(this.section, name, defaultValue, help, node, method);
-    }
-
-    // Integers
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public IntegerConfigProperty getNewProperty(String name, int defaultValue, String help) {
-        return new IntegerConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public IntegerConfigProperty getNewProperty(String name, int defaultValue, String node, String help) {
-        return new IntegerConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    // Doubles
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String help) {
-        return new DoubleConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String node, String help) {
-        return new DoubleConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @param method The name of the method that's used to set this property.
-     * @return The ConfigProperty.
-     */
-    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String node, String help, String method) {
-        return new DoubleConfigProperty(this.section, name, defaultValue, node, help, method);
-    }
-
-    // Strings
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public StringConfigProperty getNewProperty(String name, String defaultValue, String help) {
-        return new StringConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public StringConfigProperty getNewProperty(String name, String defaultValue, String node, String help) {
-        return new StringConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    // Colors
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public ColorConfigProperty getNewProperty(String name, EnglishChatColor defaultValue, String help) {
-        return new ColorConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public ColorConfigProperty getNewProperty(String name, EnglishChatColor defaultValue, String node, String help) {
-        return new ColorConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    // Difficulty
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public DifficultyConfigProperty getNewProperty(String name, Difficulty defaultValue, String help) {
-        return new DifficultyConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public DifficultyConfigProperty getNewProperty(String name, Difficulty defaultValue, String node, String help) {
-        return new DifficultyConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    // GameMode
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public GameModeConfigProperty getNewProperty(String name, GameMode defaultValue, String help) {
-        return new GameModeConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public GameModeConfigProperty getNewProperty(String name, GameMode defaultValue, String node, String help) {
-        return new GameModeConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    // GameMode
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String help) {
-        return new LocationConfigProperty(this.section, name, defaultValue, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @return The ConfigProperty.
-     */
-    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String node, String help) {
-        return new LocationConfigProperty(this.section, name, defaultValue, node, help);
-    }
-
-    /**
-     * Constructs a new ConfigProperty.
-     *
-     * @param name The name of this ConfigProperty.
-     * @param defaultValue The default-value.
-     * @param node The name of the configuration-node this ConfigProperty will be stored as.
-     * @param help The text that's displayed when a user failed to set the property.
-     * @param method The name of the method that's used to set this property.
-     * @return The ConfigProperty.
-     */
-    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String node, String help, String method) {
-        return new LocationConfigProperty(this.section, name, defaultValue, node, help, method);
-    }
-
-    /**
-     * Constructs a new ActiveStringConfigProperty
-     *
-     * This property will execute 'method' after it has been successfully set.
-     * This string will NOT be saved to the config file.
-     *
-     * @param name The name of this ConifgProperty
-     * @param defaultValue The default value.
-     * @param help What string is shown for help.
-     * @param method The method that should be executed.
-     * @param saveToConfig Should the variable save to the config?
-     * @return The ActiveStringConfigProperty
-     */
-    public ActiveStringConfigProperty getNewProperty(String name, String defaultValue, String help, String method, boolean saveToConfig) {
-        return new ActiveStringConfigProperty(name, defaultValue, help, method);
-    }
-}
@@ -1,129 +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;
-
-import org.bukkit.Difficulty;
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link Difficulty} config-property.
- */
-public class DifficultyConfigProperty implements MVActiveConfigProperty<Difficulty> {
-    private String name;
-    private Difficulty value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-
-    public DifficultyConfigProperty(ConfigurationSection section, String name, Difficulty defaultValue, String help) {
-        this(section, name, defaultValue, name, help);
-    }
-
-    public DifficultyConfigProperty(ConfigurationSection section, String name, Difficulty defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Difficulty getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(Difficulty value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode, this.value.toString());
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        try {
-            return this.setValue(Difficulty.getByValue(Integer.parseInt(value)));
-        } catch (NumberFormatException nfe) {
-            try {
-                return this.setValue(Difficulty.valueOf(value.toUpperCase()));
-            } catch (Exception e) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    /**
-     * Gets the method that will be executed.
-     *
-     * @return The name of the method in MVWorld to be called.
-     */
-    @Override
-    public String getMethod() {
-        return "setActualDifficulty";
-    }
-
-    /**
-     * Sets the method that will be executed.
-     *
-     * @param methodName The name of the method in MVWorld to be called.
-     */
-    @Override
-    public void setMethod(String methodName) {
-        // Unused here. This will only ever be setDifficulty.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Class<?> getPropertyClass() {
-        return Difficulty.class;
-    }
-}
@@ -1,133 +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;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link Double} config-property.
- */
-public class DoubleConfigProperty implements MVActiveConfigProperty<Double> {
-    private String name;
-    private Double value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-    private String method;
-
-    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String help) {
-        this(section, name, defaultValue, name, help);
-    }
-
-    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.setValue(this.section.getDouble(this.configNode, defaultValue));
-    }
-
-    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String configNode, String help, String method) {
-        this(section, name, defaultValue, configNode, help);
-        this.method = method;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Double getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(Double value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode, this.value);
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        try {
-            this.setValue(Double.parseDouble(value));
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    /**
-     * Gets the method that will be executed.
-     *
-     * @return The name of the method in MVWorld to be called.
-     */
-    @Override
-    public String getMethod() {
-        return this.method;
-    }
-
-    /**
-     * Sets the method that will be executed.
-     *
-     * @param methodName The name of the method in MVWorld to be called.
-     */
-    @Override
-    public void setMethod(String methodName) {
-        this.method = methodName;
-    }
-
-    /**
-     * Returns the class of the object we're looking at.
-     *
-     * @return the class of the object we're looking at.
-     */
-    @Override
-    public Class<?> getPropertyClass() {
-        return Double.class;
-    }
-}
@@ -0,0 +1,66 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.util.Map;
+
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+
+import org.bukkit.configuration.serialization.SerializableAs;
+
+/**
+ * Entryfee-settings.
+ */
+@SerializableAs("MVEntryFee")
+public class EntryFee extends SerializationConfig {
+    @Property
+    private double amount;
+    @Property
+    private int currency;
+
+    public EntryFee() {
+        super();
+    }
+
+    public EntryFee(Map<String, Object> values) {
+        super(values);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        amount = 0D;
+        currency = -1;
+    }
+
+    /**
+     * @return the amount
+     */
+    public double getAmount() {
+        return amount;
+    }
+
+    /**
+     * @return the currency
+     */
+    public int getCurrency() {
+        return currency;
+    }
+
+    /**
+     * Sets the amount.
+     * @param amount The new value.
+     */
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * Sets the currency.
+     * @param currency The new value.
+     */
+    public void setCurrency(int currency) {
+        this.currency = currency;
+    }
+}
@@ -1,129 +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;
-
-import org.bukkit.GameMode;
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link GameMode} config-property.
- */
-public class GameModeConfigProperty implements MVActiveConfigProperty<GameMode> {
-    private String name;
-    private GameMode value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-
-    public GameModeConfigProperty(ConfigurationSection section, String name, GameMode defaultValue, String help) {
-        this(section, name, defaultValue, name, help);
-    }
-
-    public GameModeConfigProperty(ConfigurationSection section, String name, GameMode defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public GameMode getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(GameMode value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode, this.value.toString());
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        try {
-            return this.setValue(GameMode.getByValue(Integer.parseInt(value)));
-        } catch (NumberFormatException nfe) {
-            try {
-                return this.setValue(GameMode.valueOf(value.toUpperCase()));
-            } catch (Exception e) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    /**
-     * Gets the method that will be executed.
-     *
-     * @return The name of the method in MVWorld to be called.
-     */
-    @Override
-    public String getMethod() {
-        return "setActualGameMode";
-    }
-
-    /**
-     * Sets the method that will be executed.
-     *
-     * @param methodName The name of the method in MVWorld to be called.
-     */
-    @Override
-    public void setMethod(String methodName) {
-        // Not required. Gamemode will only ever be one.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Class<?> getPropertyClass() {
-        return GameMode.class;
-    }
-}
@@ -1,97 +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;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link Integer} config-property.
- */
-public class IntegerConfigProperty implements MVConfigProperty<Integer> {
-    private String name;
-    private Integer value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-
-    public IntegerConfigProperty(ConfigurationSection section, String name, Integer defaultValue, String help) {
-        this(section, name, defaultValue, name, help);
-    }
-
-    public IntegerConfigProperty(ConfigurationSection section, String name, Integer defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.setValue(this.section.getInt(this.configNode, defaultValue));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Integer getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(Integer value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode, this.value);
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        try {
-            this.setValue(Integer.parseInt(value));
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-}
@@ -1,151 +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;
-
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
-import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link Location} config-property.
- */
-public class LocationConfigProperty implements MVActiveConfigProperty<Location> {
-    private String name;
-    private Location value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-    private String method;
-
-    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String help) {
-        this(section, name, defaultValue, name, help);
-    }
-
-    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.setValue(this.getLocationFromConfig(defaultValue));
-    }
-
-    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String configNode, String help, String method) {
-        this(section, name, defaultValue, configNode, help);
-        this.method = method;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        Location parsed = LocationManipulation.stringToLocation(value);
-        return this.setValue(parsed);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(Location value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode + ".x", this.value.getX());
-        this.section.set(configNode + ".y", this.value.getY());
-        this.section.set(configNode + ".z", this.value.getZ());
-        this.section.set(configNode + ".pitch", this.value.getPitch());
-        this.section.set(configNode + ".yaw", this.value.getYaw());
-        this.section.set(configNode + ".world", this.value.getWorld().getName());
-
-        return true;
-    }
-
-    private Location getLocationFromConfig(Location defaultValue) {
-        double x = this.section.getDouble(this.configNode + ".x", defaultValue.getX());
-        double y = this.section.getDouble(this.configNode + ".y", defaultValue.getY());
-        double z = this.section.getDouble(this.configNode + ".z", defaultValue.getZ());
-        double pitch = this.section.getDouble(this.configNode + ".pitch", defaultValue.getPitch());
-        double yaw = this.section.getDouble(this.configNode + ".yaw", defaultValue.getYaw());
-        String w = this.section.getString(this.configNode + ".world", defaultValue.getWorld().getName());
-        Location found = LocationManipulation.stringToLocation(w + ":" + x + "," + y + "," + z + ":" + yaw + ":" + pitch);
-        if (found != null) {
-            return found;
-        }
-        return defaultValue;
-    }
-
-    @Override
-    public String toString() {
-        return LocationManipulation.strCoordsRaw(this.value);
-    }
-
-    /**
-     * Gets the method that will be executed.
-     *
-     * @return The name of the method in MVWorld to be called.
-     */
-    @Override
-    public String getMethod() {
-        return this.method;
-    }
-
-    /**
-     * Sets the method that will be executed.
-     *
-     * @param methodName The name of the method in MVWorld to be called.
-     */
-    @Override
-    public void setMethod(String methodName) {
-        this.method = methodName;
-    }
-
-    /**
-     * Returns the class of the object we're looking at.
-     *
-     * @return the class of the object we're looking at.
-     */
-    @Override
-    public Class<?> getPropertyClass() {
-        return Location.class;
-    }
-}
@@ -10,8 +10,10 @@ 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.
@@ -1,75 +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;
-
-import com.onarandombox.MultiverseCore.api.LoggablePlugin;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.config.Configuration;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-
-/*
- * This is a mess, so I'm just going to suppress all warnings here.
- * BEGIN CHECKSTYLE-SUPPRESSION: ALL
- */
-
-/**
- * @deprecated This isn't used any more, is it?
- */
-@Deprecated
-public abstract class MVConfigMigrator {
-
-    public List<String> createdDefaults = new ArrayList<String>();
-
-    public abstract boolean migrate(String name, File folder);
-
-    protected final void migrateListItem(Configuration newConfig, Configuration oldConfig, String key, String oldProperty, String newProperty) {
-        List<String> list = Arrays.asList(oldConfig.getString("worlds." + key + oldProperty).split(","));
-        if (list.size() > 0) {
-            if (list.get(0).length() == 0) {
-                list = new ArrayList<String>();
-            }
-        }
-        newConfig.setProperty("worlds." + key + newProperty, list);
-    }
-
-    protected final File detectMultiverseFolders(File folder, LoggablePlugin mvPlugin) {
-        File oldFolder = null;
-        mvPlugin.log(Level.INFO, "Starting Multiverse Configuration Migrator(MVCM)!");
-        // They still have MV 1 installed! Good!
-        if (mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse") != null) {
-            mvPlugin.log(Level.INFO, "Found MultiVerse 1. Starting Config Migration...");
-            Plugin plugin = mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse");
-            oldFolder = plugin.getDataFolder();
-        } else {
-            // They didn't have MV 1 enabled... let's try and find the folder...
-            File[] folders = folder.getParentFile().listFiles();
-            List<File> folderList = Arrays.asList(folders);
-            for (File f : folderList) {
-                if (f.getName().equalsIgnoreCase("MultiVerse")) {
-                    mvPlugin.log(Level.INFO, "Found the MultiVerse 1 config folder. Starting Config Migration...");
-                    oldFolder = f;
-                }
-            }
-            if (oldFolder == null) {
-                mvPlugin.log(Level.INFO, "Did not find the MV1 Folder. If you did not have MultiVerse 1 installed and this is the FIRST time you're running MV2, this message is GOOD. ");
-                mvPlugin.log(Level.INFO, "If you did, your configs were **NOT** migrated! Go Here: INSERTURLFORHELP");
-                return null;
-            }
-        }
-        return oldFolder;
-    }
-}
-
-/*
- * END CHECKSTYLE-SUPPRESSION: ALL
- */
@@ -11,7 +11,9 @@ 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.
@@ -0,0 +1,98 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.configuration.serialization.SerializableAs;
+
+/**
+ * Just like a regular {@link Location}, however {@code world} is usually {@code null}
+ * or just a weak reference and it implements {@link ConfigurationSerializable}.
+ */
+@SerializableAs("MVSpawnLocation")
+public class SpawnLocation extends Location implements ConfigurationSerializable {
+    private Reference<World> worldRef;
+
+    public SpawnLocation(double x, double y, double z) {
+        super(null, x, y, z);
+    }
+
+    public SpawnLocation(double x, double y, double z, float yaw, float pitch) {
+        super(null, x, y, z, yaw, pitch);
+    }
+
+    public SpawnLocation(Location loc) {
+        this(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public World getWorld() {
+        return (this.worldRef != null) ? this.worldRef.get() : null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setWorld(World world) {
+        this.worldRef = new WeakReference<World>(world);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Chunk getChunk() {
+        if ((this.worldRef != null) && (this.worldRef.get() != null))
+            return this.worldRef.get().getChunkAt(this);
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Block getBlock() {
+        if ((this.worldRef != null) && (this.worldRef.get() != null))
+            return this.worldRef.get().getBlockAt(this);
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Map<String, Object> serialize() {
+        Map<String, Object> serialized = new HashMap<String, Object>(5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        serialized.put("x", this.getX());
+        serialized.put("y", this.getY());
+        serialized.put("z", this.getZ());
+        serialized.put("pitch", this.getPitch());
+        serialized.put("yaw", this.getYaw());
+        return serialized;
+    }
+
+    /**
+     * Let Bukkit be able to deserialize this.
+     * @param args The map.
+     * @return The deserialized object.
+     */
+    public static SpawnLocation deserialize(Map<String, Object> args) {
+        double x = ((Number) args.get("x")).doubleValue();
+        double y = ((Number) args.get("y")).doubleValue();
+        double z = ((Number) args.get("z")).doubleValue();
+        float pitch = ((Number) args.get("pitch")).floatValue();
+        float yaw = ((Number) args.get("yaw")).floatValue();
+        return new SpawnLocation(x, y, z, yaw, pitch);
+    }
+}
@@ -0,0 +1,50 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.util.Map;
+
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+
+import org.bukkit.configuration.serialization.SerializableAs;
+
+/**
+ * Spawning-Settings.
+ */
+@SerializableAs("MVSpawnSettings")
+public class SpawnSettings extends SerializationConfig {
+    @Property
+    private SubSpawnSettings animals;
+    @Property
+    private SubSpawnSettings monsters;
+
+    public SpawnSettings() {
+        super();
+    }
+
+    public SpawnSettings(Map<String, Object> values) {
+        super(values);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDefaults() {
+        animals = new SubSpawnSettings();
+        monsters = new SubSpawnSettings();
+    }
+
+    /**
+     * @return the animal-settings
+     */
+    public SubSpawnSettings getAnimalSettings() {
+        return animals;
+    }
+
+    /**
+     * @return the monster-settings
+     */
+    public SubSpawnSettings getMonsterSettings() {
+        return monsters;
+    }
+}
@@ -1,96 +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;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-/**
- * A {@link String} config-property.
- */
-public class StringConfigProperty implements MVConfigProperty<String> {
-    private String name;
-    private String value;
-    private String configNode;
-    private ConfigurationSection section;
-    private String help;
-
-    public StringConfigProperty(ConfigurationSection section, String name, String defaultValue, String help) {
-        this(section, name, defaultValue, defaultValue, help);
-    }
-
-    public StringConfigProperty(ConfigurationSection section, String name, String defaultValue, String configNode, String help) {
-        this.name = name;
-        this.configNode = configNode;
-        this.section = section;
-        this.help = help;
-        this.value = defaultValue;
-        this.parseValue(this.section.getString(this.configNode, defaultValue));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean parseValue(String value) {
-        if (value == null) {
-            return false;
-        }
-        this.setValue(value);
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getConfigNode() {
-        return this.configNode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getHelp() {
-        return this.help;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setValue(String value) {
-        if (value == null) {
-            return false;
-        }
-        this.value = value;
-        this.section.set(configNode, this.value);
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-}
@@ -0,0 +1,59 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+
+import org.bukkit.configuration.serialization.SerializableAs;
+
+/**
+ * SpawnSubSettings.
+ */
+@SerializableAs("MVSpawnSubSettings")
+public class SubSpawnSettings extends SerializationConfig {
+    @Property
+    private boolean spawn;
+    @Property
+    private List<String> exceptions;
+
+    public SubSpawnSettings() {
+        super();
+    }
+
+    public SubSpawnSettings(Map<String, Object> values) {
+        super(values);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDefaults() {
+        spawn = true;
+        exceptions = new ArrayList<String>();
+    }
+
+    /**
+     * @return spawn
+     */
+    public boolean doSpawn() {
+        return spawn;
+    }
+
+    /**
+     * @param spawn The new value.
+     */
+    public void setSpawn(boolean spawn) {
+        this.spawn = spawn;
+    }
+
+    /**
+     * @return the exceptions
+     */
+    public List<String> getExceptions() {
+        return exceptions;
+    }
+}
@@ -0,0 +1,27 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.Bukkit;
+
+import com.onarandombox.MultiverseCore.MVWorld;
+import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent;
+
+import me.main__.util.SerializationConfig.ChangeDeniedException;
+import me.main__.util.SerializationConfig.ObjectUsingValidator;
+
+/**
+ * Validates world-property-changes.
+ * @param <T> The type of the property that should be validated.
+ */
+public class WorldPropertyValidator<T> extends ObjectUsingValidator<T, MVWorld> {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public T validateChange(String property, T newValue, T oldValue, MVWorld object) throws ChangeDeniedException {
+        MVWorldPropertyChangeEvent<T> event = new MVWorldPropertyChangeEvent<T>(object, null, property, newValue);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled())
+            throw new ChangeDeniedException();
+        return event.getTheNewValue();
+    }
+}
@@ -7,7 +7,9 @@

 package com.onarandombox.MultiverseCore.destination;

+import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -21,6 +23,7 @@ public class BedDestination implements MVDestination {

    private boolean isValid;
    private Location knownBedLoc;
+    private MultiverseCore plugin;

    /**
     * {@inheritDoc}
@@ -46,7 +49,10 @@ public class BedDestination implements MVDestination {
    @Override
    public Location getLocation(Entity entity) {
        if (entity instanceof Player) {
-            this.knownBedLoc = ((Player) entity).getBedSpawnLocation();
+            this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
+            if (this.knownBedLoc == null) {
+                ((Player) entity).sendMessage("Your bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
+            }
            return this.knownBedLoc;
        }
        return null;
@@ -65,7 +71,7 @@ public class BedDestination implements MVDestination {
     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
-        // Not needed.
+        this.plugin = (MultiverseCore) plugin;
    }

    /**
@@ -54,7 +54,7 @@ public class DestinationFactory {
            Class<? extends MVDestination> myClass = this.destList.get(idenChar);
            try {
                MVDestination mydest = myClass.newInstance();
-                if (!mydest.isThisType((MultiverseCore) this.plugin, destination)) {
+                if (!mydest.isThisType(this.plugin, destination)) {
                    return new InvalidDestination();
                }
                mydest.setDestination(this.plugin, destination);
@@ -8,9 +8,9 @@
 package com.onarandombox.MultiverseCore.destination;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -70,7 +70,7 @@ public class WorldDestination implements MVDestination {
        return spawnLoc;
    }

-    private Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
+    private static Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
        if (world != null) {
            return world.getSpawnLocation();
        } else {
@@ -93,6 +93,9 @@ public class WorldDestination implements MVDestination {
     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
+        // TODO Taking a JavaPlugin here is rather useless, if we keep casting it up to MultiverseCore.
+        // We should change that.
+        Core core = (Core) plugin;
        String[] items = destination.split(":");
        if (items.length > 3) {
            isValid = false;
@@ -100,19 +103,19 @@ public class WorldDestination implements MVDestination {
        }
        if (items.length == 1 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
            isValid = true;
-            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[0]);
+            this.world = core.getMVWorldManager().getMVWorld(items[0]);
            return;
        }
        if (items.length == 2 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
-            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[0]);
-            this.yaw = LocationManipulation.getYaw(items[1]);
+            this.world = core.getMVWorldManager().getMVWorld(items[0]);
+            this.yaw = core.getLocationManipulation().getYaw(items[1]);
            return;
        }
        if (items[0].equalsIgnoreCase("w") && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[1])) {
            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[1]);
            isValid = true;
            if (items.length == 3) {
-                this.yaw = LocationManipulation.getYaw(items[2]);
+                this.yaw = core.getLocationManipulation().getYaw(items[2]);
            }
        }
    }
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * 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.enums;
+
+import org.bukkit.PortalType;
+
+/**
+ * Custom enum that adds all/none for allowing portal creation.
+ */
+public enum AllowedPortalType {
+    /**
+     * No portals are allowed.
+     */
+    NONE(PortalType.CUSTOM),
+    /**
+     * All portal types are allowed.
+     */
+    ALL(PortalType.CUSTOM),
+    /**
+     * Only Nether style portals are allowed.
+     */
+    NETHER(PortalType.NETHER),
+    /**
+     * Only Ender style portals are allowed.
+     */
+    END(PortalType.ENDER);
+
+    private PortalType type;
+
+    AllowedPortalType(PortalType type) {
+        this.type = type;
+    }
+
+    /**
+     * Gets the text.
+     * @return The text.
+     */
+    public PortalType getActualPortalType() {
+        return this.type;
+    }
+}
@@ -1,64 +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.enums;
-
-/**
- * An enum containing all config-properties that can be set.
- */
-public enum ConfigProperty {
-    /**
-     * How long to leave in between sending a message to the player. (NOT YET IMPLEMENTED)
-     */
-    messagecooldown,
-    /**
-     * How fast are people allowed to use /MVTP (NOT YET IMPLEMENTED).
-     */
-    teleportcooldown,
-    /**
-     * Prefix chat-messages with world-names.
-     */
-    worldnameprefix,
-    /**
-     * If value is set to false, Multiverse will NOT enforce world access permissions.
-     */
-    enforceaccess,
-    /**
-     * Whether users should get detailed information about the permissions they would need.
-     */
-    displaypermerrors,
-    /**
-     * Debug-information.
-     */
-    debug,
-    /**
-     * The world new users will spawn in.
-     */
-    firstspawnworld,
-    /**
-     * Whether Multiverse should intercept teleports.
-     */
-    teleportintercept,
-    /**
-     * Whether Multiverse should override the first spawn.
-     */
-    firstspawnoverride;
-
-    /**
-     * Constructs a string containing all values in this enum.
-     *
-     * @return That {@link String}.
-     */
-    public static String getAllValues() {
-        String buffer = "";
-        for (ConfigProperty c : ConfigProperty.values()) {
-            // All values will NOT Contain spaces.
-            buffer += c.toString() + " ";
-        }
-        return buffer;
-    }
-}
@@ -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,11 +76,20 @@ 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;
                }
            }
        }
        return null;
    }
+
+    /**
+     * Looks if the given-color name is a valid color.
+     * @param aliasColor A color-name.
+     * @return True if the name is a valid color, false if it isn't.
+     */
+    public static boolean isValidAliasColor(String aliasColor) {
+        return (EnglishChatColor.fromString(aliasColor) != null);
+    }
 }
@@ -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;
+    }
+}
@@ -8,6 +8,7 @@
 package com.onarandombox.MultiverseCore.event;

 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 import java.util.List;

@@ -15,14 +16,30 @@ import java.util.List;
 * Called when the Multiverse-config should be reloaded.
 */
 public class MVConfigReloadEvent extends Event {
-    private static final long serialVersionUID = 3647950355746345397L;
    private List<String> configsLoaded;

    public MVConfigReloadEvent(List<String> configsLoaded) {
-        super("MVConfigReload");
        this.configsLoaded = configsLoaded;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@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;
+    }
+
    /**
     * Adds a config to this event.
     * @param config The config to add.
@@ -11,6 +11,7 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * This event is thrown when a portal is touched.
@@ -19,13 +20,31 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
    private Player p;
    private Location l;
    private boolean isCancelled;
+    private boolean canUse = true;

    public MVPlayerTouchedPortalEvent(Player p, Location l) {
-        super("MVPlayerTouchedPortalEvent");
        this.p = p;
        this.l = l;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@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;
+    }
+
    /**
     * Gets the {@link Location} of the portal-block that was touched.
     * @return The {@link Location} of the portal-block that was touched.
@@ -42,6 +61,26 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
        return this.p;
    }

+    /**
+     * Gets whether or not the player in this event can use this portal.
+     *
+     * @return True if the player can use this portal.
+     */
+    public boolean canUseThisPortal() {
+        return this.canUse;
+    }
+
+    /**
+     * Sets whether or not the player in this event can use this portal.
+     * <p>
+     * Setting this to false will cause the player to bounce back!
+     *
+     * @param canUse Whether or not the user can go through this portal.
+     */
+    public void setCanUseThisPortal(boolean canUse) {
+        this.canUse = canUse;
+    }
+
    @Override
    public boolean isCancelled() {
        return this.isCancelled;
@@ -10,6 +10,7 @@ package com.onarandombox.MultiverseCore.event;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * Called when a player is respawning.
@@ -21,12 +22,29 @@ public class MVRespawnEvent extends Event {


    public MVRespawnEvent(Location spawningAt, Player p, String respawnMethod) {
-        super("MVRespawn");
        this.player = p;
        this.location = spawningAt;
        this.respawnMethod = respawnMethod;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@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;
+    }
+
    /**
     * Gets the {@link Player} that's respawning.
     * @return The {@link Player} that's respawning.
@@ -8,12 +8,14 @@
 package com.onarandombox.MultiverseCore.event;

 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;

 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * Event that gets called when a player use the /mvtp command.
@@ -26,13 +28,30 @@ public class MVTeleportEvent extends Event implements Cancellable {
    private boolean isCancelled;

    public MVTeleportEvent(MVDestination dest, Player teleportee, CommandSender teleporter, boolean safeTeleport) {
-        super("SafeTTeleporter");
        this.teleportee = teleportee;
        this.teleporter = teleporter;
        this.dest = dest;
        this.useSafeTeleport = safeTeleport;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@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 player who will be teleported by this event.
     *
@@ -1,6 +1,7 @@
 package com.onarandombox.MultiverseCore.event;

 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * Called when somebody requests version information about Multiverse.
@@ -10,8 +11,25 @@ public class MVVersionEvent extends Event {
    private final StringBuilder versionInfoBuilder;

    public MVVersionEvent(String versionInfo) {
-        super("MVVersionEvent");
-        versionInfoBuilder = new StringBuilder(versionInfo);
+        this.versionInfoBuilder = new StringBuilder(versionInfo);
+    }
+
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@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;
    }

    /**
@@ -19,7 +37,7 @@ public class MVVersionEvent extends Event {
     * @return The version-info.
     */
    public String getVersionInfo() {
-        return versionInfoBuilder.toString();
+        return this.versionInfoBuilder.toString();
    }

    /**
@@ -27,6 +45,6 @@ public class MVVersionEvent extends Event {
     * @param moreVersionInfo The version-info to add. Should end with '\n'.
     */
    public void appendVersionInfo(String moreVersionInfo) {
-        versionInfoBuilder.append(moreVersionInfo);
+        this.versionInfoBuilder.append(moreVersionInfo);
    }
 }
@@ -1,45 +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.event;
-
-import org.bukkit.event.Event;
-
-/**
- * Called when somebody requests version information about Multiverse.
- * @deprecated Use {@link MVVersionEvent} instead.
- */
-@Deprecated
-public class MVVersionRequestEvent extends Event {
-
-    private String pasteBinBuffer;
-
-    public MVVersionRequestEvent(String pasteBinBuffer) {
-        super("MVVersion");
-        this.pasteBinBuffer = pasteBinBuffer;
-    }
-
-    /**
-     * Gets the pasteBinBuffer.
-     * @return The pasteBinBuffer.
-     * @deprecated Use {@link MVVersionEvent} instead.
-     */
-    @Deprecated
-    public String getPasteBinBuffer() {
-        return this.pasteBinBuffer;
-    }
-
-    /**
-     * Sets the pasteBinBuffer.
-     * @param buffer The new pasteBinBuffer.
-     * @deprecated Use {@link MVVersionEvent} instead.
-     */
-    @Deprecated
-    public void setPasteBinBuffer(String buffer) {
-        this.pasteBinBuffer = buffer;
-    }
-}
@@ -4,6 +4,7 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.event.HandlerList;

 /**
 * Called when a world is about to be deleted by Multiverse.
@@ -15,8 +16,6 @@ public class MVWorldDeleteEvent extends Event implements Cancellable {
    private final boolean removeFromConfig;

    public MVWorldDeleteEvent(MultiverseWorld world, boolean removeFromConfig) {
-        super("MVWorldDeleteEvent");
-
        if (world == null)
            throw new IllegalArgumentException("world can't be null!");

@@ -24,6 +23,24 @@ public class MVWorldDeleteEvent extends Event implements Cancellable {
        this.removeFromConfig = removeFromConfig;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@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;
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * This event is fired *before* the property is actually changed.
@@ -18,24 +19,42 @@ import org.bukkit.event.Event;
 * If it is cancelled, no change will happen.
 * <p>
 * If you want to get the values of the world before the change, query the world.
- * If you want to get the value being changed, use getProperty()
+ * To get the name of the property that was changed, use {@link #getPropertyName()}.
+ * To get the new value, use {@link #getTheNewValue()}. To change it, use {@link #setTheNewValue(Object)}.
+ * @param <T> The type of the property that was set.
 */
-public class MVWorldPropertyChangeEvent extends Event implements Cancellable {
+public class MVWorldPropertyChangeEvent<T> extends Event implements Cancellable {
    private MultiverseWorld world;
    private CommandSender changer;
    private boolean isCancelled = false;
-    private String value;
    private String name;
+    private T value;

-
-    public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, String value) {
-        super("MVWorldPropertyChange");
+    public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, T value) {
        this.world = world;
        this.changer = changer;
        this.name = name;
        this.value = value;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@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;
+    }
+
    /**
     * Gets the changed world property's name.
     * @return The changed world property's name.
@@ -47,16 +66,38 @@ public class MVWorldPropertyChangeEvent extends Event implements Cancellable {
    /**
     * Gets the new value.
     * @return The new value.
+     * @deprecated Use {@link #getTheNewValue()} instead.
     */
+    @Deprecated
    public String getNewValue() {
+        return this.value.toString();
+    }
+
+    /**
+     * Gets the new value.
+     * @return The new value.
+     */
+    public T getTheNewValue() {
        return this.value;
    }

    /**
     * Sets the new value.
+     * <p>
+     * This method is only a stub, it'll <b>always</b> throw an {@link UnsupportedOperationException}!
     * @param value The new new value.
+     * @deprecated Use {@link #setTheNewValue(Object)} instead.
     */
+    @Deprecated
    public void setNewValue(String value) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Sets the new value.
+     * @param value The new value.
+     */
+    public void setTheNewValue(T value) {
        this.value = value;
    }

@@ -71,6 +112,8 @@ public class MVWorldPropertyChangeEvent extends Event implements Cancellable {

    /**
     * Gets the person (or console) who was responsible for the change.
+     * <p>
+     * This may be null!
     *
     * @return The person (or console) who was responsible for the change.
     */
@@ -14,4 +14,8 @@ public class PropertyDoesNotExistException extends Exception {
    public PropertyDoesNotExistException(String name) {
        super(name);
    }
+
+    public PropertyDoesNotExistException(String name, Throwable cause) {
+        super(name, cause);
+    }
 }
@@ -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,52 @@
+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.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 format = event.getFormat();
+            event.setFormat("[" + prefix + "]" + format);
+        }
+    }
+}
@@ -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.CreatureType;
-import org.bukkit.entity.Ghast;
-import org.bukkit.entity.Monster;
+import org.bukkit.entity.EntityType;
 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;

@@ -85,9 +78,10 @@ public class MVEntityListener implements Listener {
     */
    @EventHandler
    public void creatureSpawn(CreatureSpawnEvent event) {
-
        // Check to see if the Creature is spawned by a plugin, we don't want to prevent this behaviour.
-        if (event.getSpawnReason() == SpawnReason.CUSTOM) {
+        // 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
+                || event.getSpawnReason() == SpawnReason.BREEDING) {
            return;
        }

@@ -99,55 +93,17 @@ public class MVEntityListener implements Listener {
        if (!(this.worldManager.isMVWorld(world.getName())))
            return;

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

-        /**
-         * Animal Handling
-         */
-        if (event.getEntity() instanceof Animals || event.getEntity() instanceof Squid) {
-            event.setCancelled(this.shouldWeKillThisCreature(mvworld.getAnimalList(), mvworld.canAnimalsSpawn(), creature.toString().toUpperCase()));
-        }
-        /**
-         * Monster Handling
-         */
-        if (event.getEntity() instanceof Monster || event.getEntity() instanceof Ghast || event.getEntity() instanceof Slime) {
-            event.setCancelled(this.shouldWeKillThisCreature(mvworld.getMonsterList(), mvworld.canMonstersSpawn(), creature.toString().toUpperCase()));
-        }
-    }
-
-    private 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,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,12 +7,12 @@

 package com.onarandombox.MultiverseCore.listeners;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
-import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -22,55 +22,37 @@ 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.Map;
+import java.util.concurrent.ConcurrentHashMap;
 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 (MultiverseCore.PrefixChat) {
-            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;
    }

    /**
@@ -127,17 +109,24 @@ public class MVPlayerListener implements Listener {
    public void playerJoin(PlayerJoinEvent event) {
        Player p = event.getPlayer();
        if (!p.hasPlayedBefore()) {
-            this.plugin.log(Level.FINE, "Player joined first!");
-            if (MultiverseCore.FirstSpawnOverride) {
-                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): " + worldManager.getFirstSpawnWorld().getSpawnLocation());
-                this.spawnNewPlayer(p);
+            this.plugin.log(Level.FINER, "Player joined for the FIRST time!");
+            if (plugin.getMVConfig().getFirstSpawnOverride()) {
+                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): "
+                        + worldManager.getFirstSpawnWorld().getSpawnLocation());
+                this.sendPlayerToDefaultWorld(p);
            }
            return;
        } else {
-            this.plugin.log(Level.FINE, "Player joined AGAIN!");
+            this.plugin.log(Level.FINER, "Player joined AGAIN!");
+            if (this.plugin.getMVConfig().getEnforceAccess() // check this only if we're enforcing access!
+                    && !this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
+                p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
+                this.sendPlayerToDefaultWorld(p);
+            }
        }
        // Handle the Players GameMode setting for the new world.
        this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
+        playerWorld.put(p.getName(), p.getWorld().getName());
    }

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

    /**
@@ -165,8 +155,8 @@ public class MVPlayerListener implements Listener {
     */
    @EventHandler(priority = EventPriority.HIGHEST)
    public void playerTeleport(PlayerTeleportEvent event) {
-        this.plugin.log(Level.FINEST, "Got teleport event for player '" + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
-
+        this.plugin.log(Level.FINER, "Got teleport event for player '"
+                + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
        if (event.isCancelled()) {
            return;
        }
@@ -175,41 +165,55 @@ public class MVPlayerListener implements Listener {
        String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
        if (teleporterName != null) {
            if (teleporterName.equals("CONSOLE")) {
-                this.plugin.log(Level.FINEST, "We know the teleporter is the console! Magical!");
+                this.plugin.log(Level.FINER, "We know the teleporter is the console! Magical!");
                teleporter = this.plugin.getServer().getConsoleSender();
            } else {
                teleporter = this.plugin.getServer().getPlayer(teleporterName);
            }
        }
-        this.plugin.log(Level.FINEST, 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 (fromWorld == null || toWorld == null)
+            return;
        if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
            // The player is Teleporting to the same world.
            this.plugin.log(Level.FINER, "Player '" + teleportee.getName() + "' is teleporting to the same world.");
+            this.stateSuccess(teleportee.getName(), toWorld.getAlias());
            return;
        }
        // TODO: Refactor these lines.
        // 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(), event.getTo().getWorld().getName(), 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;
        }
-        if (MultiverseCore.EnforceAccess) {
+        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(), event.getTo().getWorld().getName(), teleporter.getName(), event.getTo().getWorld().getName()));
+                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());
+            } else {
+                this.stateSuccess(teleportee.getName(), toWorld.getAlias());
            }
        } else {
-            this.plugin.log(Level.FINE, String.format("Player '%s' was allowed to go to '%s' because enforceaccess is off.",
-                    teleportee.getName(), event.getTo().getWorld().getName()));
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
+                    + "' was allowed to go to '" + toWorld.getAlias() + "' because enforceaccess is off.");
        }
    }

+    private void stateSuccess(String playerName, String worldName) {
+        this.plugin.log(Level.FINE, "MV-Core is allowing Player '" + playerName
+                + "' to go to '" + worldName + "'.");
+    }
+
    /**
     * This method is called to adjust the portal location to the actual portal location (and not
     * right outside of it.
@@ -217,7 +221,6 @@ public class MVPlayerListener implements Listener {
     */
    @EventHandler(priority = EventPriority.LOWEST)
    public void playerPortalCheck(PlayerPortalEvent event) {
-        this.plugin.log(Level.FINE, "CALLING CORE-ADJUST!!!");
        if (event.isCancelled() || event.getFrom() == null) {
            return;
        }
@@ -225,7 +228,7 @@ public class MVPlayerListener implements Listener {
        // REMEMBER! getTo MAY be NULL HERE!!!
        // If the player was actually outside of the portal, adjust the from location
        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.PORTAL) {
-            Location newloc = SafeTTeleporter.findPortalBlockNextTo(event.getFrom());
+            Location newloc = this.plugin.getSafeTTeleporter().findPortalBlockNextTo(event.getFrom());
            // TODO: Fix this. Currently, we only check for PORTAL blocks. I'll have to figure out what
            // TODO: we want to do here.
            if (newloc != null) {
@@ -259,26 +262,30 @@ 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 (MultiverseCore.EnforceAccess) {
+        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.");
        }
    }

-    private void spawnNewPlayer(final Player player) {
-        // Spawn the player 1 tick after the login. I'm sure there's GOT to be a better way to do this...
+    private void sendPlayerToDefaultWorld(final Player player) {
+        // Remove the player 1 tick after the login. I'm sure there's GOT to be a better way to do this...
        this.plugin.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin,
            new Runnable() {
+                @Override
                public void run() {
                    player.teleport(plugin.getMVWorldManager().getFirstSpawnWorld().getSpawnLocation());
                }
@@ -291,6 +298,9 @@ public class MVPlayerListener implements Listener {
        MultiverseWorld mvWorld = this.worldManager.getMVWorld(world.getName());
        if (mvWorld != null) {
            this.handleGameMode(player, mvWorld);
+        } else {
+            this.plugin.log(Level.FINER, "Not handling gamemode for world '" + world.getName()
+                    + "' not managed by Multiverse.");
        }
    }

@@ -303,20 +313,18 @@ public class MVPlayerListener implements Listener {
        // We perform this task one tick later to MAKE SURE that the player actually reaches the
        // destination world, otherwise we'd be changing the player mode if they havent moved anywhere.
        if (!this.pt.playerCanIgnoreGameModeRestriction(world, player)) {
-            this.plugin.log(Level.FINE, "Handeling gamemode 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()) {
-                            MultiverseCore.staticLog(Level.FINE, "Handeling gamemode for player: " + player.getName() + ", " + world.getGameMode().toString());
-                            MultiverseCore.staticLog(Level.FINE, "PWorld: " + player.getWorld());
-                            MultiverseCore.staticLog(Level.FINE, "AWorld: " + world);
+                            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());
                        } 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()));
+                           Logging.fine("The gamemode was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'", player.getName(), player.getWorld().getName(), world.getName());
                        }
                    }
                }, 1L);
@@ -16,7 +16,6 @@ import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;

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

 /**
 * Multiverse's Plugin {@link Listener}.
@@ -35,15 +34,26 @@ public class MVPluginListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR)
    public void pluginEnable(PluginEnableEvent event) {
+        if (plugin.getVaultEconomy() != null) {
+            // Don't hook 2 economy plugins.
+            return;
+        }
        // Let AllPay handle all econ plugin loadings, only go for econ plugins we support
-        if (Arrays.asList(AllPay.validEconPlugins).contains(event.getPlugin().getDescription().getName())) {
+        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.");
        }
+
+        if (event.getPlugin().getDescription().getName().equals("dynmap")) {
+            this.plugin.setDynmap();
+            this.plugin.log(Level.INFO, "Dynmap integration enabled.");
+        }
+        */
    }

    /**
@@ -0,0 +1,85 @@
+/******************************************************************************
+ * 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.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.entity.EntityCreatePortalEvent;
+import org.bukkit.event.world.PortalCreateEvent;
+
+/**
+ * A custom listener for portal related events.
+ */
+public class MVPortalListener implements Listener {
+
+    private MultiverseCore plugin;
+
+    public MVPortalListener(MultiverseCore core) {
+        this.plugin = core;
+    }
+
+    /**
+     * This is called when an entity creates a portal.
+     *
+     * @param event The event where an entity created a portal.
+     */
+    @EventHandler
+    public void entityPortalCreate(EntityCreatePortalEvent event) {
+        if (event.isCancelled() || event.getBlocks().size() == 0) {
+            return;
+        }
+        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getBlocks().get(0).getWorld());
+        // We have to do it like this due to a bug in 1.1-R3
+        if (cancelPortalEvent(world, event.getPortalType())) {
+            event.setCancelled(true);
+        }
+    }
+
+    /**
+     * 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
+    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)) {
+            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;
+            }
+        }
+        return false;
+    }
+}
@@ -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();
+    }
+}
@@ -0,0 +1,57 @@
+package com.onarandombox.MultiverseCore.plugins;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.plugins.destination.DynmapMarkerDestination;
+import org.bukkit.Location;
+import org.bukkit.plugin.Plugin;
+import org.dynmap.DynmapCore;
+import org.dynmap.bukkit.DynmapPlugin;
+import org.dynmap.markers.Marker;
+import org.dynmap.markers.MarkerSet;
+
+import java.util.List;
+
+/**
+ * Non-Intrusive Connector class.
+ */
+public class DynmapConnector {
+
+    private DynmapPlugin plugin;
+    private MultiverseCore core;
+
+    /**
+     * This class should only ever get initialized ONCE!
+     */
+    public DynmapConnector(Plugin dynmapCore, MultiverseCore core) {
+        this.plugin = ((DynmapPlugin) dynmapCore);
+        this.core = core;
+        this.addDestinationToManager();
+    }
+
+    private void addDestinationToManager() {
+        this.core.getDestFactory().registerDestinationType(DynmapMarkerDestination.class, "dm");
+    }
+
+    public Location getLocation(String markerSet, String marker) {
+        MarkerSet set = this.plugin.getMarkerAPI().getMarkerSet(markerSet);
+        if (set == null) {
+            return null;
+        }
+        // Try to find it by the ID
+        Marker m = set.findMarker(marker);
+        if (m != null) {
+            return this.getLocationFromMarker(m);
+        }
+        // Try to find it by the label
+        m = set.findMarkerByLabel(marker);
+        if (m != null) {
+            return this.getLocationFromMarker(m);
+        }
+        return null;
+    }
+
+    private Location getLocationFromMarker(Marker m) {
+        return new Location(this.core.getServer().getWorld(m.getWorld()), m.getX(), m.getY(), m.getZ());
+    }
+}
@@ -0,0 +1,141 @@
+package com.onarandombox.MultiverseCore.plugins.destination;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.plugins.DynmapConnector;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.Vector;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class DynmapMarkerDestination implements MVDestination{
+    private MultiverseCore plugin;
+    private Location location;
+    private DynmapConnector dynmap;
+    private boolean isValid;
+    private String name;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getIdentifier() {
+        return "dm";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isThisType(JavaPlugin plugin, String destination) {
+        if (!(plugin instanceof MultiverseCore)) {
+            return false;
+        }
+        this.plugin = (MultiverseCore) plugin;
+        if (!this.plugin.isDynmapLoaded()) {
+            return false;
+        }
+        List<String> parsed = Arrays.asList(destination.split(":"));
+        // Need at least: a:set:name
+        if (!(parsed.size() == 3)) {
+            return false;
+        }
+        // If it's not a Dynmap type
+        return parsed.get(0).equalsIgnoreCase("dm");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getLocation(Entity entity) {
+        return this.location;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Vector getVelocity() {
+        return new Vector(0, 0, 0);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDestination(JavaPlugin plugin, String destination) {
+        List<String> parsed = Arrays.asList(destination.split(":"));
+        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
+            this.isValid = false;
+            return;
+        }
+        if (!(plugin instanceof MultiverseCore)) {
+            return;
+        }
+        this.plugin = (MultiverseCore) plugin;
+        if (!this.plugin.isDynmapLoaded()) {
+            return;
+        }
+        this.dynmap = this.plugin.getDynmap();
+
+        // Need at least: e:world:x,y,z
+        // OR e:world:x,y,z:pitch:yaw
+        // so basically 3 or 5
+        if (!(parsed.size() == 3)) {
+            this.isValid = false;
+            return;
+        }
+        this.location = this.dynmap.getLocation(parsed.get(1), parsed.get(2));
+        if (this.location == null) {
+            this.isValid = false;
+            return;
+        }
+
+        this.isValid = true;
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isValid() {
+        return this.isValid;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getType() {
+        return "Dynmap Marker";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return String.format("%s: %s", this.getType(), this.name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getRequiredPermission() {
+        return String.format("multiverse.access.", this.location.getWorld().getName());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean useSafeTeleporter() {
+        return false;
+    }
+}
@@ -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;
@@ -48,12 +48,12 @@ public class AnchorManager {
        Set<String> anchorKeys = anchorsSection.getKeys(false);
        for (String key : anchorKeys) {
            //world:x,y,z:pitch:yaw
-            Location anchorLocation = LocationManipulation.stringToLocation(anchorsSection.getString(key, ""));
+            Location anchorLocation = plugin.getLocationManipulation().stringToLocation(anchorsSection.getString(key, ""));
            if (anchorLocation != null) {
-                MultiverseCore.staticLog(Level.INFO, "Loading anchor:  '" + key + "'...");
+                Logging.info("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);
            }

        }
@@ -98,7 +98,7 @@ public class AnchorManager {
     * @return True if the anchor was successfully saved.
     */
    public boolean saveAnchorLocation(String anchor, String location) {
-        Location parsed = LocationManipulation.stringToLocation(location);
+        Location parsed = plugin.getLocationManipulation().stringToLocation(location);
        return parsed != null && this.saveAnchorLocation(anchor, parsed);
    }

@@ -112,7 +112,7 @@ public class AnchorManager {
        if (l == null) {
            return false;
        }
-        this.anchorConfig.set("anchors." + anchor, LocationManipulation.locationToString(l));
+        this.anchorConfig.set("anchors." + anchor, plugin.getLocationManipulation().locationToString(l));
        this.anchors.put(anchor, l);
        return this.saveAnchors();
    }
@@ -7,18 +7,19 @@

 package com.onarandombox.MultiverseCore.utils;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;

-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 {

    /**
@@ -72,28 +73,28 @@ public class BlockSafety {

        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()) + "]");
+            Logging.finer("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
+                    this.isSolidBlock(actual.getBlock().getType()));
+            Logging.finer("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
+                    this.isSolidBlock(upOne.getBlock().getType()));
            return false;
        }

        if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            MultiverseCore.staticLog(Level.FINER, "Error Here (downOne)? ("
-                + downOne.getBlock().getType() + ")[" + this.isSolidBlock(downOne.getBlock().getType()) + "]");
+            Logging.finer("Error Here (downOne)? (%s)[%s]", 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()) + "]");
+            Logging.finer("There's fire below! (%s)[%s]", 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) + "]");
+            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;
@@ -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;
@@ -21,10 +25,10 @@ import java.util.logging.Logger;
 /**
 * The Multiverse debug-logger.
 */
-public class DebugLog {
-
+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 +37,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 +55,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);
+        }
    }

    /**
@@ -20,9 +20,11 @@ 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
     */
    public FancyMessage(String title, String message, FancyColorScheme scheme) {
        this.title = title;
@@ -8,6 +8,13 @@
 package com.onarandombox.MultiverseCore.utils;

 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.logging.Logger;

 /**
 * File-utilities.
@@ -25,19 +32,70 @@ public class FileUtils {
     */
    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()) {
-                    if (!FileUtils.deleteFolder(f)) {
-                        return false;
-                    }
+                    ret = ret && deleteFolder(f);
                }
            }
-            file.delete();
-            return !file.exists();
+            return ret && file.delete();
        } else {
            return false;
        }
    }

+    private static final int COPY_BLOCK_SIZE = 1024;
+
+    /**
+     * 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) {
+        InputStream in = null;
+        OutputStream out = null;
+        try {
+            if (source.isDirectory()) {
+
+                if (!target.exists())
+                    target.mkdir();
+
+                String[] children = source.list();
+                // for (int i=0; i<children.length; i++) {
+                for (String child : children) {
+                    copyFolder(new File(source, child), new File(target, child), log);
+                }
+            } else {
+                in = new FileInputStream(source);
+                out = new FileOutputStream(target);
+
+                byte[] buf = new byte[COPY_BLOCK_SIZE];
+                int len;
+                while ((len = in.read(buf)) > 0) {
+                    out.write(buf, 0, len);
+                }
+            }
+            return true;
+        } catch (FileNotFoundException e) {
+            log.warning("Exception while copying file: " + e.getMessage());
+        } catch (IOException e) {
+            log.warning("Exception while copying file: " + e.getMessage());
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException ignore) { }
+            }
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException ignore) { }
+            }
+        }
+        return false;
+    }
 }
@@ -22,7 +22,10 @@ import java.util.Map;

 /**
 * Utility class to manipulate locations.
+ *
+ * @deprecated Use instead: {@link com.onarandombox.MultiverseCore.api.LocationManipulation} and {@link SimpleLocationManipulation}.
 */
+@Deprecated
 public class LocationManipulation {
    private LocationManipulation() { }

@@ -246,7 +249,6 @@ public class LocationManipulation {
        }
        float speed = getSpeed(v);
        float halfSpeed = (float) (speed / 2.0);
-        // TODO: Mathmatacize this:
        if (direction.equalsIgnoreCase("n")) {
            return new Vector(0, 0, -1 * speed);
        } else if (direction.equalsIgnoreCase("ne")) {
@@ -10,14 +10,16 @@ package com.onarandombox.MultiverseCore.utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;

 /**
- * Utility-class for messaging.
+ * The default-implementation of {@link MultiverseMessaging}.
 */
-public class MVMessaging {
+public class MVMessaging implements MultiverseMessaging {
    private Map<String, Long> sentList;
    private int cooldown;

@@ -27,49 +29,39 @@ public class MVMessaging {
    }

    /**
-     * Sets the message-cooldown.
-     * @param milliseconds The new message-cooldown in milliseconds.
+     * {@inheritDoc}
     */
+    @Override
    public void setCooldown(int milliseconds) {
        this.cooldown = milliseconds;
    }

    /**
-     * Sends a message to the specified sender if the cooldown has passed.
-     *
-     * @param sender         The person/console to send the message to.
-     * @param message        The message to send.
-     * @param ignoreCooldown If true this message will always be sent. Useful for things like menus
-     * @return true if the message was sent, false if not.
+     * {@inheritDoc}
     */
+    @Override
    public boolean sendMessage(CommandSender sender, String message, boolean ignoreCooldown) {
        return this.sendMessages(sender, new String[]{ message }, ignoreCooldown);
    }

    /**
-     * Sends a group of messages to the specified sender if the cooldown has passed.
-     * This method is needed, since sending many messages in quick succession would violate
-     * the cooldown.
-     *
-     * @param sender         The person/console to send the message to.
-     * @param messages       The messages to send.
-     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
-     * @return true if the message was sent, false if not.
+     * {@inheritDoc}
     */
+    @Override
    public boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown) {
        if (!(sender instanceof Player) || ignoreCooldown) {

-            this.sendMessages(sender, messages);
+            sendMessages(sender, messages);
            return true;
        }
        if (!this.sentList.containsKey(sender.getName())) {
-            this.sendMessages(sender, messages);
+            sendMessages(sender, messages);
            this.sentList.put(sender.getName(), System.currentTimeMillis());
            return true;
        } else {
            long time = System.currentTimeMillis();
            if (time >= this.sentList.get(sender.getName()) + this.cooldown) {
-                this.sendMessages(sender, messages);
+                sendMessages(sender, messages);
                this.sentList.put(sender.getName(), System.currentTimeMillis());
                return true;
            }
@@ -78,29 +70,23 @@ public class MVMessaging {
    }

    /**
-     * Sends a group of messages to the specified sender if the cooldown has passed.
-     * This method is needed, since sending many messages in quick succession would violate
-     * the cooldown.
-     *
-     * @param sender         The person/console to send the message to.
-     * @param messages       The messages to send.
-     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
-     * @return true if the message was sent, false if not.
+     * {@inheritDoc}
     */
+    @Override
    public boolean sendMessages(CommandSender sender, Collection<String> messages, boolean ignoreCooldown) {
        return this.sendMessages(sender, messages.toArray(new String[0]), ignoreCooldown);
    }

-    private void sendMessages(CommandSender sender, String[] messages) {
+    private static void sendMessages(CommandSender sender, String[] messages) {
        for (String s : messages) {
            sender.sendMessage(s);
        }
    }

    /**
-     * Gets the message-cooldown.
-     * @return The message-cooldown.
+     * {@inheritDoc}
     */
+    @Override
    public int getCooldown() {
        return cooldown;
    }
@@ -12,6 +12,7 @@ import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.pneumaticraft.commandhandler.PermissionsInterface;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -43,10 +44,6 @@ public class MVPermissions implements PermissionsInterface {
     * @return True if they should bypass restrictions.
     */
    public boolean canIgnoreGameModeRestriction(Player p, MultiverseWorld w) {
-        if (p.hasPermission("mv.bypass.gamemode.*")) {
-            this.plugin.log(Level.FINER, "Player has mv.bypass.gamemode.* their gamemode is ignored!");
-            return true;
-        }
        return p.hasPermission("mv.bypass.gamemode." + w.getName());
    }

@@ -79,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;
        }
@@ -98,7 +99,8 @@ public class MVPermissions implements PermissionsInterface {
     */
    public boolean canEnterWorld(Player p, MultiverseWorld w) {
        // If we're not enforcing access, anyone can enter.
-        if (!MultiverseCore.EnforceAccess) {
+        if (!plugin.getMVConfig().getEnforceAccess()) {
+            this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
            return true;
        }
        return this.hasPermission(p, "multiverse.access." + w.getName(), false);
@@ -142,6 +144,91 @@ public class MVPermissions implements PermissionsInterface {
        return this.hasPermission(p, d.getRequiredPermission(), false);
    }

+    /**
+     * Tells a {@link CommandSender} why another {@link CommandSender} can or can not access a certain {@link MVDestination}.
+     * @param asker The {@link CommandSender} that's asking.
+     * @param playerInQuestion The {@link CommandSender} whose permissions we want to know.
+     * @param d The {@link MVDestination}.
+     */
+    public void tellMeWhyICantDoThis(CommandSender asker, CommandSender playerInQuestion, MVDestination d) {
+        boolean cango = true;
+        if (!(playerInQuestion instanceof Player)) {
+            asker.sendMessage(String.format("The console can do %severything%s.", ChatColor.RED, ChatColor.WHITE));
+            return;
+        }
+        Player p = (Player) playerInQuestion;
+        if (d == null) {
+            asker.sendMessage(String.format("The provided Destination is %sNULL%s, and therefore %sINVALID%s.",
+                    ChatColor.RED, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE));
+            cango = false;
+        }
+        // We know it'll be a player here due to the first line of this method.
+        if (d.getLocation(p) == null) {
+            asker.sendMessage(String.format(
+                    "The player will spawn at an %sindeterminate location%s. Talk to the MV Devs if you see this",
+                    ChatColor.RED, ChatColor.WHITE));
+            cango = false;
+            asker.sendMessage(String.format(
+                                "Here are some more details for you:"));
+            asker.sendMessage(d.toString());
+            return;
+        }
+        String worldName = d.getLocation(p).getWorld().getName();
+        if (!this.worldMgr.isMVWorld(worldName)) {
+            asker.sendMessage(String.format("The destination resides in a world(%s%s%s) that is not managed by Multiverse.",
+                    ChatColor.AQUA, worldName, ChatColor.WHITE));
+            asker.sendMessage(String.format("Type %s/mv import ?%s to see the import command's help page.",
+                    ChatColor.DARK_AQUA, ChatColor.WHITE));
+            cango = false;
+        }
+        if (!this.hasPermission(p, "multiverse.access." + worldName, false)) {
+            asker.sendMessage(String.format("The player (%s%s%s) does not have the required world entry permission (%s%s%s) to go to the destination (%s%s%s).",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.GREEN, "multiverse.access." + worldName, ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+            cango = false;
+        }
+        if (!this.hasPermission(p, d.getRequiredPermission(), false)) {
+            asker.sendMessage(String.format("The player (%s%s%s) does not have the required entry permission (%s%s%s) to go to the destination (%s%s%s).",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.GREEN, d.getRequiredPermission(), ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+            cango = false;
+        }
+        if (cango) {
+            asker.sendMessage(String.format("The player (%s%s%s) CAN go to the destination (%s%s%s).",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+        } else {
+            asker.sendMessage(String.format("The player (%s%s%s) cannot access the destination %s%s%s. Therefore they can't use mvtp at all for this.",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+            return;
+        }
+        if (!this.hasPermission(p, "multiverse.teleport.self." + d.getIdentifier(), false)) {
+            asker.sendMessage(String.format("The player (%s%s%s) does not have the required teleport permission (%s%s%s) to use %s/mvtp %s%s.",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.GREEN, "multiverse.teleport.self." + d.getIdentifier(), ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+        } else {
+            asker.sendMessage(String.format("The player (%s%s%s) has the required teleport permission (%s%s%s) to use %s/mvtp %s%s.",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.GREEN, "multiverse.teleport.self." + d.getIdentifier(), ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+        }
+        if (!this.hasPermission(p, "multiverse.teleport.other." + d.getIdentifier(), false)) {
+            asker.sendMessage(String.format("The player (%s%s%s) does not have the required teleport permission (%s%s%s) to send others to %s%s%s via mvtp.",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.GREEN, "multiverse.teleport.other." + d.getIdentifier(), ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+        } else {
+            asker.sendMessage(String.format("The player (%s%s%s) has required teleport permission (%s%s%s) to send others to %s%s%s via mvtp.",
+                    ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
+                    ChatColor.GREEN, "multiverse.teleport.other." + d.getIdentifier(), ChatColor.WHITE,
+                    ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
+        }
+    }
+
    /**
     * Check to see if a player has a permission.
     *
@@ -150,6 +237,7 @@ public class MVPermissions implements PermissionsInterface {
     * @param isOpRequired @Deprecated. This is not used for anything anymore.
     * @return True if they have that permission or any parent.
     */
+    @Override
    public boolean hasPermission(CommandSender sender, String node, boolean isOpRequired) {
        if (!(sender instanceof Player)) {
            return true;
@@ -163,26 +251,24 @@ public class MVPermissions implements PermissionsInterface {
        if (node.equals("")) {
            return true;
        }
-        boolean hasPermission = checkActualPermission(sender, node);

-        // I consider this a workaround. At the moment, when we add a node AND recalc the permissions, until the perms
-        // plugin reloads, when MV asks the API if a player has a perm, it reports that they do NOT.
-        // For the moment, we're going to check all of this node's parents to see if the user has those. It stops
-        // when if finds a true or there are no more parents. --FF
-        if (!hasPermission) {
-            hasPermission = this.hasAnyParentPermission(sender, node);
-        }
-
-        return hasPermission;
+        return checkActualPermission(sender, node);
    }

    // TODO: Better player checks, most likely not needed, but safer.
    private boolean checkActualPermission(CommandSender sender, String node) {
        Player player = (Player) sender;
-        this.plugin.log(Level.FINEST, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]");
+
        boolean hasPermission = sender.hasPermission(node);
+        if (!sender.isPermissionSet(node)) {
+            this.plugin.log(Level.FINER, String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
+                    ChatColor.RED, node, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA,
+                    player.getDisplayName(), ChatColor.WHITE));
+        }
        if (hasPermission) {
-            this.plugin.log(Level.FINER, "Player [" + player.getName() + "] HAS PERMISSION [" + node + "]!");
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
+        } else {
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
        }
        return hasPermission;
    }
@@ -196,6 +282,7 @@ public class MVPermissions implements PermissionsInterface {
     * @param node   The permission node to check (possibly already a parent).
     * @return True if they have any parent perm, false if none.
     */
+    // TODO remove this...?
    private boolean hasAnyParentPermission(CommandSender sender, String node) {
        String parentPerm = this.pullOneLevelOff(node);
        // Base case
@@ -216,7 +303,7 @@ public class MVPermissions implements PermissionsInterface {
     * @param node The root node to check.
     * @return The parent of the node
     */
-    private String pullOneLevelOff(String node) {
+    private static String pullOneLevelOff(String node) {
        if (node == null) {
            return null;
        }
@@ -321,7 +408,7 @@ public class MVPermissions implements PermissionsInterface {
    /**
     * If the given permission was 'multiverse.core.tp.self', this would return 'multiverse.core.tp.*'.
     */
-    private String getParentPerm(String[] seperated) {
+    private static String getParentPerm(String[] seperated) {
        if (seperated.length == 1) {
            return null;
        }
@@ -331,5 +418,4 @@ public class MVPermissions implements PermissionsInterface {
        }
        return returnString + "*";
    }
-
 }
@@ -7,8 +7,7 @@

 package com.onarandombox.MultiverseCore.utils;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.configuration.Configuration;
+import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import org.bukkit.entity.Player;

 import java.util.Date;
@@ -23,9 +22,9 @@ public class MVPlayerSession {
    private long teleportLast = 0L; // Timestamp for the Players last Portal Teleportation.
    private long messageLast = 0L; // Timestamp for the Players last Alert Message.

-    private Configuration config; // Configuration file to find out Cooldown Timers.
+    private MultiverseCoreConfig config; // Configuration file to find out Cooldown Timers.

-    public MVPlayerSession(Player player, Configuration config, MultiverseCore multiVerseCore) {
+    public MVPlayerSession(Player player, MultiverseCoreConfig config) {
        this.player = player;
        this.config = config;
        // this.bedSpawn = null;
@@ -42,6 +41,6 @@ public class MVPlayerSession {
     */
    public boolean getTeleportable() {
        long time = (new Date()).getTime();
-        return ((time - this.teleportLast) > this.config.getInt("portalcooldown", 5000)); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        return ((time - this.teleportLast) > this.config.getTeleportCooldown());
    }
 }
@@ -9,6 +9,7 @@ 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;
@@ -106,7 +107,7 @@ public class MVTravelAgent implements TravelAgent {
        if (this.destination instanceof CannonDestination) {
            this.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
        }
-        SafeTTeleporter teleporter = new SafeTTeleporter(this.core);
+        SafeTTeleporter teleporter = this.core.getSafeTTeleporter();
        Location newLoc = this.destination.getLocation(this.player);
        if (this.destination.useSafeTeleporter()) {
            newLoc = teleporter.getSafeLocation(this.player, this.destination);