Possibly fixes some of the issues with IC2, at least for default worlds.

pom.xml

@@ -20,21 +20,6 @@
             <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>
@@ -116,6 +101,12 @@
                     </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>
@@ -145,33 +136,6 @@
                     <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>
@@ -186,11 +150,8 @@
                             <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>
+                                    <include>com.pneumaticraft.commandhandler:CommandHandler</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
@@ -206,22 +167,6 @@
                                     <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>
@@ -235,7 +180,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.3.2-R2.1-SNAPSHOT</version>
+            <version>1.2.5-R1.0</version>
             <!-- If you want the lates, use this -->
             <!-- <version>LATEST</version> -->
             <type>jar</type>
@@ -258,7 +203,7 @@
             <scope>compile</scope>
         </dependency>
         <!-- End of SerializationConfig Dependency -->
-        <!-- Start of Economy Dependency -->
+        <!-- Start of AllPay Dependency -->
         <dependency>
             <groupId>com.fernferret.allpay</groupId>
             <artifactId>AllPay</artifactId>
@@ -266,14 +211,7 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>Vault</artifactId>
-            <version>1.2.19-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Economy Dependency -->
+        <!-- End of AllPay Dependency -->
         <!-- Start of CommandHandler Dependency -->
         <dependency>
             <groupId>com.pneumaticraft.commandhandler</groupId>
@@ -283,49 +221,6 @@
             <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>org.dynmap</groupId>
-            <artifactId>dynmap</artifactId>
-            <version>1.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- 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>

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

@@ -39,7 +39,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.util.Vector;
-import org.json.simple.JSONObject;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
@@ -61,23 +60,23 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
     private static final int SPAWN_LOCATION_SEARCH_TOLERANCE = 16;
     private static final int SPAWN_LOCATION_SEARCH_RADIUS = 16;
 
-    private static final Map<String, String> PROPERTY_ALIASES;
+    private static Map<String, String> propertyAliases;
 
     static {
-        PROPERTY_ALIASES = new HashMap<String, String>();
-        PROPERTY_ALIASES.put("curr", "currency");
-        PROPERTY_ALIASES.put("scaling", "scale");
-        PROPERTY_ALIASES.put("aliascolor", "color");
-        PROPERTY_ALIASES.put("heal", "autoHeal");
-        PROPERTY_ALIASES.put("storm", "allowWeather");
-        PROPERTY_ALIASES.put("weather", "allowWeather");
-        PROPERTY_ALIASES.put("spawnmemory", "keepSpawnInMemory");
-        PROPERTY_ALIASES.put("memory", "keepSpawnInMemory");
-        PROPERTY_ALIASES.put("mode", "gameMode");
-        PROPERTY_ALIASES.put("diff", "difficulty");
-        PROPERTY_ALIASES.put("spawnlocation", "spawn");
-        PROPERTY_ALIASES.put("animals", "spawning.animals.spawn");
-        PROPERTY_ALIASES.put("monsters", "spawning.monsters.spawn");
+        propertyAliases = new HashMap<String, String>();
+        propertyAliases.put("curr", "currency");
+        propertyAliases.put("scaling", "scale");
+        propertyAliases.put("aliascolor", "color");
+        propertyAliases.put("heal", "autoHeal");
+        propertyAliases.put("storm", "allowWeather");
+        propertyAliases.put("weather", "allowWeather");
+        propertyAliases.put("spawnmemory", "keepSpawnInMemory");
+        propertyAliases.put("memory", "keepSpawnInMemory");
+        propertyAliases.put("mode", "gameMode");
+        propertyAliases.put("diff", "difficulty");
+        propertyAliases.put("spawnlocation", "spawn");
+        propertyAliases.put("animals", "spawning.animals.spawn");
+        propertyAliases.put("monsters", "spawning.monsters.spawn");
     }
     /*
      * We have to use setCBWorld(), setPlugin() and initPerms() to prepare this object for use.
@@ -88,7 +87,7 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
 
     private MultiverseCore plugin; // Hold the Plugin Instance.
 
-    private volatile Reference<World> world = new WeakReference<World>(null); // A reference to the World Instance.
+    private Reference<World> world = new WeakReference<World>(null); // A reference to the World Instance.
     private String name; // The Worlds Name, EG its folder name.
 
     /**
@@ -354,15 +353,15 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
     // --------------------------------------------------------------
     // Begin properties
     @Property(description = "Sorry, 'hidden' must either be: true or false.")
-    private volatile boolean hidden;
+    private boolean hidden;
     @Property(description = "Alias must be a valid string.")
-    private volatile String alias;
+    private String alias;
     @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'color' must be a valid color-name.")
-    private volatile EnglishChatColor color;
+    private EnglishChatColor color;
     @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'style' must be a valid style-name.")
-    private volatile EnglishChatStyle style;
+    private EnglishChatStyle style;
     @Property(description = "Sorry, 'pvp' must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
-    private volatile VirtualProperty<Boolean> pvp = new VirtualProperty<Boolean>() {
+    private VirtualProperty<Boolean> pvp = new VirtualProperty<Boolean>() {
         @Override
         public void set(Boolean newValue) {
             world.get().setPVP(newValue);
@@ -374,14 +373,14 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
         }
     };
     @Property(validator = ScalePropertyValidator.class, description = "Scale must be a positive double value. ex: 2.3")
-    private volatile double scale;
+    private double scale;
     @Property(validator = RespawnWorldPropertyValidator.class, description = "You must set this to the NAME not alias of a world.")
-    private volatile String respawnWorld;
+    private String respawnWorld;
     @Property(validator = AllowWeatherPropertyValidator.class, description = "Sorry, this must either be: true or false.")
-    private volatile boolean allowWeather;
+    private boolean allowWeather;
     @Property(serializor = DifficultyPropertySerializor.class, virtualType = Difficulty.class, persistVirtual = true,
             description = "Difficulty must be set as one of the following: peaceful easy normal hard")
-    private volatile VirtualProperty<Difficulty> difficulty = new VirtualProperty<Difficulty>() {
+    private VirtualProperty<Difficulty> difficulty = new VirtualProperty<Difficulty>() {
         @Override
         public void set(Difficulty newValue) {
             world.get().setDifficulty(newValue);
@@ -393,22 +392,22 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
         }
     };
     @Property(validator = SpawningPropertyValidator.class, description = "Sorry, 'animals' must either be: true or false.")
-    private volatile SpawnSettings spawning;
+    private SpawnSettings spawning;
     @Property
-    private volatile EntryFee entryfee;
+    private EntryFee entryfee;
     @Property(description = "Sorry, 'hunger' must either be: true or false.")
-    private volatile boolean hunger;
+    private boolean hunger;
     @Property(description = "Sorry, 'autoheal' must either be: true or false.")
-    private volatile boolean autoHeal;
+    private boolean autoHeal;
     @Property(description = "Sorry, 'adjustspawn' must either be: true or false.")
-    private volatile boolean adjustSpawn;
+    private boolean adjustSpawn;
     @Property(serializor = EnumPropertySerializor.class, description = "Allow portal forming must be NONE, ALL, NETHER or END.")
-    private volatile AllowedPortalType portalForm;
+    private AllowedPortalType portalForm;
     @Property(serializor = GameModePropertySerializor.class, validator = GameModePropertyValidator.class,
             description = "GameMode must be set as one of the following: survival creative")
-    private volatile GameMode gameMode;
+    private GameMode gameMode;
     @Property(description = "Sorry, this must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
-    private volatile VirtualProperty<Boolean> keepSpawnInMemory = new VirtualProperty<Boolean>() {
+    private VirtualProperty<Boolean> keepSpawnInMemory = new VirtualProperty<Boolean>() {
         @Override
         public void set(Boolean newValue) {
             world.get().setKeepSpawnInMemory(newValue);
@@ -420,10 +419,10 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
         }
     };
     @Property
-    private volatile SpawnLocation spawnLocation;
+    private SpawnLocation spawnLocation;
     @Property(validator = SpawnLocationPropertyValidator.class, virtualType = Location.class,
             description = "There is no help available for this variable. Go bug Rigby90 about it.")
-    private volatile VirtualProperty<Location> spawn = new VirtualProperty<Location>() {
+    private VirtualProperty<Location> spawn = new VirtualProperty<Location>() {
         @Override
         public void set(Location newValue) {
             if (getCBWorld() != null)
@@ -441,14 +440,15 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
         }
     };
     @Property(description = "Set this to false ONLY if you don't want this world to load itself on server restart.")
-    private volatile boolean autoLoad;
+    private boolean autoLoad;
     @Property(description = "If a player dies in this world, shoudld they go to their bed?")
-    private volatile boolean bedRespawn;
+    private boolean bedRespawn;
     @Property
-    private volatile List<String> worldBlacklist;
+    private List<String> worldBlacklist;
+    @SuppressWarnings("unused") // it IS used!
     @Property(serializor = TimePropertySerializor.class, virtualType = Long.class,
             description = "Set the time to whatever you want! (Will NOT freeze time)")
-    private volatile VirtualProperty<Long> time = new VirtualProperty<Long>() {
+    private VirtualProperty<Long> time = new VirtualProperty<Long>() {
         @Override
         public void set(Long newValue) {
             world.get().setTime(newValue);
@@ -460,11 +460,11 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
         }
     };
     @Property
-    private volatile Environment environment;
+    private Environment environment;
     @Property
-    private volatile long seed;
+    private long seed;
     @Property
-    private volatile String generator;
+    private String generator;
     // End of properties
     // --------------------------------------------------------------
 
@@ -664,7 +664,7 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
      * @see SerializationConfig
      */
     protected static Map<String, String> getAliases() {
-        return PROPERTY_ALIASES;
+        return propertyAliases;
     }
 
     private static double getDefaultScale(Environment environment) {
@@ -1398,13 +1398,11 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
 
     @Override
     public String toString() {
-        final JSONObject jsonData = new JSONObject();
-        jsonData.put("Name", getName());
-        jsonData.put("Env", getEnvironment().toString());
-        jsonData.put("Type", getWorldType().toString());
-        jsonData.put("Gen", getGenerator());
-        final JSONObject topLevel = new JSONObject();
-        topLevel.put(getClass().getSimpleName() + "@" + hashCode(), jsonData);
-        return topLevel.toString();
+        StringBuilder toStringBuilder = new StringBuilder();
+        toStringBuilder.append(this.getClass().getSimpleName());
+        toStringBuilder.append('@');
+        toStringBuilder.append(this.hashCode());
+        toStringBuilder.append(" (Name: '").append(this.getName()).append("')");
+        return toStringBuilder.toString();
     }
 }

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

@@ -7,8 +7,6 @@
 
 package com.onarandombox.MultiverseCore;
 
-import buscript.Buscript;
-import com.dumptruckman.minecraft.util.Logging;
 import com.fernferret.allpay.AllPay;
 import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
@@ -22,7 +20,6 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.commands.AnchorCommand;
 import com.onarandombox.MultiverseCore.commands.CheckCommand;
-import com.onarandombox.MultiverseCore.commands.CloneCommand;
 import com.onarandombox.MultiverseCore.commands.ConfigCommand;
 import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
 import com.onarandombox.MultiverseCore.commands.CoordCommand;
@@ -45,7 +42,6 @@ import com.onarandombox.MultiverseCore.commands.PurgeCommand;
 import com.onarandombox.MultiverseCore.commands.RegenCommand;
 import com.onarandombox.MultiverseCore.commands.ReloadCommand;
 import com.onarandombox.MultiverseCore.commands.RemoveCommand;
-import com.onarandombox.MultiverseCore.commands.ScriptCommand;
 import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
 import com.onarandombox.MultiverseCore.commands.SpawnCommand;
 import com.onarandombox.MultiverseCore.commands.TeleportCommand;
@@ -61,16 +57,13 @@ import com.onarandombox.MultiverseCore.destination.PlayerDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
-import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
-import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVPluginListener;
 import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
-import com.onarandombox.MultiverseCore.plugins.DynmapConnector;
 import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
+import com.onarandombox.MultiverseCore.utils.DebugLog;
 import com.onarandombox.MultiverseCore.utils.MVMessaging;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
@@ -80,11 +73,8 @@ import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import me.main__.util.SerializationConfig.SerializationConfig;
-import net.milkbowl.vault.economy.Economy;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
@@ -92,14 +82,8 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.mcstats.Metrics;
 
 import java.io.File;
 import java.io.IOException;
@@ -107,25 +91,25 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.Random;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * The implementation of the Multiverse-{@link Core}.
  */
-public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listener {
-    private static final int PROTOCOL = 18;
+public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
+    private static final int PROTOCOL = 15;
     // TODO: Investigate if this one is really needed to be static.
     // Doubt it. -- FernFerret
     private static Map<String, String> teleportQueue = new HashMap<String, String>();
 
     private AnchorManager anchorManager = new AnchorManager(this);
-    private DynmapConnector dynmapConnecter;
-    private volatile MultiverseCoreConfiguration config;
+    // TODO please let's make this non-static
+    private MultiverseCoreConfiguration config;
 
     /**
      * This method is used to find out who is teleporting a player.
@@ -148,7 +132,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
      * @param teleportee The name of the player that was teleported.
      */
     public static void addPlayerToTeleportQueue(String teleporter, String teleportee) {
-        Logging.finest( "Adding mapping '%s' => '%s' to teleport queue", teleporter, teleportee);
+        staticLog(Level.FINEST, "Adding mapping '" + teleporter + "' => '" + teleportee + "' to teleport queue");
         teleportQueue.put(teleportee, teleporter);
     }
 
@@ -184,6 +168,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         return MultiverseCore.PROTOCOL;
     }
 
+    // Useless stuff to keep us going.
+    private static final Logger LOGGER = Logger.getLogger("Minecraft");
+    private static DebugLog debugLog;
+
     // Setup our Map for our Commands using the CommandHandler.
     private CommandHandler commandHandler;
 
@@ -195,22 +183,19 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
     // Configurations
     private FileConfiguration multiverseConfig = null;
 
-    private final MVWorldManager worldManager = new WorldManager(this);
+    private MVWorldManager worldManager = new WorldManager(this);
 
     // Setup the block/player/entity listener.
-    private final MVPlayerListener playerListener = new MVPlayerListener(this);
-    private final MVEntityListener entityListener = new MVEntityListener(this);
-    private final MVPluginListener pluginListener = new MVPluginListener(this);
-    private final MVWeatherListener weatherListener = new MVWeatherListener(this);
-    private final MVPortalListener portalListener = new MVPortalListener(this);
-    private MVChatListener chatListener;
+    private MVPlayerListener playerListener = new MVPlayerListener(this);
+    private MVEntityListener entityListener = new MVEntityListener(this);
+    private MVPluginListener pluginListener = new MVPluginListener(this);
+    private MVWeatherListener weatherListener = new MVWeatherListener(this);
+    private MVPortalListener portalListener = new MVPortalListener(this);
 
     // HashMap to contain information relating to the Players.
     private HashMap<String, MVPlayerSession> playerSessions;
-    private Economy vaultEco = null;
     private GenericBank bank = null;
     private AllPay banker;
-    private Buscript buscript;
     private int pluginCount;
     private DestinationFactory destFactory;
     //private SpoutInterface spoutInterface = null;
@@ -230,8 +215,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         // Create our DataFolder
         getDataFolder().mkdirs();
         // Setup our Debug Log
-        Logging.init(this);
-        SerializationConfig.initLogging(Logging.getLogger());
+        debugLog = new DebugLog("Multiverse-Core", getDataFolder() + File.separator + "debug.log");
+        debugLog.setStandardLogger(LOGGER);
+        SerializationConfig.initLogging(debugLog);
         // Setup our BlockSafety
         this.blockSafety = new SimpleBlockSafety(this);
         // Setup our LocationManipulation
@@ -254,19 +240,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
      * {@inheritDoc}
      */
     @Override
-    @Deprecated
     public GenericBank getBank() {
         return this.bank;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Economy getVaultEconomy() {
-        return vaultEco;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -306,184 +283,26 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         if (this.multiverseConfig != null) {
             this.worldManager.loadDefaultWorlds();
             this.worldManager.loadWorlds(true);
-            Logging.setDebugLevel(getMVConfig().getGlobalDebug());
         } else {
             this.log(Level.SEVERE, "Your configs were not loaded. Very little will function in Multiverse.");
         }
         this.anchorManager.loadAnchors();
 
         // Now set the firstspawnworld (after the worlds are loaded):
-        this.worldManager.setFirstSpawnWorld(getMVConfig().getFirstSpawnWorld());
+        this.worldManager.setFirstSpawnWorld(config.getFirstSpawnWorld());
         try {
-            getMVConfig().setFirstSpawnWorld(this.worldManager.getFirstSpawnWorld().getName());
+            config.setFirstSpawnWorld(this.worldManager.getFirstSpawnWorld().getName());
         } catch (NullPointerException e) {
             // A test that had no worlds loaded was being run. This should never happen in production
         }
         this.saveMVConfig();
-        // Register async or sync player chat according to config
-        try {
-            Class.forName("org.bukkit.event.player.AsyncPlayerChatEvent");
-        } catch (ClassNotFoundException e) {
-            getMVConfig().setUseAsyncChat(false);
-        }
-        if (getMVConfig().getUseAsyncChat()) {
-            this.chatListener = new MVAsyncPlayerChatListener(this, this.playerListener);
-        } else {
-            this.chatListener = new MVPlayerChatListener(this, this.playerListener);
-        }
-        getServer().getPluginManager().registerEvents(this.chatListener, this);
         /*
         // Check to see if spout was already loaded (most likely):
         if (this.getServer().getPluginManager().getPlugin("Spout") != null) {
             this.setSpout();
             this.log(Level.INFO, "Spout integration enabled.");
         }
-
-        // Check to see if Dynmap was already loaded:
-        if (this.getServer().getPluginManager().getPlugin("dynmap") != null) {
-            this.getDynmap();
-            this.log(Level.INFO, "Dynmap integration enabled.");
         */
-
-        this.initializeBuscript();
-        this.setupMetrics();
-        // Listen out for vault.
-        getServer().getPluginManager().registerEvents(this, this);
-        this.setupVaultEconomy();
-    }
-
-    private boolean setupVaultEconomy() {
-        if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
-            final RegisteredServiceProvider<Economy> economyProvider
-                    = getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
-            if (economyProvider != null) {
-                Logging.fine("Vault economy enabled.");
-                vaultEco = economyProvider.getProvider();
-            } else {
-                Logging.finer("Vault economy not detected.");
-                vaultEco = null;
-            }
-        } else {
-            Logging.finer("Vault was not found.");
-            vaultEco = null;
-        }
-
-        return (vaultEco != null);
-    }
-
-    @EventHandler
-    private void vaultEnabled(PluginEnableEvent event) {
-        if (event.getPlugin() != null && event.getPlugin().getName().equals("Vault")) {
-            setupVaultEconomy();
-        }
-    }
-
-    @EventHandler
-    private void vaultDisabled(PluginDisableEvent event) {
-        if (event.getPlugin() != null && event.getPlugin().getName().equals("Vault")) {
-            Logging.fine("Vault economy disabled");
-            setupVaultEconomy();
-        }
-    }
-
-    /**
-     * Initializes the buscript javascript library.
-     */
-    private void initializeBuscript() {
-        buscript = new Buscript(this);
-        // Add global variable "multiverse" to javascript environment
-        buscript.getGlobalScope().put("multiverse", buscript.getGlobalScope(), this);
-    }
-
-    /**
-     * Plotter for Environment-Values.
-     */
-    private static final class EnvironmentPlotter extends Metrics.Plotter {
-        private MultiverseCore core;
-        private final Environment env;
-
-        public EnvironmentPlotter(MultiverseCore core, Environment env) {
-            super(envToString(env));
-            this.core = core;
-            this.env = env;
-        }
-
-        private static String envToString(Environment env) {
-            return new StringBuilder().append(env.name().toUpperCase().charAt(0))
-                    .append(env.name().toLowerCase().substring(1)).toString();
-        }
-
-        @Override
-        public int getValue() {
-            int count = 0;
-            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
-                if (w.getEnvironment() == env)
-                    count++;
-            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, env));
-            return count;
-        }
-    }
-
-    /**
-     * Plotter for Generator-Values.
-     */
-    private static final class GeneratorPlotter extends Metrics.Plotter {
-        private MultiverseCore core;
-        private final String gen;
-
-        public GeneratorPlotter(MultiverseCore core, String gen) {
-            super(gen);
-            this.core = core;
-            this.gen = gen;
-        }
-
-        @Override
-        public int getValue() {
-            int count = 0;
-            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
-                if (gen.equals(w.getGenerator()))
-                    count++;
-            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, gen));
-            return count;
-        }
-    }
-
-    private void setupMetrics() {
-        try {
-            Metrics m = new Metrics(this);
-
-            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
-            for (Environment env : Environment.values())
-                envGraph.addPlotter(new EnvironmentPlotter(this, env));
-
-            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
-                @Override
-                public int getValue() {
-                    return getMVWorldManager().getMVWorlds().size();
-                }
-            });
-            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
-                @Override
-                public int getValue() {
-                    return getMVWorldManager().getMVWorlds().size()
-                            + getMVWorldManager().getUnloadedWorlds().size();
-                }
-            });
-
-            Set<String> gens = new HashSet<String>();
-            for (MultiverseWorld w : this.getMVWorldManager().getMVWorlds())
-                gens.add(w.getGenerator());
-            gens.remove(null);
-            gens.remove("null");
-            Metrics.Graph genGraph = m.createGraph("custom_gens");
-            for (String gen : gens)
-                genGraph.addPlotter(new GeneratorPlotter(this, gen));
-
-            m.start();
-            log(Level.FINE, "Metrics have run!");
-        } catch (IOException e) {
-            log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
-        }
     }
 
     private void initializeDestinationFactory() {
@@ -525,14 +344,15 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         MultiverseCoreConfiguration wantedConfig = null;
         try {
             wantedConfig = (MultiverseCoreConfiguration) multiverseConfig.get("multiverse-configuration");
-        } catch (Exception ignore) {
+        } catch (Exception e) {
+            // We're just thinking "no risk no fun" and therefore have to catch and forget this exception
         } finally {
             config = ((wantedConfig == null) ? new MultiverseCoreConfiguration() : wantedConfig);
         }
         this.migrateWorldConfig();
         this.worldManager.loadWorldConfig(new File(getDataFolder(), "worlds.yml"));
 
-        this.messaging.setCooldown(getMVConfig().getMessageCooldown());
+        this.messaging.setCooldown(config.getMessageCooldown());
 
         // Remove old values.
         this.multiverseConfig.set("enforcegamemodes", null);
@@ -551,42 +371,42 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
     private void migrate22Values() {
         if (this.multiverseConfig.isSet("worldnameprefix")) {
             this.log(Level.INFO, "Migrating 'worldnameprefix'...");
-            this.getMVConfig().setPrefixChat(this.multiverseConfig.getBoolean("worldnameprefix"));
+            this.config.setPrefixChat(this.multiverseConfig.getBoolean("worldnameprefix"));
             this.multiverseConfig.set("worldnameprefix", null);
         }
         if (this.multiverseConfig.isSet("firstspawnworld")) {
             this.log(Level.INFO, "Migrating 'firstspawnworld'...");
-            this.getMVConfig().setFirstSpawnWorld(this.multiverseConfig.getString("firstspawnworld"));
+            this.config.setFirstSpawnWorld(this.multiverseConfig.getString("firstspawnworld"));
             this.multiverseConfig.set("firstspawnworld", null);
         }
         if (this.multiverseConfig.isSet("enforceaccess")) {
             this.log(Level.INFO, "Migrating 'enforceaccess'...");
-            this.getMVConfig().setEnforceAccess(this.multiverseConfig.getBoolean("enforceaccess"));
+            this.config.setEnforceAccess(this.multiverseConfig.getBoolean("enforceaccess"));
             this.multiverseConfig.set("enforceaccess", null);
         }
         if (this.multiverseConfig.isSet("displaypermerrors")) {
             this.log(Level.INFO, "Migrating 'displaypermerrors'...");
-            this.getMVConfig().setDisplayPermErrors(this.multiverseConfig.getBoolean("displaypermerrors"));
+            this.config.setDisplayPermErrors(this.multiverseConfig.getBoolean("displaypermerrors"));
             this.multiverseConfig.set("displaypermerrors", null);
         }
         if (this.multiverseConfig.isSet("teleportintercept")) {
             this.log(Level.INFO, "Migrating 'teleportintercept'...");
-            this.getMVConfig().setTeleportIntercept(this.multiverseConfig.getBoolean("teleportintercept"));
+            this.config.setTeleportIntercept(this.multiverseConfig.getBoolean("teleportintercept"));
             this.multiverseConfig.set("teleportintercept", null);
         }
         if (this.multiverseConfig.isSet("firstspawnoverride")) {
             this.log(Level.INFO, "Migrating 'firstspawnoverride'...");
-            this.getMVConfig().setFirstSpawnOverride(this.multiverseConfig.getBoolean("firstspawnoverride"));
+            this.config.setFirstSpawnOverride(this.multiverseConfig.getBoolean("firstspawnoverride"));
             this.multiverseConfig.set("firstspawnoverride", null);
         }
         if (this.multiverseConfig.isSet("messagecooldown")) {
             this.log(Level.INFO, "Migrating 'messagecooldown'...");
-            this.getMVConfig().setMessageCooldown(this.multiverseConfig.getInt("messagecooldown"));
+            this.config.setMessageCooldown(this.multiverseConfig.getInt("messagecooldown"));
             this.multiverseConfig.set("messagecooldown", null);
         }
         if (this.multiverseConfig.isSet("debug")) {
             this.log(Level.INFO, "Migrating 'debug'...");
-            this.getMVConfig().setGlobalDebug(this.multiverseConfig.getInt("debug"));
+            this.config.setGlobalDebug(this.multiverseConfig.getInt("debug"));
             this.multiverseConfig.set("debug", null);
         }
         if (this.multiverseConfig.isSet("version")) {
@@ -598,11 +418,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
     /**
      * Migrate the worlds.yml to SerializationConfig.
      */
-    private void migrateWorldConfig() { // SUPPRESS CHECKSTYLE: MethodLength
+    private void migrateWorldConfig() {
         FileConfiguration wconf = YamlConfiguration
                 .loadConfiguration(new File(getDataFolder(), "worlds.yml"));
 
-        if (!wconf.isConfigurationSection("worlds")) { // empty config
+        if (!wconf.isConfigurationSection("worlds")) {// empty config
             this.log(Level.FINE, "No worlds to migrate!");
             return;
         }
@@ -823,7 +643,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         this.commandHandler.registerCommand(new ListCommand(this));
         this.commandHandler.registerCommand(new InfoCommand(this));
         this.commandHandler.registerCommand(new CreateCommand(this));
-        this.commandHandler.registerCommand(new CloneCommand(this));
         this.commandHandler.registerCommand(new ImportCommand(this));
         this.commandHandler.registerCommand(new ReloadCommand(this));
         this.commandHandler.registerCommand(new SetSpawnCommand(this));
@@ -852,7 +671,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         this.commandHandler.registerCommand(new DebugCommand(this));
         this.commandHandler.registerCommand(new GeneratorCommand(this));
         this.commandHandler.registerCommand(new CheckCommand(this));
-        this.commandHandler.registerCommand(new ScriptCommand(this));
     }
 
     /**
@@ -861,10 +679,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
     @Override
     public void onDisable() {
         this.saveMVConfigs();
+        debugLog.close();
         this.banker = null;
         this.bank = null;
         log(Level.INFO, "- Disabled");
-        Logging.shutdown();
     }
 
     /**
@@ -875,7 +693,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         if (this.playerSessions.containsKey(player.getName())) {
             return this.playerSessions.get(player.getName());
         } else {
-            this.playerSessions.put(player.getName(), new MVPlayerSession(player, getMVConfig()));
+            this.playerSessions.put(player.getName(), new MVPlayerSession(player, config));
             return this.playerSessions.get(player.getName());
         }
     }
@@ -910,17 +728,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         }
         ArrayList<String> allArgs = new ArrayList<String>(Arrays.asList(args));
         allArgs.add(0, command.getName());
-        try {
-            return this.commandHandler.locateAndRunCommand(sender, allArgs, getMVConfig().getDisplayPermErrors());
-        } catch (Exception e) {
-            e.printStackTrace();
-            sender.sendMessage(ChatColor.RED + "An internal error occurred when attempting to perform this command.");
-            if (sender.isOp())
-                sender.sendMessage(ChatColor.RED + "Details were printed to the server console and logs, please add that to your bug report.");
-            else
-                sender.sendMessage(ChatColor.RED + "Try again and contact the server owner or an admin if this problem persists.");
-            return true;
-        }
+        return this.commandHandler.locateAndRunCommand(sender, allArgs, config.getDisplayPermErrors());
     }
 
     /**
@@ -928,7 +736,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
      */
     @Override
     public void log(Level level, String msg) {
-        Logging.log(level, msg);
+        staticLog(level, msg);
     }
 
     /**
@@ -936,28 +744,30 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
      *
      * @param level The Log-{@link Level}.
      * @param msg The message to log.
-     *
-     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
-     * messages will appear to originate from Multiverse-Core.
      */
-    @Deprecated
     public static void staticLog(Level level, String msg) {
-        Logging.log(level, msg);
+        if (level == Level.FINE && MultiverseCoreConfiguration.getInstance().getGlobalDebug() >= 1) {
+            staticDebugLog(Level.INFO, msg);
+        } else if (level == Level.FINER && MultiverseCoreConfiguration.getInstance().getGlobalDebug() >= 2) {
+            staticDebugLog(Level.INFO, msg);
+        } else if (level == Level.FINEST && MultiverseCoreConfiguration.getInstance().getGlobalDebug() >= 3) {
+            staticDebugLog(Level.INFO, msg);
+        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
+            String message = LOG_TAG + " " + msg;
+            LOGGER.log(level, message);
+            debugLog.log(level, message);
+        }
     }
 
     /**
-     * Print messages to the Debug Log, if the servers in Debug Mode then we also want to print the messages to the
+     * Print messages to the Debug Log, if the servers in Debug Mode then we also wan't to print the messages to the
      * standard Server Console.
      *
      * @param level The Log-{@link Level}
      * @param msg The message
-     *
-     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
-     * messages will appear to originate from Multiverse-Core.
      */
-    @Deprecated
     public static void staticDebugLog(Level level, String msg) {
-        Logging.log(level, msg);
+        debugLog.log(level, msg);
     }
 
     /**
@@ -1053,7 +863,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
      * {@inheritDoc}
      */
     @Override
-    @Deprecated
     public AllPay getBanker() {
         return this.banker;
     }
@@ -1062,7 +871,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
      * {@inheritDoc}
      */
     @Override
-    @Deprecated
     public void setBank(GenericBank bank) {
         this.bank = bank;
     }
@@ -1144,15 +952,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         return this.playerListener;
     }
 
-    /**
-     * Gets the {@link MVChatListener}.
-     *
-     * @return The {@link MVChatListener}.
-     */
-    public MVChatListener getChatListener() {
-        return this.chatListener;
-    }
-
     /**
      * Gets the {@link MVEntityListener}.
      *
@@ -1178,7 +977,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
      */
     public boolean saveMVConfig() {
         try {
-            this.multiverseConfig.set("multiverse-configuration", getMVConfig());
+            this.multiverseConfig.set("multiverse-configuration", config);
             this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
             return true;
         } catch (IOException e) {
@@ -1215,27 +1014,38 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
         return this.worldManager.deleteWorld(name);
     }
 
-    /**
-     * NOT deprecated for the time as queued commands use this.
-     * However, this is not in the API and other plugins should therefore not use it.
-     *
-     * @param oldName   World to copy
-     * @param newName   World to create
-     * @param generator The Custom generator plugin to use.
-     * @return True if success, false if fail.
-     */
-    public Boolean cloneWorld(String oldName, String newName, String generator) {
-        return this.worldManager.cloneWorld(oldName, newName, generator);
-    }
-
     /**
      * {@inheritDoc}
-     * @deprecated This is deprecated!
      */
     @Override
-    @Deprecated
     public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed) {
-        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed);
+        MultiverseWorld world = this.worldManager.getMVWorld(name);
+        if (world == null) {
+            return false;
+        }
+
+        List<Player> ps = world.getCBWorld().getPlayers();
+
+        if (useNewSeed) {
+            // Set the worldseed.
+            if (randomSeed) {
+                Random random = new Random();
+                Long newseed = random.nextLong();
+                seed = newseed.toString();
+            }
+            ((WorldManager) this.worldManager).getConfigWorlds().set("worlds." + name + ".seed", seed);
+        }
+        if (this.worldManager.deleteWorld(name, false)) {
+            this.worldManager.loadWorlds(false);
+            SafeTTeleporter teleporter = this.getSafeTTeleporter();
+            Location newSpawn = this.getServer().getWorld(name).getSpawnLocation();
+            // Send all players that were in the old world, BACK to it!
+            for (Player p : ps) {
+                teleporter.safelyTeleport(null, p, newSpawn, true);
+            }
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -1312,25 +1122,4 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
     public static MultiverseCoreConfiguration getStaticConfig() {
         return MultiverseCoreConfiguration.getInstance();
     }
-
-    /**
-     * Returns true if dynmap was detected.
-     * @return True if dynmap was detected.
-     */
-    public boolean isDynmapLoaded() {
-        return !(this.dynmapConnecter == null);
-    }
-
-    public DynmapConnector getDynmap() {
-        return this.dynmapConnecter;
-    }
-
-    public void setDynmap() {
-        this.dynmapConnecter = new DynmapConnector(this.getServer().getPluginManager().getPlugin("dynmap"), this);
-    }
-
-    @Override
-    public Buscript getScriptAPI() {
-        return buscript;
-    }
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -40,27 +39,25 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     }
 
     @Property
-    private volatile boolean enforceaccess;
+    private boolean enforceaccess;
     @Property
-    private volatile boolean prefixchat;
+    private boolean prefixchat;
     @Property
-    private volatile boolean useasyncchat;
+    private boolean teleportintercept;
     @Property
-    private volatile boolean teleportintercept;
+    private boolean firstspawnoverride;
     @Property
-    private volatile boolean firstspawnoverride;
+    private boolean displaypermerrors;
     @Property
-    private volatile boolean displaypermerrors;
+    private int globaldebug;
     @Property
-    private volatile int globaldebug;
+    private int messagecooldown;
     @Property
-    private volatile int messagecooldown;
+    private double version;
     @Property
-    private volatile double version;
+    private String firstspawnworld;
     @Property
-    private volatile String firstspawnworld;
-    @Property
-    private volatile int teleportcooldown;
+    private int teleportcooldown;
 
     public MultiverseCoreConfiguration() {
         super();
@@ -76,10 +73,9 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
      * {@inheritDoc}
      */
     @Override
-    protected void setDefaults() {
+    public void setDefaults() {
         // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
         enforceaccess = false;
-        useasyncchat = true;
         prefixchat = true;
         teleportintercept = true;
         firstspawnoverride = true;
@@ -199,7 +195,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Override
     public void setGlobalDebug(int globalDebug) {
         this.globaldebug = globalDebug;
-        Logging.setDebugLevel(globalDebug);
     }
 
     /**
@@ -265,14 +260,4 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     public void setTeleportCooldown(int teleportCooldown) {
         this.teleportcooldown = teleportCooldown;
     }
-
-    @Override
-    public void setUseAsyncChat(boolean useAsyncChat) {
-        this.useasyncchat = useAsyncChat;
-    }
-
-    @Override
-    public boolean getUseAsyncChat() {
-        return this.useasyncchat;
-    }
 }

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

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

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

@@ -7,19 +7,11 @@
 
 package com.onarandombox.MultiverseCore.api;
 
-import buscript.Buscript;
 import com.fernferret.allpay.AllPay;
 import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import com.onarandombox.MultiverseCore.utils.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.onarandombox.MultiverseCore.utils.*;
 import com.pneumaticraft.commandhandler.CommandHandler;
-import net.milkbowl.vault.economy.Economy;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 
@@ -43,18 +35,9 @@ public interface Core {
      * 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.
@@ -145,28 +128,21 @@ 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();
 
     /**
@@ -246,11 +222,4 @@ public interface Core {
      * @return The configuration.
      */
     MultiverseCoreConfig getMVConfig();
-
-    /**
-     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
-     *
-     * @return The Multiverse buscript object.
-     */
-    Buscript getScriptAPI();
 }

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

@@ -60,16 +60,6 @@ public interface MVWorldManager {
     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
      * config and deletes the folder.
@@ -255,16 +245,4 @@ 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);
 }

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

@@ -133,16 +133,4 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      * @return enforceAccess.
      */
     boolean getEnforceAccess();
-
-    /**
-     * Sets useasyncchat.
-     * @param useAsyncChat The new value.
-     */
-    void setUseAsyncChat(boolean useAsyncChat);
-
-    /**
-     * Gets useasyncchat.
-     * @return useasyncchat.
-     */
-    boolean getUseAsyncChat();
 }

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

@@ -49,6 +49,7 @@ public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
         }
         this.setCore(theCore);
 
+        // Turn on Logging
         this.getServer().getLogger().info(String.format("%s - Version %s enabled - By %s",
                 this.getDescription().getName(), this.getDescription().getVersion(), getAuthors()));
         getDataFolder().mkdirs();
@@ -58,7 +59,7 @@ public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
+        debugLog = new DebugLog("Multiverse-Adventure", getDataFolder() + File.separator + "debug.log");
         debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
 
         this.onPluginEnable();

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

@@ -3,14 +3,14 @@ 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.
+     * Synchronizes the given world with it's settings.
      *
      * @param worlds A list of {@link MultiverseWorld}
      */
@@ -46,23 +46,4 @@ public interface WorldPurger {
     void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
             boolean negateMonsters, CommandSender sender);
 
-    /**
-     * Determines whether the specified creature should be killed.
-     *
-     * @param e The creature.
-     * @param thingsToKill A {@link List} of animals/monsters to be killed.
-     * @param negateAnimals Whether the monsters in the list should be negated.
-     * @param negateMonsters Whether the animals in the list should be negated.
-     * @return {@code true} if the creature should be killed, otherwise {@code false}.
-     */
-    boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters);
-
-    /**
-     * Determines whether the specified creature should be killed and automatically reads the params from a world object.
-     *
-     * @param w The world.
-     * @param e The creature.
-     * @return {@code true} if the creature should be killed, otherwise {@code false}.
-     */
-    boolean shouldWeKillThisCreature(MultiverseWorld w, Entity e);
 }

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

@@ -11,7 +11,6 @@ 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;
@@ -35,11 +34,7 @@ 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.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.setPermission("multiverse.core.anchor", "Allows management of Anchor Destinations.", PermissionDefault.OP);
         this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
     }
 
@@ -54,11 +49,6 @@ 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) {
@@ -115,14 +105,10 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
             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!");
+            if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
             } else {
-                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!");
-                }
+                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
             }
             return;
         }
@@ -132,16 +118,13 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
             return;
         }
 
-        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.create", true)) {
-            sender.sendMessage(ChatColor.RED + "You don't have the permission to create anchors!");
+        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 {
-            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!");
-            }
+            sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
         }
+
     }
 
     @Override

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

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import 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!");
-    }
-}

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

@@ -18,8 +18,6 @@ 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;
 
 /**
@@ -67,12 +65,7 @@ public class CreateCommand extends MultiverseCommand {
             }
         }
 
-        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()) {
+        if (worldFile.exists() || this.worldManager.isMVWorld(worldName)) {
             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;
@@ -95,19 +88,7 @@ public class CreateCommand extends MultiverseCommand {
             EnvironmentCommand.showWorldTypes(sender);
             return;
         }
-        // Determine if the generator is valid. #918
-        if (generator != null) {
-            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
-            if (genarray.size() < 2) {
-                // If there was only one arg specified, pad with another empty one.
-                genarray.add("");
-            }
-            if (this.worldManager.getChunkGenerator(genarray.get(0), genarray.get(1), "test") == null) {
-                // We have an invalid generator.
-                sender.sendMessage("Invalid generator! '" + generator + "'. " + ChatColor.RED + "Aborting world creation.");
-                return;
-            }
-        }
+
         Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
 
         if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {

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

@@ -48,8 +48,8 @@ public class DebugCommand extends MultiverseCommand {
                     sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
                             + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
                 }
+
             }
-            plugin.saveMVConfigs();
         }
         this.displayDebugMode(sender);
     }

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

@@ -53,8 +53,8 @@ public class EnvironmentCommand extends MultiverseCommand {
      */
     public static void showWorldTypes(CommandSender sender) {
         sender.sendMessage(ChatColor.YELLOW + "Valid World Types are:");
-        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT, %sLARGEBIOMES %sor %sVERSION_1_1",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
+        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT %sor %sVERSION_1_1",
+                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.GOLD));
     }
 
     @Override
@@ -75,9 +75,6 @@ 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!

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

@@ -124,13 +124,8 @@ public class InfoCommand extends MultiverseCommand {
         message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
         message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
         if (world.getPrice() > 0) {
-            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));
+            message.add(new FancyMessage("Price to enter this world: ",
+                    this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
         } else {
             message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
         }

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

@@ -85,9 +85,6 @@ public class ModifyAddCommand extends MultiverseCommand {
         if (world.addToVariable(property, value)) {
             sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA
                     + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
-            if (!plugin.saveWorldConfig()) {
-                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-            }
         } else {
             sender.sendMessage(value + " could not be added to " + property);
         }

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

@@ -80,9 +80,6 @@ public class ModifyClearCommand extends MultiverseCommand {
             sender.sendMessage(property + " was cleared. It contains 0 values now.");
             sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was "
                     + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now.");
-            if (!plugin.saveWorldConfig()) {
-                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-            }
         } else {
             sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
                     + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");

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

@@ -85,9 +85,6 @@ public class ModifyRemoveCommand extends MultiverseCommand {
         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);

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

@@ -111,9 +111,6 @@ public class ModifySetCommand extends MultiverseCommand {
             if (world.setPropertyValue(property, value)) {
                 sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
                         + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
-                if (!plugin.saveWorldConfig()) {
-                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-                }
             } else {
                 sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
             }

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

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import 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));
-    }
-}

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

@@ -15,6 +15,7 @@ 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;
@@ -51,15 +52,9 @@ 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()).append('\n');
+        buffer.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds().size()).append('\n');
         buffer.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
-        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] Economy being used: ").append(this.plugin.getBank().getEconUsed()).append('\n');
         buffer.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
         buffer.append("[Multiverse-Core] Dumping Config Values: (version ")
                 .append(this.plugin.getMVConfig().getVersion()).append(")").append('\n');

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

@@ -15,8 +15,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -52,14 +50,6 @@ public class WhoCommand extends MultiverseCommand {
             showAll = false;
         }
 
-        final Player[] onlinePlayers = plugin.getServer().getOnlinePlayers();
-        final Collection<Player> visiblePlayers = new HashSet<Player>(onlinePlayers.length);
-        for (final Player player : onlinePlayers) {
-            if (p == null || p.canSee(player)) {
-                visiblePlayers.add(player);
-            }
-        }
-
         if (args.size()  == 1) {
             if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
                 showAll = true;
@@ -78,19 +68,18 @@ public class WhoCommand extends MultiverseCommand {
 
                 sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
                         world.getColoredWorldString(), ChatColor.AQUA));
-                sender.sendMessage(this.buildPlayerString(world, p, visiblePlayers));
+                sender.sendMessage(buildPlayerString(world, p));
                 return;
             }
         }
 
         // multiworld mode
-        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
-                + visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
+        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players ---");
         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)));
+                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world, p)));
                     shownOne = true;
                 }
             }
@@ -101,18 +90,18 @@ public class WhoCommand extends MultiverseCommand {
         return;
     }
 
-    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
-        // Retrieve the players in this world
+    private static String buildPlayerString(MultiverseWorld world, Player viewer) {
         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(", ");
+        if (players.size() == 0) {
+            return "No players found.";
+        } else {
+            StringBuilder playerBuilder = new StringBuilder();
+            for (Player player : players) {
+                if ((viewer == null) || viewer.canSee(player))
+                        playerBuilder.append(player.getDisplayName()).append(", ");
+            }
+            String bString = playerBuilder.toString();
+            return bString.substring(0, bString.length() - 2);
         }
-        String bString = playerBuilder.toString();
-        return (bString.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
     }
 }

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

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

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

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

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

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

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

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.listeners;
-
-import 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));
-    }
-}

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

@@ -1,52 +0,0 @@
-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);
-        }
-    }
-}

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

@@ -11,8 +11,13 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.World;
+import org.bukkit.entity.Animals;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Ghast;
+import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Squid;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
@@ -21,12 +26,14 @@ 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;
 
@@ -80,8 +87,7 @@ public class MVEntityListener implements Listener {
     public void creatureSpawn(CreatureSpawnEvent event) {
         // Check to see if the Creature is spawned by a plugin, we don't want to prevent this behaviour.
         // TODO: Allow the egg thing to be a config param. Doubt this will be per world; seems silly.
-        if (event.getSpawnReason() == SpawnReason.CUSTOM || event.getSpawnReason() == SpawnReason.SPAWNER_EGG
-                || event.getSpawnReason() == SpawnReason.BREEDING) {
+        if (event.getSpawnReason() == SpawnReason.CUSTOM || event.getSpawnReason() == SpawnReason.SPAWNER_EGG) {
             return;
         }
 
@@ -94,6 +100,8 @@ public class MVEntityListener implements Listener {
             return;
 
         EntityType type = event.getEntityType();
+        MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
+
         /**
          * Handle people with non-standard animals: ie a patched craftbukkit.
          */
@@ -102,8 +110,43 @@ public class MVEntityListener implements Listener {
             return;
         }
 
-        MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
-        event.setCancelled(this.plugin.getMVWorldManager().getTheWorldPurger().shouldWeKillThisCreature(mvworld, event.getEntity()));
+        /**
+         * Animal Handling
+         */
+        if (!event.isCancelled() && (event.getEntity() instanceof Animals || event.getEntity() instanceof Squid)) {
+            event.setCancelled(shouldWeKillThisCreature(mvworld.getAnimalList(), mvworld.canAnimalsSpawn(), type.getName().toUpperCase()));
+        }
+        /**
+         * Monster Handling
+         */
+        if (!event.isCancelled() && (event.getEntity() instanceof Monster || event.getEntity() instanceof Ghast || event.getEntity() instanceof Slime)) {
+            event.setCancelled(shouldWeKillThisCreature(mvworld.getMonsterList(), mvworld.canMonstersSpawn(), type.getName().toUpperCase()));
+        }
+    }
+
+    private static boolean shouldWeKillThisCreature(List<String> creatureList, boolean allowCreatureSpawning, String creature) {
+        if (creatureList.isEmpty() && allowCreatureSpawning) {
+            // 1. There are no exceptions and animals are allowed. Save it.
+            return false;
+        } else if (creatureList.isEmpty()) {
+            // 2. There are no exceptions and animals are NOT allowed. Kill it.
+            return true;
+        } else if (creatureList.contains(creature.toUpperCase()) && allowCreatureSpawning) {
+            // 3. There ARE exceptions and animals ARE allowed. Kill it.
+            return true;
+        } else if (!creatureList.contains(creature.toUpperCase()) && allowCreatureSpawning) {
+            // 4. There ARE exceptions and animals ARE NOT allowed. SAVE it.
+            return false;
+        } else if (creatureList.contains(creature.toUpperCase()) && !allowCreatureSpawning) {
+            // 5. No animals are allowed to be spawned, BUT this one can stay...
+            return false;
+        } else if (!creatureList.contains(creature.toUpperCase()) && !allowCreatureSpawning) {
+            // 6. Animals are NOT allowed to spawn, and this creature is not in the save list... KILL IT
+            return true;
+        } else {
+            // This code should NEVER execute. I just left the verbose conditions in right now.
+            throw new UnsupportedOperationException();
+        }
     }
 
 }

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

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.listeners;
-
-import 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));
-    }
-}

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

@@ -7,7 +7,6 @@
 
 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;
@@ -22,37 +21,55 @@ 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 final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-    private final PermissionTools pt;
+    private MultiverseCore plugin;
+    private MVWorldManager worldManager;
+    private 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);
     }
-
     /**
-     * @return the playerWorld-map
+     * This method is called when a player wants to chat.
+     * @param event The Event that was fired.
      */
-    public Map<String, String> getPlayerWorld() {
-        return playerWorld;
+    @EventHandler
+    public void playerChat(PlayerChatEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+        // Check whether the Server is set to prefix the chat with the World name.
+        // If not we do nothing, if so we need to check if the World has an Alias.
+        if (plugin.getMVConfig().getPrefixChat()) {
+            String world = event.getPlayer().getWorld().getName();
+            String prefix = "";
+            // If we're not a MV world, don't do anything
+            if (!this.worldManager.isMVWorld(world)) {
+                return;
+            }
+            MultiverseWorld mvworld = this.worldManager.getMVWorld(world);
+            if (mvworld.isHidden()) {
+                return;
+            }
+            prefix = mvworld.getColoredWorldString();
+            String format = event.getFormat();
+            event.setFormat("[" + prefix + "]" + format);
+        }
     }
 
     /**
@@ -126,7 +143,6 @@ public class MVPlayerListener implements Listener {
         }
         // Handle the Players GameMode setting for the new world.
         this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
-        playerWorld.put(p.getName(), p.getWorld().getName());
     }
 
     /**
@@ -137,7 +153,6 @@ 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());
     }
 
     /**
@@ -285,7 +300,6 @@ public class MVPlayerListener implements Listener {
         // 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());
                 }
@@ -315,16 +329,19 @@ public class MVPlayerListener implements Listener {
         if (!this.pt.playerCanIgnoreGameModeRestriction(world, player)) {
             this.plugin.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin,
                 new Runnable() {
-                    @Override
                     public void run() {
                         // Check that the player is in the new world and they haven't been teleported elsewhere or the event cancelled.
                         if (player.getWorld() == world.getCBWorld()) {
-                            Logging.fine("Handling gamemode for player: %s, Changing to %s", player.getName(), world.getGameMode().toString());
-                            Logging.finest("From World: %s", player.getWorld());
-                            Logging.finest("To World: %s", world);
+                            MultiverseCore.staticLog(Level.FINE, "Handling gamemode for player: "
+                                    + player.getName() + ", Changing to " + world.getGameMode().toString());
+                            MultiverseCore.staticLog(Level.FINEST, "From World: " + player.getWorld());
+                            MultiverseCore.staticLog(Level.FINEST, "To World: " + world);
                             player.setGameMode(world.getGameMode());
                         } else {
-                           Logging.fine("The gamemode was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'", player.getName(), player.getWorld().getName(), world.getName());
+                            MultiverseCore.staticLog(Level.FINE, "The gamemode was NOT changed for player '"
+                                    + player.getName() + "' because he is now in world '"
+                                    + player.getWorld().getName() + "' instead of world '"
+                                    + world.getName() +"'");
                         }
                     }
                 }, 1L);

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

@@ -34,10 +34,6 @@ 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.getValidEconPlugins()).contains(event.getPlugin().getDescription().getName())) {
             this.plugin.setBank(this.plugin.getBanker().loadEconPlugin());
@@ -48,11 +44,6 @@ public class MVPluginListener implements Listener {
             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.");
-        }
         */
     }
 

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

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

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

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

src/main/java/com/onarandombox/MultiverseCore/plugins/destination/DynmapMarkerDestination.java

@@ -1,141 +0,0 @@
-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;
-    }
-}

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

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

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

@@ -7,13 +7,15 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
 
+import java.util.logging.Level;
+
 /**
  * Used to determine block/location-related facts.
  *
@@ -73,28 +75,28 @@ public class BlockSafety {
 
         if (this.isSolidBlock(world.getBlockAt(actual).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()));
+            MultiverseCore.staticLog(Level.FINER, "Error Here (Actual)? ("
+                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Error Here (upOne)? ("
+                + upOne.getBlock().getType() + ")[" + this.isSolidBlock(upOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            Logging.finer("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(),
-                    this.isSolidBlock(downOne.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "Error Here (downOne)? ("
+                + downOne.getBlock().getType() + ")[" + this.isSolidBlock(downOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.FIRE) {
-            Logging.finer("There's fire below! (%s)[%s]", actual.getBlock().getType(),
-                    this.isSolidBlock(actual.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "There's fire below! ("
+                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
             return false;
         }
 
         if (isBlockAboveAir(actual)) {
-            Logging.finer("Is block above air [%s]", isBlockAboveAir(actual));
-            Logging.finer("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
+            MultiverseCore.staticLog(Level.FINER, "Is block above air [" + isBlockAboveAir(actual) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Has 2 blocks of water below [" + this.hasTwoBlocksofWaterBelow(actual) + "]");
             return this.hasTwoBlocksofWaterBelow(actual);
         }
         return true;

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

@@ -79,11 +79,11 @@ public class DebugLog extends Logger {
      * @param msg the message.
      */
     @Override
-    public void log(final Level level, final String msg) {
+    public void log(Level level, 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);
+                standardLog.log(level, prefix + msg);
             }
 
             super.log(level, prefix + msg);

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

@@ -8,13 +8,6 @@
 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.
@@ -44,58 +37,4 @@ public class FileUtils {
             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;
-    }
 }

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

@@ -76,10 +76,6 @@ 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;
         }
@@ -168,10 +164,6 @@ public class MVPermissions implements PermissionsInterface {
                     "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)) {

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

@@ -143,40 +143,17 @@ public class PermissionTools {
             if (this.plugin.getMVPerms().hasPermission(teleporter, toWorld.getExemptPermission().getName(), true)) {
                 return true;
             }
-            final boolean usingVault;
-            final String formattedAmount;
-            if (toWorld.getCurrency() <= 0 && plugin.getVaultEconomy() != null) {
-                usingVault = true;
-                formattedAmount = plugin.getVaultEconomy().format(toWorld.getPrice());
-            } else {
-                usingVault = false;
-                formattedAmount = this.plugin.getBank().getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
-            }
-            String errString = "You need " + formattedAmount + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
+            GenericBank bank = plugin.getBank();
+            String errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency())
+                    + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
             if (teleportee.equals(teleporter)) {
-                errString = "You need " + formattedAmount + " to enter " + toWorld.getColoredWorldString();
+                errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency())
+                        + " to enter " + toWorld.getColoredWorldString();
             }
-            if (usingVault) {
-                if (!plugin.getVaultEconomy().has(teleporterPlayer.getName(), toWorld.getPrice())) {
-                    return false;
-                } else if (pay) {
-                    if (toWorld.getPrice() < 0D) {
-                        plugin.getVaultEconomy().depositPlayer(teleporterPlayer.getName(), toWorld.getPrice() * -1D);
-                    } else {
-                        plugin.getVaultEconomy().withdrawPlayer(teleporterPlayer.getName(), toWorld.getPrice());
-                    }
-                }
-            } else {
-                GenericBank bank = plugin.getBank();
-                if (!bank.hasEnough(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
-                    return false;
-                } else if (pay) {
-                    if (toWorld.getPrice() < 0D) {
-                        bank.give(teleporterPlayer, toWorld.getPrice() * -1D, toWorld.getCurrency());
-                    } else {
-                        bank.take(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
-                    }
-                }
+            if (!bank.hasEnough(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
+                return false;
+            } else if (pay) {
+                bank.give(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
             }
         }
         return true;

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

@@ -7,30 +7,23 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.Core;
+
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
-import org.bukkit.material.Bed;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import java.util.logging.Level;
 
 /**
  * The default-implementation of {@link BlockSafety}.
  */
 public class SimpleBlockSafety implements BlockSafety {
     private final Core plugin;
-    private final static Set<BlockFace> AROUND_BLOCK = new HashSet<BlockFace>(){{ add(BlockFace.NORTH); add(BlockFace.NORTH_EAST);
-            add(BlockFace.EAST); add(BlockFace.SOUTH_EAST);
-            add(BlockFace.SOUTH); add(BlockFace.SOUTH_WEST);
-            add(BlockFace.WEST); add(BlockFace.NORTH_WEST); }};
 
     public SimpleBlockSafety(Core plugin) {
         this.plugin = plugin;
@@ -74,88 +67,33 @@ public class SimpleBlockSafety implements BlockSafety {
 
         if (isSolidBlock(world.getBlockAt(actual).getType())
                 || isSolidBlock(upOne.getBlock().getType())) {
-            Logging.finer("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
-                    isSolidBlock(actual.getBlock().getType()));
-            Logging.finer("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
-                    isSolidBlock(upOne.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "Error Here (Actual)? ("
+                + actual.getBlock().getType() + ")[" + isSolidBlock(actual.getBlock().getType()) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Error Here (upOne)? ("
+                + upOne.getBlock().getType() + ")[" + isSolidBlock(upOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            Logging.finer("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(), isSolidBlock(downOne.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "Error Here (downOne)? ("
+                + downOne.getBlock().getType() + ")[" + isSolidBlock(downOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.FIRE) {
-            Logging.finer("There's fire below! (%s)[%s]", actual.getBlock().getType(), isSolidBlock(actual.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "There's fire below! ("
+                + actual.getBlock().getType() + ")[" + isSolidBlock(actual.getBlock().getType()) + "]");
             return false;
         }
 
         if (isBlockAboveAir(actual)) {
-            Logging.finer("Is block above air [%s]", isBlockAboveAir(actual));
-            Logging.finer("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
+            MultiverseCore.staticLog(Level.FINER, "Is block above air [" + isBlockAboveAir(actual) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Has 2 blocks of water below [" + this.hasTwoBlocksofWaterBelow(actual) + "]");
             return this.hasTwoBlocksofWaterBelow(actual);
         }
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location getSafeBedSpawn(Location l) {
-        // The passed location, may be null (if the bed is invalid)
-        if (l == null) {
-            return null;
-        }
-        final Location trySpawn = this.getSafeSpawnAroundABlock(l);
-        if (trySpawn != null) {
-            return trySpawn;
-        }
-        Location otherBlock = this.findOtherBedPiece(l);
-        if (otherBlock == null) {
-            return null;
-        }
-        // Now we have 2 locations, check around each, if the type is bed, skip it.
-        return this.getSafeSpawnAroundABlock(otherBlock);
-    }
-
-    /**
-     * Find a safe spawn around a location. (N,S,E,W,NE,NW,SE,SW)
-     * @param l Location to check around
-     * @return A safe location, or none if it wasn't found.
-     */
-    private Location getSafeSpawnAroundABlock(Location l) {
-        Iterator<BlockFace> checkblock = AROUND_BLOCK.iterator();
-        while(checkblock.hasNext()) {
-            final BlockFace face = checkblock.next();
-            if (this.playerCanSpawnHereSafely(l.getBlock().getRelative(face).getLocation())) {
-                // Don't forget to center the player.
-                return l.getBlock().getRelative(face).getLocation().add(.5, 0, .5);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Find the other bed block.
-     * @param checkLoc The location to check for the other piece at
-     * @return The location of the other bed piece, or null if it was a jacked up bed.
-     */
-    private Location findOtherBedPiece(Location checkLoc) {
-        if (checkLoc.getBlock().getType() != Material.BED_BLOCK) {
-            return null;
-        }
-        // Construct a bed object at this location
-        final Bed b = new Bed(Material.BED_BLOCK, checkLoc.getBlock().getData());
-        if (b.isHeadOfBed()) {
-            return checkLoc.getBlock().getRelative(b.getFacing().getOppositeFace()).getLocation();
-        }
-        // We shouldn't ever be looking at the foot, but here's the code for it.
-        return checkLoc.getBlock().getRelative(b.getFacing()).getLocation();
-    }
-
-
     /**
      * {@inheritDoc}
      */

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

@@ -62,16 +62,6 @@ public class SimpleWorldPurger implements WorldPurger {
         purgeWorld(world, allMobs, !world.canAnimalsSpawn(), !world.canMonstersSpawn());
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean shouldWeKillThisCreature(MultiverseWorld world, Entity e) {
-        ArrayList<String> allMobs = new ArrayList<String>(world.getAnimalList());
-        allMobs.addAll(world.getMonsterList());
-        return this.shouldWeKillThisCreature(e, allMobs, !world.canAnimalsSpawn(), !world.canMonstersSpawn());
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -90,9 +80,49 @@ public class SimpleWorldPurger implements WorldPurger {
         boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
         boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
         for (Entity e : world.getEntities()) {
-            if (killDecision(e, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters)) {
+            boolean negate = false;
+            boolean specified = false;
+            if (e instanceof Squid || e instanceof Animals) {
+                // it's an animal
+                if (specifiedAnimals && !negateAnimals) {
+                    this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all animals: " + e);
+                    e.remove();
+                    entitiesKilled++;
+                    continue;
+                }
+                if (specifiedAnimals)
+                    specified = true;
+                negate = negateAnimals;
+            } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
+                // it's a monster
+                if (specifiedMonsters && !negateMonsters) {
+                    this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all monsters: " + e);
+                    e.remove();
+                    entitiesKilled++;
+                    continue;
+                }
+                if (specifiedMonsters)
+                    specified = true;
+                negate = negateMonsters;
+            }
+            for (String s : thingsToKill) {
+                EntityType type = EntityType.fromName(s);
+                if (type != null && type.equals(e.getType())) {
+                    specified = true;
+                    if (!negate) {
+                        this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e);
+                        e.remove();
+                        entitiesKilled++;
+                        continue;
+                    }
+                    break;
+                }
+            }
+            if (!specified && negate) {
+                this.plugin.log(Level.FINEST, "Removing an entity because it was NOT specified and we ARE negating: " + e);
                 e.remove();
                 entitiesKilled++;
+                continue;
             }
         }
         if (sender != null) {
@@ -100,59 +130,6 @@ public class SimpleWorldPurger implements WorldPurger {
         }
     }
 
-    private boolean killDecision(Entity e, List<String> thingsToKill, boolean negateAnimals,
-            boolean negateMonsters, boolean specifiedAnimals, boolean specifiedMonsters) {
-        boolean negate = false;
-        boolean specified = false;
-        if (e instanceof Squid || e instanceof Animals) {
-            // it's an animal
-            if (specifiedAnimals && !negateAnimals) {
-                this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all animals: " + e);
-                return true;
-            }
-            if (specifiedAnimals)
-                specified = true;
-            negate = negateAnimals;
-        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
-            // it's a monster
-            if (specifiedMonsters && !negateMonsters) {
-                this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all monsters: " + e);
-                return true;
-            }
-            if (specifiedMonsters)
-                specified = true;
-            negate = negateMonsters;
-        }
-        for (String s : thingsToKill) {
-            EntityType type = EntityType.fromName(s);
-            if (type != null && type.equals(e.getType())) {
-                specified = true;
-                if (!negate) {
-                    this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e);
-                    return true;
-                }
-                break;
-            }
-        }
-        if (!specified && negate) {
-            this.plugin.log(Level.FINEST, "Removing an entity because it was NOT specified and we ARE negating: " + e);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters) {
-        boolean specifiedAll = thingsToKill.contains("ALL");
-        boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
-        boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
-        return this.killDecision(e, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters);
-    }
-
     /**
      * {@inheritDoc}
      */

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

@@ -14,8 +14,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
 import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import org.bukkit.Location;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldCreator;
@@ -37,21 +36,18 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Public facing API to add/remove Multiverse worlds.
  */
 public class WorldManager implements MVWorldManager {
-    private final MultiverseCore plugin;
-    private final WorldPurger worldPurger;
-    private final Map<String, MultiverseWorld> worlds;
+    private MultiverseCore plugin;
+    private WorldPurger worldPurger;
     private Map<String, MVWorld> worldsFromTheConfig;
+    private Map<String, MultiverseWorld> worlds;
     private FileConfiguration configWorlds = null;
     private Map<String, String> defaultGens;
     private String firstSpawn;
@@ -59,7 +55,7 @@ public class WorldManager implements MVWorldManager {
     public WorldManager(MultiverseCore core) {
         this.plugin = core;
         this.worldsFromTheConfig = new HashMap<String, MVWorld>();
-        this.worlds = new ConcurrentHashMap<String, MultiverseWorld>();
+        this.worlds = new HashMap<String, MultiverseWorld>();
         this.worldPurger = new SimpleWorldPurger(plugin);
     }
 
@@ -88,87 +84,6 @@ public class WorldManager implements MVWorldManager {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean cloneWorld(String oldName, String newName, String generator) {
-        // Make sure we don't already know about the new world.
-        if (this.isMVWorld(newName)) {
-            return false;
-        }
-        // Make sure the old world is actually a world!
-        if (this.getUnloadedWorlds().contains(oldName) || !this.isMVWorld(oldName)) {
-            return false;
-        }
-
-        final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
-        final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
-
-        // Make sure the new world doesn't exist outside of multiverse.
-        if (newWorldFile.exists()) {
-            return false;
-        }
-
-        unloadWorld(oldName);
-
-        removePlayersFromWorld(oldName);
-
-        StringBuilder builder = new StringBuilder();
-        builder.append("Copying data for world '").append(oldName).append("'...");
-        this.plugin.log(Level.INFO, builder.toString());
-        try {
-            Thread t = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    FileUtils.copyFolder(oldWorldFile, newWorldFile, Logger.getLogger("Minecraft"));
-                }
-            });
-            t.start();
-            try {
-                t.join();
-            } catch (InterruptedException e) {
-                // do nothing
-            }
-            File uidFile = new File(newWorldFile, "uid.dat");
-            uidFile.delete();
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return false;
-        }
-        this.plugin.log(Level.INFO, "Kind of copied stuff");
-
-        WorldCreator worldCreator = new WorldCreator(newName);
-        this.plugin.log(Level.INFO, "Started to copy settings");
-        worldCreator.copy(this.getMVWorld(oldName).getCBWorld());
-        this.plugin.log(Level.INFO, "Copied lots of settings");
-
-        boolean useSpawnAdjust = this.getMVWorld(oldName).getAdjustSpawn();
-        this.plugin.log(Level.INFO, "Copied more settings");
-
-        Environment environment = worldCreator.environment();
-        this.plugin.log(Level.INFO, "Copied most settings");
-        if (newWorldFile.exists()) {
-            this.plugin.log(Level.INFO, "Succeeded at copying stuff");
-            if (this.addWorld(newName, environment, null, null, null, generator, useSpawnAdjust)) {
-                // getMVWorld() doesn't actually return an MVWorld
-                this.plugin.log(Level.INFO, "Succeeded at importing stuff");
-                MVWorld newWorld = (MVWorld) this.getMVWorld(newName);
-                MVWorld oldWorld = (MVWorld) this.getMVWorld(oldName);
-                newWorld.copyValues(oldWorld);
-                try {
-                    // don't keep the alias the same -- that would be useless
-                    newWorld.setPropertyValue("alias", newName);
-                } catch (PropertyDoesNotExistException e) {
-                    // this should never happen
-                    throw new RuntimeException(e);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -223,7 +138,7 @@ public class WorldManager implements MVWorldManager {
         }
         this.plugin.log(Level.INFO, builder.toString());
 
-        if (!doLoad(c, true)) {
+        if (!doLoad(c)) {
             this.plugin.log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
             return false;
         }
@@ -323,8 +238,6 @@ public class WorldManager implements MVWorldManager {
             this.plugin.log(Level.WARNING, "Hmm Multiverse does not know about this world but it's loaded in memory.");
             this.plugin.log(Level.WARNING, "To let Multiverse know about it, use:");
             this.plugin.log(Level.WARNING, String.format("/mv import %s %s", name, this.plugin.getServer().getWorld(name).getEnvironment().toString()));
-        } else if (this.worldsFromTheConfig.containsKey(name)) {
-            return true; // it's already unloaded
         } else {
             this.plugin.log(Level.INFO, "Multiverse does not know about " + name + " and it's not loaded by Bukkit.");
         }
@@ -356,10 +269,6 @@ public class WorldManager implements MVWorldManager {
     }
 
     private boolean doLoad(String name) {
-        return doLoad(name, false);
-    }
-
-    private boolean doLoad(String name, boolean ignoreExists) {
         if (!worldsFromTheConfig.containsKey(name))
             throw new IllegalArgumentException("That world doesn't exist!");
 
@@ -370,30 +279,25 @@ public class WorldManager implements MVWorldManager {
         if ((world.getGenerator() != null) && (!world.getGenerator().equals("null")))
             creator.generator(world.getGenerator());
 
-        return doLoad(creator, ignoreExists);
+        return doLoad(creator);
     }
 
-    private boolean doLoad(WorldCreator creator, boolean ignoreExists) {
+    private boolean doLoad(WorldCreator creator) {
         String worldName = creator.name();
         if (!worldsFromTheConfig.containsKey(worldName))
             throw new IllegalArgumentException("That world doesn't exist!");
         if (worlds.containsKey(worldName))
             throw new IllegalArgumentException("That world is already loaded!");
-
-        if (!ignoreExists && !new File(this.plugin.getServer().getWorldContainer(), worldName).exists()) {
-            this.plugin.log(Level.WARNING, "WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
-            this.plugin.log(Level.WARNING, "Use '/mv remove' to remove it from the config!");
-            return false;
-        }
-
         MVWorld mvworld = worldsFromTheConfig.get(worldName);
-        World cbworld;
-        try {
-            cbworld = creator.createWorld();
-        } catch (Exception e) {
-            e.printStackTrace();
-            brokenWorld(worldName);
-            return false;
+        World cbworld = Bukkit.getWorld(worldName);
+        if (cbworld == null) {
+            try {
+                cbworld = creator.createWorld();
+            } catch (Exception e) {
+                e.printStackTrace();
+                brokenWorld(worldName);
+                return false;
+            }
         }
         mvworld.init(cbworld, plugin);
         this.worldPurger.purgeWorld(mvworld);
@@ -502,12 +406,8 @@ public class WorldManager implements MVWorldManager {
      */
     @Override
     public MultiverseWorld getMVWorld(String name) {
-        if (name == null) {
-            return null;
-        }
-        MultiverseWorld world = this.worlds.get(name);
-        if (world != null) {
-            return world;
+        if (this.worlds.containsKey(name)) {
+            return this.worlds.get(name);
         }
         return this.getMVWorldByAlias(name);
     }
@@ -542,7 +442,7 @@ public class WorldManager implements MVWorldManager {
      * {@inheritDoc}
      */
     @Override
-    public boolean isMVWorld(final String name) {
+    public boolean isMVWorld(String name) {
         return (this.worlds.containsKey(name) || isMVWorldAlias(name));
     }
 
@@ -560,7 +460,7 @@ public class WorldManager implements MVWorldManager {
      * @param alias The alias of the world to check.
      * @return True if the world exists, false if not.
      */
-    private boolean isMVWorldAlias(final String alias) {
+    private boolean isMVWorldAlias(String alias) {
         for (MultiverseWorld w : this.worlds.values()) {
             if (w.getAlias().equalsIgnoreCase(alias)) {
                 return true;
@@ -630,9 +530,8 @@ public class WorldManager implements MVWorldManager {
         }
 
         for (Map.Entry<String, MVWorld> entry : worldsFromTheConfig.entrySet()) {
-            if (worlds.containsKey(entry.getKey())) {
+            if (worlds.containsKey(entry.getKey()))
                 continue;
-            }
             if (!entry.getValue().getAutoLoad())
                 continue;
 
@@ -696,24 +595,19 @@ public class WorldManager implements MVWorldManager {
             Object obj = this.configWorlds.get(path);
             if ((obj != null) && (obj instanceof MVWorld)) {
                 String worldName = key.replaceAll(String.valueOf(SEPARATOR), ".");
-                MVWorld mvWorld = null;
                 if (this.worldsFromTheConfig.containsKey(worldName)) {
                     // Object-Recycling :D
-                    // TODO Why is is checking worldsFromTheConfig and then getting from worlds?  So confused... (DTM)
-                    mvWorld = (MVWorld) this.worlds.get(worldName);
-                    if (mvWorld != null) {
-                        mvWorld.copyValues((MVWorld) obj);
-                    }
-                }
-                if (mvWorld == null) {
+                    MVWorld oldMVWorld = (MVWorld) this.worlds.get(worldName);
+                    oldMVWorld.copyValues((MVWorld) obj);
+                    newWorldsFromTheConfig.put(worldName, oldMVWorld);
+                } else {
                     // we have to use a new one
                     World cbworld = this.plugin.getServer().getWorld(worldName);
-                    mvWorld = (MVWorld) obj;
-                    if (cbworld != null) {
-                        mvWorld.init(cbworld, this.plugin);
-                    }
+                    MVWorld mvworld = (MVWorld) obj;
+                    if (cbworld != null)
+                        mvworld.init(cbworld, this.plugin);
+                    newWorldsFromTheConfig.put(worldName, mvworld);
                 }
-                newWorldsFromTheConfig.put(worldName, mvWorld);
             } else if (this.configWorlds.isConfigurationSection(path)) {
                 ConfigurationSection section = this.configWorlds.getConfigurationSection(path);
                 Set<String> subkeys = section.getKeys(false);
@@ -764,46 +658,6 @@ public class WorldManager implements MVWorldManager {
         return allNames;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed) {
-        MultiverseWorld world = this.getMVWorld(name);
-        if (world == null)
-            return false;
-
-        List<Player> ps = world.getCBWorld().getPlayers();
-
-        if (useNewSeed) {
-            long theSeed;
-
-            if (randomSeed) {
-                theSeed = new Random().nextLong();
-            } else {
-                try {
-                    theSeed = Long.parseLong(seed);
-                } catch (NumberFormatException e) {
-                    theSeed = seed.hashCode();
-                }
-            }
-
-            world.setSeed(theSeed);
-        }
-
-        if (this.deleteWorld(name, false)) {
-            this.doLoad(name, true);
-            SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-            Location newSpawn = world.getSpawnLocation();
-            // Send all players that were in the old world, BACK to it!
-            for (Player p : ps) {
-                teleporter.safelyTeleport(null, p, newSpawn, true);
-            }
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Gets the {@link FileConfiguration} that this {@link WorldManager} is using.
      * @return The {@link FileConfiguration} that this {@link WorldManager} is using.

src/main/resources/plugin.yml

@@ -202,12 +202,3 @@ commands:
     description: Regenerates a world Multiverse already knows about.
     usage: |
             /<command> {WORLD}
-  mvscript:
-    description: Runs a script from the Multiverse scripts directory.
-    usage: |
-            /<command> {script} [target]
-  mvclone:
-    description: World clone command
-    usage: |
-            /<command> <world> <environment>
-            /<command> creative grieftastic -- Creates a world called 'grieftastic' exactly identical to the world 'creative'.

src/test/java/com/onarandombox/MultiverseCore/test/TestEntitySpawnRules.java

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

src/test/java/com/onarandombox/MultiverseCore/test/TestWorldCreation.java

@@ -0,0 +1,91 @@
+package com.onarandombox.MultiverseCore.test;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
+import com.onarandombox.MultiverseCore.utils.WorldManager;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.internal.verification.VerificationModeFactory;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.lang.reflect.Field;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class  })
+public class TestWorldCreation {
+
+    private TestInstanceCreator creator;
+    private MultiverseCore core;
+    private CommandSender mockCommandSender;
+
+    @Before
+    public void setUp() throws Exception {
+        this.creator = new TestInstanceCreator();
+        assertTrue(this.creator.setUp());
+        this.core = this.creator.getCore();
+        this.mockCommandSender = this.creator.getCommandSender();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        creator.tearDown();
+    }
+
+    @Test
+    @Ignore
+    public void test() {
+        // Initialize a fake command
+        Command mockCommand = mock(Command.class);
+        when(mockCommand.getName()).thenReturn("mv");
+
+        // Try to create a world that exists
+        String[] normalArgs = new String[] { "create", "world", "normal" };
+        core.onCommand(mockCommandSender, mockCommand, "", normalArgs);
+        verify(mockCommandSender).sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
+        verify(mockCommandSender).sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
+
+        // Try to create a world that is new
+        String[] newArgs = new String[] { "create", "world2", "normal" };
+        core.onCommand(mockCommandSender, mockCommand, "", newArgs);
+        verify(mockCommandSender).sendMessage("Starting creation of world 'world2'...");
+
+        String[] dottedWorld = new String[] { "create", "fish.world", "normal" };
+        core.onCommand(mockCommandSender, mockCommand, "", dottedWorld);
+        verify(mockCommandSender).sendMessage("Starting creation of world 'fish.world'...");
+        verify(mockCommandSender, VerificationModeFactory.times(2)).sendMessage("Complete!");
+
+        // Grab the Config
+        Field worldConfigField = null;
+        ConfigurationSection worldsSection = null;
+        try {
+            worldConfigField = WorldManager.class.getDeclaredField("configWorlds");
+            worldConfigField.setAccessible(true);
+            Configuration rootConfig = (Configuration) worldConfigField.get(this.core.getMVWorldManager());
+            worldsSection = rootConfig.getConfigurationSection("worlds");
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        // Verify that the world was added to the configs
+        // TODO: Expand this.
+        assertNotNull(worldsSection);
+        assertEquals(2, worldsSection.getKeys(false).size());
+        assertTrue(worldsSection.getKeys(false).contains("world2"));
+        assertTrue(worldsSection.getKeys(false).contains("fish.world"));
+    }
+}

src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java

@@ -7,14 +7,12 @@
 
 package com.onarandombox.MultiverseCore.test;
 
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
-import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
@@ -29,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.weather.ThunderChangeEvent;
@@ -46,16 +44,17 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.io.File;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.*;
+import com.onarandombox.MultiverseCore.MVWorld;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
+import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
+import com.onarandombox.MultiverseCore.utils.WorldManager;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ PluginManager.class, MultiverseCore.class, Permission.class, Bukkit.class,
-        WeatherChangeEvent.class, ThunderChangeEvent.class, AsyncPlayerChatEvent.class,
+        WeatherChangeEvent.class, ThunderChangeEvent.class, PlayerChatEvent.class,
         PlayerJoinEvent.class, PlayerRespawnEvent.class, EntityRegainHealthEvent.class,
         FoodLevelChangeEvent.class, WorldManager.class, PluginDescriptionFile.class })
 public class TestWorldProperties {
@@ -69,7 +68,7 @@ public class TestWorldProperties {
     private ThunderChangeEvent thunderChangeOffEvent;
     private ThunderChangeEvent thunderChangeOnEvent;
     private Player mockPlayer;
-    private AsyncPlayerChatEvent playerChatEvent;
+    private PlayerChatEvent playerChatEvent;
     private Player mockNewPlayer;
     private PlayerJoinEvent playerNewJoinEvent;
     private PlayerJoinEvent playerJoinEvent;
@@ -168,10 +167,10 @@ public class TestWorldProperties {
 
         // call player chat event
         core.getMVConfig().setPrefixChat(true);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getPlayerListener().playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getPlayerListener().playerChat(playerChatEvent);
         verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
 
         // call player join events
@@ -262,15 +261,15 @@ public class TestWorldProperties {
 
         // call player chat event
         core.getMVConfig().setPrefixChat(true);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getPlayerListener().playerChat(playerChatEvent);
         // never because it's hidden!
         verify(playerChatEvent, never()).setFormat(
                 "[" + mvWorld.getColoredWorldString() + "]" + "format");
         mvWorld.setHidden(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getPlayerListener().playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getPlayerListener().playerChat(playerChatEvent);
         verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
         mvWorld.setHidden(true); // reset hidden-state
 
@@ -345,8 +344,7 @@ public class TestWorldProperties {
         when(mockPlayer.getWorld()).thenReturn(mvWorld.getCBWorld());
         when(mockPlayer.hasPlayedBefore()).thenReturn(true);
         when(mockPlayer.hasPermission("multiverse.access.world")).thenReturn(true);
-        when(mockPlayer.getName()).thenReturn("MultiverseMan");
-        playerChatEvent = PowerMockito.mock(AsyncPlayerChatEvent.class);
+        playerChatEvent = PowerMockito.mock(PlayerChatEvent.class);
         when(playerChatEvent.getPlayer()).thenReturn(mockPlayer);
         when(playerChatEvent.getFormat()).thenReturn("format");
         // player join

src/test/java/com/onarandombox/MultiverseCore/test/TestWorldStuff.java

@@ -168,35 +168,6 @@ public class TestWorldStuff {
         verify(mockServer).createWorld(Matchers.argThat(matcher));
     }
 
-    @Test
-    public void testWorldCreateInvalidGenerator() {
-        // Pull a core instance from the server.
-        Plugin plugin = mockServer.getPluginManager().getPlugin("Multiverse-Core");
-
-        // Make sure Core is not null
-        assertNotNull(plugin);
-
-        // Make sure Core is enabled
-        assertTrue(plugin.isEnabled());
-
-        // Initialize a fake command
-        Command mockCommand = mock(Command.class);
-        when(mockCommand.getName()).thenReturn("mv");
-
-        // Ensure that there are no worlds imported. This is a fresh setup.
-        assertEquals(0, creator.getCore().getMVWorldManager().getMVWorlds().size());
-
-        // Create the world
-        String[] normalArgs = new String[]{ "create", "newworld", "normal", "-g", "BogusGen"};
-        plugin.onCommand(mockCommandSender, mockCommand, "", normalArgs);
-
-        // This command should halt, not creating any worlds
-        assertEquals(0, creator.getCore().getMVWorldManager().getMVWorlds().size());
-
-        // Verify
-        verify(mockCommandSender).sendMessage("Invalid generator! 'BogusGen'. " + ChatColor.RED + "Aborting world creation.");
-    }
-
     @Test
     public void testNullWorld() {
         // Pull a core instance from the server.

src/test/java/com/onarandombox/MultiverseCore/test/utils/MockWorldFactory.java

@@ -39,7 +39,6 @@ public class MockWorldFactory {
 
     private static void registerWorld(World world) {
         createdWorlds.put(world.getName(), world);
-        new File(TestInstanceCreator.worldsDirectory, world.getName()).mkdir();
     }
 
     private static World basics(String world, World.Environment env, WorldType type) {
@@ -214,8 +213,6 @@ public class MockWorldFactory {
     }
 
     public static void clearWorlds() {
-        for (String name : createdWorlds.keySet())
-            new File(TestInstanceCreator.worldsDirectory, name).delete();
         createdWorlds.clear();
     }
 }

src/test/java/com/onarandombox/MultiverseCore/test/utils/TestInstanceCreator.java

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.test.utils;
 
-import buscript.Buscript;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
@@ -61,12 +60,6 @@ public class TestInstanceCreator {
             MockGateway.MOCK_STANDARD_METHODS = false;
 
             core = PowerMockito.spy(new MultiverseCore());
-            PowerMockito.doAnswer(new Answer<Void>() {
-                @Override
-                public Void answer(InvocationOnMock invocation) throws Throwable {
-                    return null; // don't run metrics in tests
-                }
-            }).when(core, "setupMetrics");
 
             // Let's let all MV files go to bin/test
             doReturn(pluginDirectory).when(core).getDataFolder();
@@ -87,8 +80,6 @@ public class TestInstanceCreator {
             when(mockPluginManager.getPlugins()).thenReturn(plugins);
             when(mockPluginManager.getPlugin("Multiverse-Core")).thenReturn(core);
             when(mockPluginManager.getPermission(anyString())).thenReturn(null);
-            // Tell Buscript Vault is not available.
-            when(mockPluginManager.getPermission("Vault")).thenReturn(null);
 
             // Make some fake folders to fool the fake MV into thinking these worlds exist
             File worldNormalFile = new File(core.getServerFolder(), "world");
@@ -187,13 +178,6 @@ public class TestInstanceCreator {
             serverfield.setAccessible(true);
             serverfield.set(core, mockServer);
 
-            // Set buscript
-            Buscript buscript = PowerMockito.spy(new Buscript(core));
-            Field buscriptfield = MultiverseCore.class.getDeclaredField("buscript");
-            buscriptfield.setAccessible(true);
-            buscriptfield.set(core, buscript);
-            when(buscript.getPlugin()).thenReturn(core);
-
             // Set worldManager
             WorldManager wm = PowerMockito.spy(new WorldManager(core));
             Field worldmanagerfield = MultiverseCore.class.getDeclaredField("worldManager");