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

Co-authored-by: montlikadani <montlikada@gmail.com>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>4.2.3-SNAPSHOT</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
@@ -319,7 +319,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
+            <version>1.7</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>

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

@@ -214,7 +214,7 @@ public class MVWorld implements MultiverseWorld {
         public Double validateChange(String property, Double newValue, Double oldValue,
                 MVWorld object) throws ChangeDeniedException {
             if (newValue <= 0) {
-                Logging.fine("Someone tried to set a scale <= 0, aborting!");
+                plugin.log(Level.FINE, "Someone tried to set a scale <= 0, aborting!");
                 throw new ChangeDeniedException();
             }
             return super.validateChange(property, newValue, oldValue, object);
@@ -297,7 +297,7 @@ public class MVWorld implements MultiverseWorld {
         public GameMode validateChange(String property, GameMode newValue, GameMode oldValue,
                 MVWorld object) throws ChangeDeniedException {
             for (Player p : plugin.getServer().getWorld(getName()).getPlayers()) {
-                Logging.finer(String.format("Setting %s's GameMode to %s",
+                plugin.log(Level.FINER, String.format("Setting %s's GameMode to %s",
                         p.getName(), newValue.toString()));
                 plugin.getPlayerListener().handleGameModeAndFlight(p, MVWorld.this);
             }
@@ -319,16 +319,16 @@ public class MVWorld implements MultiverseWorld {
                 // verify that the location is safe
                 if (!bs.playerCanSpawnHereSafely(newValue)) {
                     // it's not ==> find a better one!
-                    Logging.warning(String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
-                    Logging.warning("Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
-                    Logging.warning("New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    plugin.log(Level.WARNING, String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
+                    plugin.log(Level.WARNING, "Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
+                    plugin.log(Level.WARNING, "New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                     SafeTTeleporter teleporter = plugin.getSafeTTeleporter();
                     newValue = teleporter.getSafeLocation(newValue, SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
                     if (newValue == null) {
-                        Logging.warning("Couldn't fix the location. I have to abort the spawn location-change :/");
+                        plugin.log(Level.WARNING, "Couldn't fix the location. I have to abort the spawn location-change :/");
                         throw new ChangeDeniedException();
                     }
-                    Logging.warning("New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    plugin.log(Level.WARNING, "New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                 }
             }
             return super.validateChange(property, newValue, oldValue, object);
@@ -411,7 +411,7 @@ public class MVWorld implements MultiverseWorld {
             // Add limit bypass to it's parent
             this.limitbypassperm.addParent("mv.bypass.playerlimit.*", true);
         } catch (IllegalArgumentException e) {
-            Logging.finer("Permissions nodes were already added for " + this.name);
+            this.plugin.log(Level.FINER, "Permissions nodes were already added for " + this.name);
         }
     }
 
@@ -422,16 +422,16 @@ public class MVWorld implements MultiverseWorld {
         // Verify that location was safe
         if (!bs.playerCanSpawnHereSafely(location)) {
             if (!this.getAdjustSpawn()) {
-                Logging.fine("Spawn location from world.dat file was unsafe!!");
-                Logging.fine("NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
-                Logging.fine("To turn on spawn adjustment for this world simply type:");
-                Logging.fine("/mvm set adjustspawn true " + this.getAlias());
+                this.plugin.log(Level.FINE, "Spawn location from world.dat file was unsafe!!");
+                this.plugin.log(Level.FINE, "NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
+                this.plugin.log(Level.FINE, "To turn on spawn adjustment for this world simply type:");
+                this.plugin.log(Level.FINE, "/mvm set adjustspawn true " + this.getAlias());
                 return location;
             }
             // If it's not, find a better one.
             SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-            Logging.warning("Spawn location from world.dat file was unsafe. Adjusting...");
-            Logging.warning("Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
+            this.plugin.log(Level.WARNING, "Spawn location from world.dat file was unsafe. Adjusting...");
+            this.plugin.log(Level.WARNING, "Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
             Location newSpawn = teleporter.getSafeLocation(location,
                     SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
             // I think we could also do this, as I think this is what Notch does.
@@ -450,7 +450,7 @@ public class MVWorld implements MultiverseWorld {
                             this.getName(), plugin.getLocationManipulation().locationToString(newerSpawn));
                     return newerSpawn;
                 } else {
-                    Logging.severe("Safe spawn NOT found!!!");
+                    this.plugin.log(Level.SEVERE, "Safe spawn NOT found!!!");
                 }
             }
         }

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

@@ -77,9 +77,11 @@ import com.onarandombox.MultiverseCore.destination.PlayerDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
+import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
 import com.onarandombox.MultiverseCore.listeners.MVMapListener;
+import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
 import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
@@ -218,7 +220,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     private final MVWeatherListener weatherListener = new MVWeatherListener(this);
     private final MVPortalListener portalListener = new MVPortalListener(this);
     private final MVWorldListener worldListener = new MVWorldListener(this);
-    private MVChatListener chatListener = new MVChatListener(this, this.playerListener);
+    private MVChatListener chatListener;
 
     // HashMap to contain information relating to the Players.
     private HashMap<String, MVPlayerSession> playerSessions;
@@ -304,7 +306,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.worldManager.loadDefaultWorlds();
             this.worldManager.loadWorlds(true);
         } else {
-            Logging.severe("Your configs were not loaded. Very little will function in Multiverse.");
+            this.log(Level.SEVERE, "Your configs were not loaded. Very little will function in Multiverse.");
         }
         this.anchorManager.loadAnchors();
 
@@ -316,6 +318,17 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             // 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);
 
         this.initializeBuscript();
@@ -367,11 +380,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     private void registerEvents() {
         PluginManager pm = getServer().getPluginManager();
         pm.registerEvents(this.playerListener, this);
-        pm.registerEvents(this.chatListener, this);
         pm.registerEvents(this.entityListener, this);
         pm.registerEvents(this.weatherListener, this);
         pm.registerEvents(this.portalListener, this);
-        Logging.info(ChatColor.GREEN + "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do and performance impact is negligible. It is safe to ignore.");
+        log(Level.INFO, ChatColor.GREEN + "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do and performance impact is negligible. It is safe to ignore.");
         pm.registerEvents(this.worldListener, this);
         pm.registerEvents(new MVMapListener(this), this);
     }
@@ -490,13 +502,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         try {
             wconf.load(worldsFile);
         } catch (IOException e) {
-            Logging.warning("Cannot load worlds.yml");
+            log(Level.WARNING, "Cannot load worlds.yml");
         } catch (InvalidConfigurationException e) {
-            Logging.warning("Your worlds.yml is invalid!");
+            log(Level.WARNING, "Your worlds.yml is invalid!");
         }
 
         if (!wconf.isConfigurationSection("worlds")) { // empty config
-            Logging.fine("No worlds to migrate!");
+            this.log(Level.FINE, "No worlds to migrate!");
             return;
         }
 
@@ -509,7 +521,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 // fine
                 newValues.put(entry.getKey(), entry.getValue());
             } else if (entry.getValue() instanceof ConfigurationSection) {
-                Logging.fine("Migrating: " + entry.getKey());
+                this.log(Level.FINE, "Migrating: " + entry.getKey());
                 // we have to migrate this
                 WorldProperties world = new WorldProperties(Collections.EMPTY_MAP);
                 ConfigurationSection section = (ConfigurationSection) entry.getValue();
@@ -675,8 +687,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                     try {
                         difficulty = Difficulty.valueOf(section.getString("difficulty").toUpperCase());
                     } catch (IllegalArgumentException e) {
-                        Logging.warning("Could not parse difficulty: " + section.getString("difficulty"));
-                        Logging.warning("Setting world " + entry.getKey() + " difficulty to NORMAL");
+                        this.log(Level.WARNING, "Could not parse difficulty: " + section.getString("difficulty"));
+                        this.log(Level.WARNING, "Setting world " + entry.getKey() + " difficulty to NORMAL");
                         difficulty = Difficulty.NORMAL;
                     }
                     if (difficulty != null) {
@@ -693,7 +705,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 wasChanged = true;
             } else {
                 // huh?
-                Logging.warning("Removing unknown entry in the config: " + entry);
+                this.log(Level.WARNING, "Removing unknown entry in the config: " + entry);
                 // just don't add to newValues
                 wasChanged = true;
             }
@@ -827,12 +839,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     /**
      * {@inheritDoc}
-     *
-     * @deprecated This is now deprecated, nobody needs it any longer.
-     * All logging is now done with {@link Logging}.
      */
     @Override
-    @Deprecated
     public void log(Level level, String msg) {
         Logging.log(level, msg);
     }
@@ -1051,7 +1059,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
             return true;
         } catch (IOException e) {
-            Logging.severe("Could not save Multiverse config.yml config. Please check your file permissions.");
+            this.log(Level.SEVERE, "Could not save Multiverse config.yml config. Please check your file permissions.");
             return false;
         }
     }

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

@@ -48,6 +48,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Property
     private volatile String prefixchatformat;
     @Property
+    private volatile boolean useasyncchat;
+    @Property
     private volatile boolean teleportintercept;
     @Property
     private volatile boolean firstspawnoverride;
@@ -91,6 +93,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     protected void setDefaults() {
         // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
         enforceaccess = false;
+        useasyncchat = true;
         prefixchat = true;
         prefixchatformat = "[%world%]%chat%";
         teleportintercept = true;
@@ -300,6 +303,16 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         this.teleportcooldown = teleportCooldown;
     }
 
+    @Override
+    public void setUseAsyncChat(boolean useAsyncChat) {
+        this.useasyncchat = useAsyncChat;
+    }
+
+    @Override
+    public boolean getUseAsyncChat() {
+        return this.useasyncchat;
+    }
+
     @Override
     public void setSilentStart(boolean silentStart) {
         Logging.setShowingConfig(!silentStart);

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

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

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

@@ -146,6 +146,18 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      */
     boolean getEnforceAccess();
 
+    /**
+     * Sets useasyncchat.
+     * @param useAsyncChat The new value.
+     */
+    void setUseAsyncChat(boolean useAsyncChat);
+
+    /**
+     * Gets useasyncchat.
+     * @return useasyncchat.
+     */
+    boolean getUseAsyncChat();
+
     /**
      * Sets whether to suppress startup messages.
      *

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

@@ -37,7 +37,7 @@ public class CheckCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        Player p = this.plugin.getServer().getPlayerExact(args.get(0));
+        Player p = this.plugin.getServer().getPlayer(args.get(0));
         if (p == null) {
             sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
             sender.sendMessage("Are they online?");

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

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

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

@@ -50,7 +50,7 @@ public class SpawnCommand extends MultiverseCommand {
                 sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
                 return;
             }
-            Player target = this.plugin.getServer().getPlayerExact(args.get(0));
+            Player target = this.plugin.getServer().getPlayer(args.get(0));
             if (target != null) {
                 target.sendMessage("Teleporting to this world's spawn...");
                 spawnAccurately(target);

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.commands;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
@@ -59,7 +58,7 @@ public class TeleportCommand extends MultiverseCommand {
         String destinationName;
 
         if (args.size() == 2) {
-            teleportee = this.plugin.getServer().getPlayerExact(args.get(0));
+            teleportee = this.plugin.getServer().getPlayer(args.get(0));
             if (teleportee == null) {
                 this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
                         ChatColor.GOLD, args.get(0)), false);
@@ -95,7 +94,7 @@ public class TeleportCommand extends MultiverseCommand {
         MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
         this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
         if (teleportEvent.isCancelled()) {
-            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
+            this.plugin.log(Level.FINE, "Someone else cancelled the MVTeleport Event!!!");
             return;
         }
 
@@ -163,9 +162,9 @@ public class TeleportCommand extends MultiverseCommand {
                 ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
         TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
         if (result == TeleportResult.FAIL_UNSAFE) {
-            Logging.fine("Could not teleport " + teleportee.getName()
+            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName()
                     + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-            Logging.fine("Queueing Command");
+            this.plugin.log(Level.FINE, "Queueing Command");
             Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
             List<Object> items = new ArrayList<Object>();
             items.add(teleporter);

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

@@ -60,6 +60,7 @@ public class VersionCommand extends MultiverseCommand {
                 + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
                 + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
                 + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
+                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
                 + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
                 + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
                 + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'

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

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

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

@@ -0,0 +1,35 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+
+/**
+ * A wrapper for the {@link AsyncPlayerChatEvent}.
+ */
+public class AsyncChatEvent implements ChatEvent {
+    private final AsyncPlayerChatEvent event;
+
+    public AsyncChatEvent(AsyncPlayerChatEvent event) {
+        this.event = event;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return event.isCancelled();
+    }
+
+    @Override
+    public String getFormat() {
+        return event.getFormat();
+    }
+
+    @Override
+    public void setFormat(String s) {
+        event.setFormat(s);
+    }
+
+    @Override
+    public Player getPlayer() {
+        return event.getPlayer();
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+
+/**
+ * A wrapper for the two chat-events in Bukkit.
+ */
+public interface ChatEvent {
+    /**
+     * @return Whether this event is cancelled.
+     */
+    boolean isCancelled();
+
+    /**
+     * @return The format.
+     */
+    String getFormat();
+
+    /**
+     * Sets the format.
+     * @param s The new format.
+     */
+    void setFormat(String s);
+
+    /**
+     * @return The player.
+     */
+    Player getPlayer();
+}

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

@@ -0,0 +1,34 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.listeners;
+
+import java.util.logging.Level;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+
+/**
+ * Multiverse's {@link org.bukkit.event.Listener} for players.
+ */
+public class MVAsyncPlayerChatListener extends MVChatListener {
+    public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
+        super(plugin, playerListener);
+        plugin.log(Level.FINE, "Created AsyncPlayerChatEvent listener.");
+    }
+
+    /**
+     * This method is called when a player wants to chat.
+     * @param event The Event that was fired.
+     */
+    @EventHandler
+    public void playerChat(AsyncPlayerChatEvent event) {
+        this.playerChat(new AsyncChatEvent(event));
+    }
+}

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

@@ -5,14 +5,12 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 
 import org.bukkit.ChatColor;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 /**
  * Multiverse's {@link org.bukkit.event.Listener} for players.
  */
-public class MVChatListener implements Listener {
+public abstract class MVChatListener implements Listener {
     private final MultiverseCore plugin;
     private final MVWorldManager worldManager;
     private final MVPlayerListener playerListener;
@@ -24,11 +22,10 @@ public class MVChatListener implements Listener {
     }
 
     /**
-     * This method is called when an a player sends a chat message.
-     * @param event The Event that was fired.
+     * This handles a {@link ChatEvent}.
+     * @param event The {@link ChatEvent}.
      */
-    @EventHandler
-    public void playerChat(AsyncPlayerChatEvent event) {
+    public void playerChat(ChatEvent event) {
         if (event.isCancelled()) {
             return;
         }

src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.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;
@@ -99,7 +98,7 @@ public class MVEntityListener implements Listener {
          * Handle people with non-standard animals: ie a patched craftbukkit.
          */
         if (type == null || type.getName() == null) {
-            Logging.finer("Found a null typed creature.");
+            this.plugin.log(Level.FINER, "Found a null typed creature.");
             return;
         }
 

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

@@ -0,0 +1,35 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.listeners;
+
+import java.util.logging.Level;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerChatEvent;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+
+/**
+ * Multiverse's {@link org.bukkit.event.Listener} for players.
+ */
+@SuppressWarnings("deprecation") // this exists only for downwards compatibility
+public class MVPlayerChatListener extends MVChatListener {
+    public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
+        super(plugin, playerListener);
+        plugin.log(Level.FINE, "Registered PlayerChatEvent listener.");
+    }
+
+    /**
+     * This method is called when a player wants to chat.
+     * @param event The Event that was fired.
+     */
+    @EventHandler
+    public void playerChat(PlayerChatEvent event) {
+        this.playerChat(new NormalChatEvent(event));
+    }
+}

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

@@ -71,7 +71,7 @@ public class MVPlayerListener implements Listener {
 
 
         if (mvWorld.getBedRespawn() && event.isBedSpawn()) {
-            Logging.fine("Spawning " + event.getPlayer().getName() + " at their bed");
+            this.plugin.log(Level.FINE, "Spawning " + event.getPlayer().getName() + " at their bed");
             return;
         }
 
@@ -110,15 +110,15 @@ public class MVPlayerListener implements Listener {
     public void playerJoin(PlayerJoinEvent event) {
         Player p = event.getPlayer();
         if (!p.hasPlayedBefore()) {
-            Logging.finer("Player joined for the FIRST time!");
+            this.plugin.log(Level.FINER, "Player joined for the FIRST time!");
             if (plugin.getMVConfig().getFirstSpawnOverride()) {
-                Logging.fine("Moving NEW player to(firstspawnoverride): "
+                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): "
                         + worldManager.getFirstSpawnWorld().getSpawnLocation());
                 this.sendPlayerToDefaultWorld(p);
             }
             return;
         } else {
-            Logging.finer("Player joined AGAIN!");
+            this.plugin.log(Level.FINER, "Player joined AGAIN!");
             if (this.plugin.getMVConfig().getEnforceAccess() // check this only if we're enforcing access!
                     && !this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
                 p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
@@ -156,7 +156,7 @@ public class MVPlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGHEST)
     public void playerTeleport(PlayerTeleportEvent event) {
-        Logging.finer("Got teleport event for player '"
+        this.plugin.log(Level.FINER, "Got teleport event for player '"
                 + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
         if (event.isCancelled()) {
             return;
@@ -166,25 +166,25 @@ public class MVPlayerListener implements Listener {
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
         if (teleporterName != null) {
             if (teleporterName.equals("CONSOLE")) {
-                Logging.finer("We know the teleporter is the console! Magical!");
+                this.plugin.log(Level.FINER, "We know the teleporter is the console! Magical!");
                 teleporter = this.plugin.getServer().getConsoleSender();
             } else {
-                teleporter = this.plugin.getServer().getPlayerExact(teleporterName);
+                teleporter = this.plugin.getServer().getPlayer(teleporterName);
             }
         }
-        Logging.finer("Inferred sender '" + teleporter + "' from name '"
+        this.plugin.log(Level.FINER, "Inferred sender '" + teleporter + "' from name '"
                 + teleporterName + "', fetched from name '" + teleportee.getName() + "'");
         MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
         if (toWorld == null) {
-            Logging.fine("Player '" + teleportee.getName() + "' is teleporting to world '"
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' is teleporting to world '"
                     + event.getTo().getWorld().getName() + "' which is not managed by Multiverse-Core.  No further "
                     + "actions will be taken by Multiverse-Core.");
             return;
         }
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
             // The player is Teleporting to the same world.
-            Logging.finer("Player '" + teleportee.getName() + "' is teleporting to the same world.");
+            this.plugin.log(Level.FINER, "Player '" + teleportee.getName() + "' is teleporting to the same world.");
             this.stateSuccess(teleportee.getName(), toWorld.getAlias());
             return;
         }
@@ -192,7 +192,7 @@ public class MVPlayerListener implements Listener {
         // Charge the teleporter
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, teleporter, teleportee, true));
         if (event.isCancelled() && teleporter != null) {
-            Logging.fine("Player '" + teleportee.getName()
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                     + "' was DENIED ACCESS to '" + toWorld.getAlias()
                     + "' because '" + teleporter.getName()
                     + "' don't have the FUNDS required to enter it.");
@@ -203,14 +203,14 @@ public class MVPlayerListener implements Listener {
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, teleporter, teleportee));
             if (event.isCancelled() && teleporter != null) {
-                Logging.fine("Player '" + teleportee.getName()
+                this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                         + "' was DENIED ACCESS to '" + toWorld.getAlias()
                         + "' because '" + teleporter.getName()
                         + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
                 return;
             }
         } else {
-            Logging.fine("Player '" + teleportee.getName()
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                     + "' was allowed to go to '" + toWorld.getAlias() + "' because enforceaccess is off.");
         }
 
@@ -220,7 +220,7 @@ public class MVPlayerListener implements Listener {
             if (toWorld.getCBWorld().getPlayers().size() >= toWorld.getPlayerLimit()) {
                 // Ouch the world is full, lets see if the player can bypass that limitation
                 if (!pt.playerCanBypassPlayerLimit(toWorld, teleporter, teleportee)) {
-                    Logging.fine("Player '" + teleportee.getName()
+                    this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                             + "' was DENIED ACCESS to '" + toWorld.getAlias()
                             + "' because the world is full and '" + teleporter.getName()
                             + "' doesn't have: mv.bypass.playerlimit." + event.getTo().getWorld().getName());
@@ -235,7 +235,7 @@ public class MVPlayerListener implements Listener {
     }
 
     private void stateSuccess(String playerName, String worldName) {
-        Logging.fine("MV-Core is allowing Player '" + playerName
+        this.plugin.log(Level.FINE, "MV-Core is allowing Player '" + playerName
                 + "' to go to '" + worldName + "'.");
     }
 
@@ -282,12 +282,12 @@ public class MVPlayerListener implements Listener {
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
             // The player is Portaling to the same world.
-            Logging.finer("Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
+            this.plugin.log(Level.FINER, "Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
             return;
         }
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, event.getPlayer(), event.getPlayer(), true));
         if (event.isCancelled()) {
-            Logging.fine("Player '" + event.getPlayer().getName()
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                     + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                     + "' because they don't have the FUNDS required to enter.");
             return;
@@ -295,12 +295,12 @@ public class MVPlayerListener implements Listener {
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
             if (event.isCancelled()) {
-                Logging.fine("Player '" + event.getPlayer().getName()
+                this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                         + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                         + "' because they don't have: multiverse.access." + event.getTo().getWorld().getName());
             }
         } else {
-            Logging.fine("Player '" + event.getPlayer().getName()
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                     + "' was allowed to go to '" + event.getTo().getWorld().getName()
                     + "' because enforceaccess is off.");
         }
@@ -311,7 +311,7 @@ public class MVPlayerListener implements Listener {
                     event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
                 }
             } catch (ClassNotFoundException ignore) {
-                Logging.fine("TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
+                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
             }
 
         }
@@ -335,7 +335,7 @@ public class MVPlayerListener implements Listener {
         if (mvWorld != null) {
             this.handleGameModeAndFlight(player, mvWorld);
         } else {
-            Logging.finer("Not handling gamemode and flight for world '" + world.getName()
+            this.plugin.log(Level.FINER, "Not handling gamemode and flight for world '" + world.getName()
                     + "' not managed by Multiverse.");
         }
     }
@@ -376,7 +376,7 @@ public class MVPlayerListener implements Listener {
                                         player.getName(), player.getWorld().getName(), world.getName());
                             }
                         } else {
-                            Logging.fine("Player: " + player.getName() + " is IMMUNE to gamemode changes!");
+                            MVPlayerListener.this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
                         }
                     }
                 }, 1L);

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.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.MultiverseWorld;
 import org.bukkit.Material;
@@ -57,7 +56,7 @@ public class MVPortalListener implements Listener {
     public void portalForm(PortalCreateEvent event) {
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld());
         if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.NETHER)) {
-            Logging.fine("Cancelling creation of nether portal because portalForm disallows.");
+            plugin.log(Level.FINE, "Cancelling creation of nether portal because portalForm disallows.");
             event.setCancelled(true);
         }
     }
@@ -80,7 +79,7 @@ public class MVPortalListener implements Listener {
         }
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld());
         if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.ENDER)) {
-            Logging.fine("Cancelling creation of ender portal because portalForm disallows.");
+            plugin.log(Level.FINE, "Cancelling creation of ender portal because portalForm disallows.");
             event.setCancelled(true);
         }
     }

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

@@ -0,0 +1,37 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerChatEvent;
+
+/**
+ * A wrapper for the {@link PlayerChatEvent}.
+ * @deprecated This is deprecated like the {@link PlayerChatEvent}.
+ */
+@Deprecated
+public class NormalChatEvent implements ChatEvent {
+    private final PlayerChatEvent event;
+
+    public NormalChatEvent(PlayerChatEvent event) {
+        this.event = event;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return event.isCancelled();
+    }
+
+    @Override
+    public String getFormat() {
+        return event.getFormat();
+    }
+
+    @Override
+    public void setFormat(String s) {
+        event.setFormat(s);
+    }
+
+    @Override
+    public Player getPlayer() {
+        return event.getPlayer();
+    }
+}

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

@@ -74,7 +74,7 @@ public class AnchorManager {
             this.anchorConfig.save(new File(this.plugin.getDataFolder(), "anchors.yml"));
             return true;
         } catch (IOException e) {
-            Logging.severe("Failed to save anchors.yml. Please check your file permissions.");
+            this.plugin.log(Level.SEVERE, "Failed to save anchors.yml. Please check your file permissions.");
             return false;
         }
     }

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

@@ -2,7 +2,6 @@ package com.onarandombox.MultiverseCore.utils;
 
 import java.util.logging.Level;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
 import org.bukkit.Location;
@@ -90,7 +89,7 @@ public class BukkitTravelAgent implements TravelAgent {
     private Location getSafeLocation() {
         // At this time, these can never use the velocity.
         if (agent.destination instanceof CannonDestination) {
-            Logging.fine("Using Stock TP method. This cannon will have 0 velocity");
+            agent.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
         }
         SafeTTeleporter teleporter = agent.core.getSafeTTeleporter();
         Location newLoc = agent.destination.getLocation(agent.player);

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

@@ -72,11 +72,12 @@ public class FileUtils {
      * Helper method to copy the world-folder.
      * @param source Source-File
      * @param target Target-File
+     * @param log A logger that logs the operation
      *
      * @return true if it had success
      */
-    public static boolean copyFolder(File source, File target) {
-        return copyFolder(source, target, null);
+    public static boolean copyFolder(File source, File target, Logger log) {
+        return copyFolder(source, target, null, log);
     }
 
     /**
@@ -84,10 +85,11 @@ public class FileUtils {
      * @param source Source-File
      * @param target Target-File
      * @param excludeFiles files to ignore and not copy over to Target-File
+     * @param log A logger that logs the operation
      *
      * @return true if it had success
      */
-    public static boolean copyFolder(File source, File target, List<String> excludeFiles) {
+    public static boolean copyFolder(File source, File target, List<String> excludeFiles, Logger log) {
         Path sourceDir = source.toPath();
         Path targetDir = target.toPath();
 
@@ -95,7 +97,7 @@ public class FileUtils {
             Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir, excludeFiles));
             return true;
         } catch (IOException e) {
-            Logging.warning("Unable to copy directory", e);
+            log.log(Level.WARNING, "Unable to copy directory", e);
             return false;
         }
     }

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -101,7 +100,7 @@ public class MVPermissions implements PermissionsInterface {
     public boolean canEnterWorld(Player p, MultiverseWorld w) {
         // If we're not enforcing access, anyone can enter.
         if (!plugin.getMVConfig().getEnforceAccess()) {
-            Logging.finest("EnforceAccess is OFF. Player was allowed in " + w.getAlias());
+            this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
             return true;
         }
         return this.hasPermission(p, "multiverse.access." + w.getName(), false);
@@ -258,14 +257,14 @@ public class MVPermissions implements PermissionsInterface {
 
         boolean hasPermission = sender.hasPermission(node);
         if (!sender.isPermissionSet(node)) {
-            Logging.finer(String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
+            this.plugin.log(Level.FINER, String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
                     ChatColor.RED, node, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA,
                     player.getDisplayName(), ChatColor.WHITE));
         }
         if (hasPermission) {
-            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
         } else {
-            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
         }
         return hasPermission;
     }

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
@@ -196,7 +195,7 @@ public class PermissionTools {
      * @return True if they can't go to the world, False if they can.
      */
     public boolean playerCanGoFromTo(MultiverseWorld fromWorld, MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
-        Logging.finest("Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
+        this.plugin.log(Level.FINEST, "Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
 
         Player teleporterPlayer;
         if (plugin.getMVConfig().getTeleportIntercept()) {

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

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

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

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

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

@@ -47,7 +47,6 @@ import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -63,6 +62,8 @@ public class WorldManager implements MVWorldManager {
     private Map<String, String> defaultGens;
     private String firstSpawn;
 
+    private static final List<String> CLONE_IGNORE_FILES = Arrays.asList("session.lock", "uid.dat");
+
     public WorldManager(MultiverseCore core) {
         this.plugin = core;
         this.worldsFromTheConfig = new HashMap<String, WorldProperties>();
@@ -91,7 +92,191 @@ public class WorldManager implements MVWorldManager {
                 }
             }
         } else {
-            Logging.warning("Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
+            this.plugin.log(Level.WARNING, "Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
+        }
+    }
+
+    /**
+     * Makes cloning easier to understand and manage.
+     */
+    private class CloneHelper {
+        private String oldName;
+        private String newName;
+        private File oldWorldFile;
+        private File newWorldFile;
+        private MultiverseWorld oldWorld;
+
+        public CloneHelper(String oldName, String newName) {
+            this.oldName = oldName;
+            this.newName = newName;
+        }
+
+        /**
+         * The clone operation.
+         *
+         * @return True if clone is successful, false otherwise.
+         */
+        public boolean run() {
+            if (!validCloneParameters()) {
+                Logging.warning("Invalid clone parameters");
+                return false;
+            }
+
+            initWorldFiles();
+            if (newWorldFile.exists()) {
+                Logging.warning("Folder for new world '%s' already exists", newName);
+                return false;
+            }
+
+            oldWorld = getMVWorld(oldName);
+            if (!isOldWorldLoadable()) {
+                Logging.severe("Old world '%s' is not loadable", oldName);
+                return false;
+            }
+
+            boolean wasAutoSave = manuallySaveWorld();
+
+            if (!copyWorldFolder()) {
+                return false;
+            }
+
+            revertBackAutoSave(wasAutoSave);
+
+            return initNewCloneWorld();
+        }
+
+        /**
+         * Ensure that world with oldName can be clone to a world called newName.
+         *
+         * @return True if parameters are valid, otherwise false.
+         */
+        private boolean validCloneParameters() {
+            String originalOldName = oldName;
+           if (!isWorldFromConfig(oldName)) {
+               oldName = getWorldByAliasFromConfig(oldName);
+           }
+
+            if (oldName == null) {
+                Logging.warning("Old world '%s' does not exist", originalOldName);
+                return false;
+            }
+            if (isWorldFromConfig(newName)) {
+                Logging.warning("New world '%s' already exists", newName);
+                return false;
+            }
+            if (!isValidWorldName(newName)) {
+                Logging.warning("New world name '%s' is invalid", newName);
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * Get world folders from world container.
+         */
+        private void initWorldFiles() {
+            oldWorldFile = new File(plugin.getServer().getWorldContainer(), oldName);
+            newWorldFile = new File(plugin.getServer().getWorldContainer(), newName);
+        }
+
+        /**
+         * Ensure that old world can be loaded and saved properly.
+         *
+         * @return True if old world can be loaded successfully, false otherwise.
+         */
+        private boolean isOldWorldLoadable() {
+            if (oldWorld != null) {
+                return true;
+            }
+
+            Logging.fine("Old world '%s' is currently unloaded. Attempting to load it...", oldName);
+            WorldProperties props = worldsFromTheConfig.get(oldName);
+            boolean wasLoadSpawn = worldsFromTheConfig.get(oldName).isKeepingSpawnInMemory();
+            if (wasLoadSpawn) {
+                props.setKeepSpawnInMemory(false);
+            }
+
+            if (!loadWorld(oldName)) {
+                Logging.severe("Failed to load the old world '%s'", oldName);
+                return false;
+            }
+
+            getMVWorld(oldName).getCBWorld().setAutoSave(false);
+
+            if (!unloadWorld(oldName, true)) {
+                Logging.severe("Failed to unload the old world '%S'", oldName);
+                return false;
+            }
+
+            if (wasLoadSpawn) {
+                props.setKeepSpawnInMemory(true);
+            }
+
+            return true;
+        }
+
+        /**
+         * Duplicating old world folder to the new world folder.
+         *
+         * @return True if copy process was successful, false otherwise.
+         */
+        private boolean copyWorldFolder() {
+            Logging.fine("Copying files for world '%s'", oldName);
+            if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, CLONE_IGNORE_FILES, Logging.getLogger()) || !newWorldFile.exists()) {
+                Logging.severe("Failed to copy files for world '%s', see the log info", newName);
+                return false;
+            }
+            Logging.fine("Succeeded at copying files");
+            return true;
+        }
+
+        /**
+         * Ensure world is save being copying world files.
+         *
+         * @return Previous auto-save setting for the old world.
+         */
+        private boolean manuallySaveWorld() {
+            if (oldWorld != null && oldWorld.getCBWorld().isAutoSave()) {
+                Logging.config("Saving world '%s'", oldName);
+                oldWorld.getCBWorld().setAutoSave(false);
+                oldWorld.getCBWorld().save();
+                return true;
+            }
+            return false;
+        }
+
+        private void revertBackAutoSave(boolean wasAutoSave) {
+            if (oldWorld != null && wasAutoSave) {
+                Logging.fine("Revert back to enabling auto-save");
+                oldWorld.getCBWorld().setAutoSave(true);
+            }
+        }
+
+        /**
+         * Initialize new properties with old ones.
+         */
+        private void copyPropertiesToNewWorld() {
+            WorldProperties newProps = new WorldProperties();
+            newProps.copyValues(worldsFromTheConfig.get(oldName));
+            newProps.setAlias(""); // don't keep the alias the same -- that would be useless
+            worldsFromTheConfig.put(newName, newProps);
+        }
+
+        /**
+         * Load up the newly copied clone world.
+         */
+        private boolean initNewCloneWorld() {
+            copyPropertiesToNewWorld();
+            if (!saveWorldsConfig()) {
+                Logging.severe("Failed to save worlds.yml");
+                return false;
+            }
+            if (!doLoad(newName)) {
+                Logging.severe("Failed to load the cloned world '" + newName + "'");
+                return false;
+            }
+            Logging.fine("Succeeded at loading cloned world '" + newName + "'");
+            return true;
         }
     }
 
@@ -110,113 +295,7 @@ public class WorldManager implements MVWorldManager {
      */
     @Override
     public boolean cloneWorld(String oldName, String newName) {
-        // Make sure we already know about the old world and that we don't
-        // already know about the new world.
-        if (!this.worldsFromTheConfig.containsKey(oldName)) {
-            for (Map.Entry<String, WorldProperties> entry : this.worldsFromTheConfig.entrySet()) {
-                if (oldName.equals(entry.getValue().getAlias())) {
-                    oldName = entry.getKey();
-                    break;
-                }
-            }
-            if (!this.worldsFromTheConfig.containsKey(oldName)) {
-                Logging.warning("Old world '%s' does not exist", oldName);
-                return false;
-            }
-        }
-        if (this.isMVWorld(newName)) {
-            Logging.warning("New world '%s' already exists", newName);
-            return false;
-        }
-
-        // Check for valid world name
-        if (!(isValidWorldName(oldName) && isValidWorldName(newName))) {
-            return false;
-        }
-
-        final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
-        final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
-        final List<String> ignoreFiles = new ArrayList<>(Arrays.asList("session.lock", "uid.dat"));
-
-        // Make sure the new world doesn't exist outside of multiverse.
-        if (newWorldFile.exists()) {
-            Logging.warning("Folder for new world '%s' already exists", newName);
-            return false;
-        }
-
-        // Load the old world... but just the metadata.
-        boolean wasJustLoaded = false;
-        boolean wasLoadSpawn = false;
-        if (this.plugin.getServer().getWorld(oldName) == null) {
-            wasJustLoaded = true;
-            WorldProperties props = this.worldsFromTheConfig.get(oldName);
-            wasLoadSpawn = props.isKeepingSpawnInMemory();
-            if (wasLoadSpawn) {
-                // No chunks please.
-                props.setKeepSpawnInMemory(false);
-            }
-            if (!this.loadWorld(oldName)) {
-                return false;
-            }
-            this.plugin.getServer().getWorld(oldName).setAutoSave(false);
-        }
-        
-        // Grab a bit of metadata from the old world.
-        MultiverseWorld oldWorld = getMVWorld(oldName);
-
-        // Don't need the loaded world anymore.
-        if (wasJustLoaded) {
-            this.unloadWorld(oldName, true);
-            oldWorld = null;
-            if (wasLoadSpawn) {
-                this.worldsFromTheConfig.get(oldName).setKeepSpawnInMemory(true);
-            }
-        }
-
-        boolean wasAutoSave = false;
-        if (oldWorld != null && oldWorld.getCBWorld().isAutoSave()) {
-            wasAutoSave = true;
-            Logging.config("Saving world '%s'", oldName);
-            oldWorld.getCBWorld().setAutoSave(false);
-            oldWorld.getCBWorld().save();
-        }
-        Logging.config("Copying files for world '%s'", oldName);
-        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, ignoreFiles)) {
-            Logging.warning("Failed to copy files for world '%s', see the log info", newName);
-            return false;
-        }
-        if (oldWorld != null && wasAutoSave) {
-            oldWorld.getCBWorld().setAutoSave(true);
-        }
-        
-        if (newWorldFile.exists()) {
-            Logging.fine("Succeeded at copying files");
-
-            // initialize new properties with old ones
-            WorldProperties newProps = new WorldProperties();
-            newProps.copyValues(this.worldsFromTheConfig.get(oldName));
-            // don't keep the alias the same -- that would be useless
-            newProps.setAlias("");
-            // store the new properties in worlds config map
-            this.worldsFromTheConfig.put(newName, newProps);
-
-            // save the worlds config to disk (worlds.yml)
-            if (!saveWorldsConfig()) {
-                Logging.severe("Failed to save worlds.yml");
-                return false;
-            }
-
-            // actually load the world
-            if (doLoad(newName)) {
-               Logging.fine("Succeeded at loading cloned world '" + newName + "'");
-               return true;
-            }
-            Logging.severe("Failed to load the cloned world '" + newName + "'");
-            return false;
-        }
-
-        Logging.warning("Failed to copy files for world '%s', see the log info", newName);
-        return false;
+        return new CloneHelper(oldName, newName).run();
     }
 
     /**
@@ -284,7 +363,7 @@ public class WorldManager implements MVWorldManager {
         Logging.info(builder.toString());
 
         if (!doLoad(c, true)) {
-            Logging.severe("Failed to Create/Load the world '" + name + "'");
+            this.plugin.log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
             return false;
         }
 
@@ -357,7 +436,7 @@ public class WorldManager implements MVWorldManager {
         MultiverseWorld world = this.getMVWorld(this.firstSpawn);
         if (world == null) {
             // If the spawn world was unloaded, get the default world
-            Logging.warning("The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
+            this.plugin.log(Level.WARNING, "The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
             try {
                 return this.getMVWorld(this.plugin.getServer().getWorlds().get(0));
             } catch (IndexOutOfBoundsException e) {
@@ -440,15 +519,15 @@ public class WorldManager implements MVWorldManager {
     }
 
     private void brokenWorld(String name) {
-        Logging.severe("The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
-        Logging.severe("Try using Minecraft Region Fixer to repair your world! '" + name + "'");
-        Logging.severe("https://github.com/Fenixin/Minecraft-Region-Fixer");
+        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
+        this.plugin.log(Level.SEVERE, "Try using Minecraft Region Fixer to repair your world! '" + name + "'");
+        this.plugin.log(Level.SEVERE, "https://github.com/Fenixin/Minecraft-Region-Fixer");
     }
 
     private void nullWorld(String name) {
-        Logging.severe("The world '" + name + "' could NOT be loaded because the server didn't like it!");
-        Logging.severe("We don't really know why this is. Contact the developer of your server software!");
-        Logging.severe("Server version info: " + Bukkit.getServer().getVersion());
+        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because the server didn't like it!");
+        this.plugin.log(Level.SEVERE, "We don't really know why this is. Contact the developer of your server software!");
+        this.plugin.log(Level.SEVERE, "Server version info: " + Bukkit.getServer().getVersion());
     }
 
     private boolean doLoad(String name) {
@@ -488,8 +567,8 @@ public class WorldManager implements MVWorldManager {
             throw new IllegalArgumentException("That world is already loaded!");
 
         if (!ignoreExists && !new File(this.plugin.getServer().getWorldContainer(), worldName).exists() && !new File(this.plugin.getServer().getWorldContainer().getParent(), worldName).exists()) {
-            Logging.warning("WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
-            Logging.warning("Use '/mv remove' to remove it from the config!");
+            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;
         }
 
@@ -536,7 +615,7 @@ public class WorldManager implements MVWorldManager {
         MVWorldDeleteEvent mvwde = new MVWorldDeleteEvent(getMVWorld(name), removeFromConfig);
         this.plugin.getServer().getPluginManager().callEvent(mvwde);
         if (mvwde.isCancelled()) {
-            Logging.fine("Tried to delete a world, but the event was cancelled!");
+            this.plugin.log(Level.FINE, "Tried to delete a world, but the event was cancelled!");
             return false;
         }
 
@@ -552,7 +631,7 @@ public class WorldManager implements MVWorldManager {
 
         try {
             File worldFile = world.getWorldFolder();
-            Logging.finer("deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
+            plugin.log(Level.FINER, "deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
             if (deleteWorldFolder ? FileUtils.deleteFolder(worldFile) : FileUtils.deleteFolderContents(worldFile)) {
                 Logging.info("World '%s' was DELETED.", name);
                 return true;
@@ -697,6 +776,19 @@ public class WorldManager implements MVWorldManager {
         return false;
     }
 
+    private boolean isWorldFromConfig(String name) {
+        return this.worldsFromTheConfig.containsKey(name);
+    }
+
+    private String getWorldByAliasFromConfig(String name) {
+        return this.worldsFromTheConfig.entrySet()
+                .stream()
+                .filter(worldEntry -> name.equals(worldEntry.getValue().getAlias()))
+                .map(Map.Entry::getKey)
+                .findFirst()
+                .orElse(null);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -866,7 +958,7 @@ public class WorldManager implements MVWorldManager {
             this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
             return true;
         } catch (IOException e) {
-            Logging.severe("Could not save worlds.yml. Please check your settings.");
+            this.plugin.log(Level.SEVERE, "Could not save worlds.yml. Please check your settings.");
             return false;
         }
     }

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

@@ -10,7 +10,7 @@ package com.onarandombox.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
-import com.onarandombox.MultiverseCore.listeners.MVChatListener;
+import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
@@ -187,10 +187,10 @@ public class TestWorldProperties {
 
         // call player chat event
         core.getMVConfig().setPrefixChat(true);
-        core.getChatListener().playerChat(playerChatEvent);
+        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        core.getChatListener().playerChat(playerChatEvent);
+        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
         verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
 
         // call player join events
@@ -281,15 +281,15 @@ public class TestWorldProperties {
 
         // call player chat event
         core.getMVConfig().setPrefixChat(true);
-        core.getChatListener().playerChat(playerChatEvent);
+        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
         // never because it's hidden!
         verify(playerChatEvent, never()).setFormat(
                 "[" + mvWorld.getColoredWorldString() + "]" + "format");
         mvWorld.setHidden(false);
-        core.getChatListener().playerChat(playerChatEvent);
+        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        core.getChatListener().playerChat(playerChatEvent);
+        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
         verify(playerChatEvent, times(1)).setFormat(anyString()); // only ONE TIME (not the 2nd time!)
         mvWorld.setHidden(true); // reset hidden-state
 

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

@@ -81,7 +81,7 @@ public class FileUtilsTest {
         assertFalse(Files.isDirectory(targetChildDir));
         assertFalse(Files.isRegularFile(targetChildDirFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -107,7 +107,7 @@ public class FileUtilsTest {
         assertFalse(Files.isRegularFile(targetChildDirFile));
         assertFalse(Files.isRegularFile(targetChildIgnoreFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), excludeFiles));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), excludeFiles, Logging.getLogger()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -129,7 +129,7 @@ public class FileUtilsTest {
         assertFalse(Files.isDirectory(targetChildDir));
         assertFalse(Files.isRegularFile(targetChildDirFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -145,6 +145,6 @@ public class FileUtilsTest {
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
 
-        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
+        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
     }
 }

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

@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.utils;
 import buscript.Buscript;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
@@ -245,12 +244,6 @@ public class TestInstanceCreator {
             weatherlistenerfield.setAccessible(true);
             weatherlistenerfield.set(core, wl);
 
-            // Set weatherListener
-            MVChatListener cl = PowerMockito.spy(new MVChatListener(core, pl));
-            Field chatlistenerfield = MultiverseCore.class.getDeclaredField("chatListener");
-            chatlistenerfield.setAccessible(true);
-            chatlistenerfield.set(core, cl);
-
             // Init our command sender
             final Logger commandSenderLogger = Logger.getLogger("CommandSender");
             commandSenderLogger.setParent(Util.logger);