Remove old non-async chat event and its config option.

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>4.2.3-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
@@ -215,7 +215,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -264,19 +264,13 @@
             <plugin>
                 <groupId>se.eris</groupId>
                 <artifactId>notnull-instrumenter-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>0.6.8</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>instrument</goal>
                             <goal>tests-instrument</goal>
                         </goals>
-                        <configuration>
-                            <notNull>
-                                <param>org.jetbrains.annotations.NotNull</param>
-                                <param>javax.validation.constraints.NotNull</param>
-                            </notNull>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -359,21 +353,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>

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

@@ -68,7 +68,6 @@ import com.onarandombox.MultiverseCore.commands.TeleportCommand;
 import com.onarandombox.MultiverseCore.commands.UnloadCommand;
 import com.onarandombox.MultiverseCore.commands.VersionCommand;
 import com.onarandombox.MultiverseCore.commands.WhoCommand;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.AnchorDestination;
 import com.onarandombox.MultiverseCore.destination.BedDestination;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
@@ -78,18 +77,15 @@ 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;
 import com.onarandombox.MultiverseCore.listeners.MVWorldInitListener;
 import com.onarandombox.MultiverseCore.listeners.MVWorldListener;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
 import com.onarandombox.MultiverseCore.utils.MVMessaging;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
@@ -205,7 +201,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     // Setup our Map for our Commands using the CommandHandler.
     private CommandHandler commandHandler;
-    private CommandQueueManager commandQueueManager;
 
     private static final String LOG_TAG = "[Multiverse-Core]";
 
@@ -223,7 +218,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;
+    private MVChatListener chatListener = new MVChatListener(this, this.playerListener);
 
     // HashMap to contain information relating to the Players.
     private HashMap<String, MVPlayerSession> playerSessions;
@@ -257,8 +252,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         // Setup our SafeTTeleporter
         this.safeTTeleporter = new SimpleSafeTTeleporter(this);
         this.unsafeCallWrapper = new UnsafeCallWrapper(this);
-        // Setup our CompatibilityLayer
-        CompatibilityLayer.init();
     }
 
 
@@ -290,7 +283,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
         // Setup the command manager
         this.commandHandler = new CommandHandler(this, this.ph);
-        this.commandQueueManager = new CommandQueueManager(this);
         // Call the Function to assign all the Commands to their Class.
         this.registerCommands();
 
@@ -324,17 +316,6 @@ 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();
@@ -359,16 +340,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
      * Initializes the buscript javascript library.
      */
     private void initializeBuscript() {
-        buscript = null;
-
-        if (this.getMVConfig().getEnableBuscript()) {
-            try {
-                buscript = new Buscript(this);
-                // Add global variable "multiverse" to javascript environment
-                buscript.setScriptVariable("multiverse", this);
-            } catch (NullPointerException e) {
-                Logging.warning("Buscript failed to load! The script command will be disabled!");
-            }
+        try {
+            buscript = new Buscript(this);
+            // Add global variable "multiverse" to javascript environment
+            buscript.setScriptVariable("multiverse", this);
+        } catch (NullPointerException e) {
+            buscript = null;
+            Logging.warning("Buscript failed to load! The script command will be disabled!");
         }
     }
 
@@ -389,6 +367,7 @@ 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);
@@ -920,15 +899,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         return this.commandHandler;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Deprecated
-    public CommandQueueManager getCommandQueueManager() {
-        return commandQueueManager;
-    }
-
     /**
      * Gets the log-tag.
      *

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

@@ -48,16 +48,12 @@ 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;
     @Property
     private volatile boolean displaypermerrors;
     @Property
-    private volatile boolean enablebuscript;
-    @Property
     private volatile int globaldebug;
     @Property
     private volatile boolean silentstart;
@@ -95,13 +91,11 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     protected void setDefaults() {
         // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
         enforceaccess = false;
-        useasyncchat = true;
         prefixchat = true;
         prefixchatformat = "[%world%]%chat%";
         teleportintercept = true;
         firstspawnoverride = true;
         displaypermerrors = true;
-        enablebuscript = true;
         globaldebug = 0;
         messagecooldown = 5000;
         teleportcooldown = 1000;
@@ -216,22 +210,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         return this.displaypermerrors;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getEnableBuscript() {
-        return this.enablebuscript;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setEnableBuscript(boolean enableBuscript) {
-        this.enablebuscript = enableBuscript;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -322,16 +300,6 @@ 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/Core.java

@@ -8,7 +8,6 @@
 package com.onarandombox.MultiverseCore.api;
 
 import buscript.Buscript;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
@@ -87,15 +86,6 @@ public interface Core {
      */
     CommandHandler getCommandHandler();
 
-    /**
-     * Manager for command that requires /mv confirm before execution.
-     *
-     * @return A non-null {@link CommandQueueManager}.
-     * @deprecated To be moved to new command manager in 5.0.0
-     */
-    @Deprecated
-    CommandQueueManager getCommandQueueManager();
-
     /**
      * Gets the factory class responsible for loading many different destinations
      * on demand.

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

@@ -86,18 +86,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      */
     boolean getDisplayPermErrors();
 
-    /**
-     * Sets enableBuscript.
-     * @param enableBuscript The new value.
-     */
-    void setEnableBuscript(boolean enableBuscript);
-
-    /**
-     * Gets enableBuscript.
-     * @return enableBuscript.
-     */
-    boolean getEnableBuscript();
-
     /**
      * Sets firstSpawnOverride.
      * @param firstSpawnOverride The new value.
@@ -158,18 +146,6 @@ 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/ConfirmCommand.java

@@ -33,7 +33,7 @@ public class ConfirmCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.getCommandQueueManager().runQueuedCommand(sender);
+        this.plugin.getCommandHandler().confirmQueuedCommand(sender);
     }
 
 }

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

@@ -8,11 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,24 +35,11 @@ public class DeleteCommand extends MultiverseCommand {
     public void runCommand(CommandSender sender, List<String> args) {
         String worldName = args.get(0);
 
-        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                sender,
-                deleteRunnable(sender, worldName),
-                String.format("Are you sure you want to delete world '%s'? You cannot undo this action.", worldName)
-        ));
-    }
-
-    private Runnable deleteRunnable(@NotNull CommandSender sender,
-                                    @NotNull String worldName) {
-
-        return () -> {
-            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
-            if (this.plugin.getMVWorldManager().deleteWorld(worldName)) {
-                sender.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
-                return;
-            }
-            sender.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.",
-                    ChatColor.RED, worldName));
-        };
+        Class<?>[] paramTypes = {String.class};
+        List<Object> objectArgs = new ArrayList<Object>(args);
+        this.plugin.getCommandHandler()
+                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
+                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
+                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
     }
 }

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

@@ -115,7 +115,6 @@ public class InfoCommand extends MultiverseCommand {
         FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
         message.add(new FancyHeader("General Info", colors));
         message.add(new FancyMessage("World Name: ", world.getName(), colors));
-        message.add(new FancyMessage("World UID: ", world.getCBWorld().getUID().toString(), colors));
         message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
         message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
         message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
@@ -152,7 +151,6 @@ public class InfoCommand extends MultiverseCommand {
         message = new ArrayList<FancyText>();
         message.add(new FancyHeader("More World Settings", colors));
         message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
-        message.add(new FancyMessage("Generator: ", world.getGenerator(), colors));
         message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
         message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
         message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));

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

@@ -8,11 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,30 +37,17 @@ public class RegenCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
-        boolean useseed = (!(args.size() == 1));
-        boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
+        Boolean useseed = (!(args.size() == 1));
+        Boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
         String seed = (args.size() == 3) ? args.get(2) : "";
 
-        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                sender,
-                doWorldRegen(sender, worldName, useseed, randomseed, seed),
-                String.format("Are you sure you want to regen '%s'? You cannot undo this action.", worldName)
-        ));
-    }
-
-    private Runnable doWorldRegen(@NotNull CommandSender sender,
-                                  @NotNull String worldName,
-                                  boolean useSeed,
-                                  boolean randomSeed,
-                                  @NotNull String seed) {
-
-        return () -> {
-            if (this.plugin.getMVWorldManager().regenWorld(worldName, useSeed, randomSeed, seed)) {
-                sender.sendMessage(ChatColor.GREEN + "World Regenerated!");
-                return;
-            }
-            sender.sendMessage(ChatColor.RED + "World could NOT be regenerated!");
-        };
+        Class<?>[] paramTypes = {String.class, Boolean.class, Boolean.class, String.class};
+        List<Object> objectArgs = new ArrayList<Object>();
+        objectArgs.add(args.get(0));
+        objectArgs.add(useseed);
+        objectArgs.add(randomseed);
+        objectArgs.add(seed);
+        this.plugin.getCommandHandler().queueCommand(sender, "mvregen", "regenWorld", objectArgs,
+                paramTypes, ChatColor.GREEN + "World Regenerated!", ChatColor.RED + "World could NOT be regenerated!");
     }
 }

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

@@ -11,7 +11,6 @@ import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
@@ -166,27 +165,24 @@ public class TeleportCommand extends MultiverseCommand {
         if (result == TeleportResult.FAIL_UNSAFE) {
             Logging.fine("Could not teleport " + teleportee.getName()
                     + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-
+            Logging.fine("Queueing Command");
+            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
+            List<Object> items = new ArrayList<Object>();
+            items.add(teleporter);
+            items.add(teleportee);
+            items.add(d.getLocation(teleportee));
             String player = "you";
             if (!teleportee.equals(teleporter)) {
                 player = teleportee.getName();
             }
-
-            this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                    sender,
-                    doUnsafeTeleport(teleporter, teleportee, d.getLocation(teleportee)),
-                    String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe. Would you like to try anyway?",
-                            ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE),
-                    UNSAFE_TELEPORT_EXPIRE_DELAY
-            ));
+            String message = String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe.",
+                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE);
+            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items,
+                    paramTypes, message, "Would you like to try anyway?", "", "", UNSAFE_TELEPORT_EXPIRE_DELAY);
         }
         // else: Player was teleported successfully (or the tp event was fired I should say)
     }
 
-    private Runnable doUnsafeTeleport(CommandSender teleporter, Player player, Location location) {
-        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, player, location, false);
-    }
-
     private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
         if (teleporter.equals(teleportee)) {
             if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {

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

@@ -60,11 +60,9 @@ 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'
-                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
                 + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
                 + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
                 + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/CommandQueueManager.java

@@ -1,158 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * 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.commandtools.queue;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.block.data.type.CommandBlock;
-import org.bukkit.command.BlockCommandSender;
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitTask;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-/**
- * Managers the queuing of dangerous commands that needs to use '/mv confirm' before executing.
- */
-public class CommandQueueManager {
-
-    private static final long TICKS_PER_SECOND = 20;
-    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
-
-    private final MultiverseCore plugin;
-    private final Map<CommandSender, QueuedCommand> queuedCommandMap;
-
-    public CommandQueueManager(@NotNull MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.queuedCommandMap = new WeakHashMap<>();
-    }
-
-    /**
-     * Adds a queue command into queue.
-     *
-     * @param queuedCommand The queue command to add.
-     */
-    public void addToQueue(QueuedCommand queuedCommand) {
-        CommandSender targetSender = parseSender(queuedCommand.getSender());
-
-        // Since only one command is stored in queue per sender, we remove the old one.
-        this.removeFromQueue(targetSender);
-
-        Logging.finer("Add new command to queue for sender %s.", targetSender);
-        this.queuedCommandMap.put(targetSender, queuedCommand);
-        queuedCommand.setExpireTask(runExpireLater(queuedCommand));
-
-        queuedCommand.getSender().sendMessage(queuedCommand.getPrompt());
-        queuedCommand.getSender().sendMessage(String.format("Run %s/mv confirm %sto continue. This will expire in %s seconds.",
-                ChatColor.GREEN, ChatColor.WHITE, queuedCommand.getValidDuration()));
-    }
-
-    /**
-     * Expire task that remove {@link QueuedCommand} from queue after valid duration defined.
-     *
-     * @param queuedCommand Command to run the expire task on.
-     * @return The expire {@link BukkitTask}.
-     */
-    @NotNull
-    private BukkitTask runExpireLater(@NotNull QueuedCommand queuedCommand) {
-        return Bukkit.getScheduler().runTaskLater(
-                this.plugin,
-                expireRunnable(queuedCommand),
-                queuedCommand.getValidDuration() * TICKS_PER_SECOND
-        );
-    }
-
-    /**
-     * Runnable responsible for expiring the queued command.
-     *
-     * @param queuedCommand Command to create the expire task on.
-     * @return The expire runnable.
-     */
-    @NotNull
-    private Runnable expireRunnable(@NotNull QueuedCommand queuedCommand) {
-        return () -> {
-            CommandSender targetSender = parseSender(queuedCommand.getSender());
-            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(targetSender);
-            if (!queuedCommand.equals(matchingQueuedCommand) || queuedCommand.getExpireTask().isCancelled()) {
-                // To be safe, but this shouldn't happen since we cancel old commands before add new once.
-                Logging.finer("This is an old queue command already.");
-                return;
-            }
-            queuedCommand.getSender().sendMessage("Your queued command has expired.");
-            this.queuedCommandMap.remove(queuedCommand.getSender());
-        };
-    }
-
-    /**
-     * Runs the command in queue for the given sender, if any.
-     *
-     * @param sender    {@link CommandSender} that confirmed the command.
-     * @return True if queued command ran successfully, else false.
-     */
-    public boolean runQueuedCommand(@NotNull CommandSender sender) {
-        CommandSender targetSender = parseSender(sender);
-        QueuedCommand queuedCommand = this.queuedCommandMap.get(targetSender);
-        if (queuedCommand == null) {
-            sender.sendMessage(ChatColor.RED + "You do not have any commands in queue.");
-            return false;
-        }
-        Logging.finer("Running queued command...");
-        queuedCommand.getAction().run();
-        return removeFromQueue(targetSender);
-    }
-
-    /**
-     * Since only one command is stored in queue per sender, we remove the old one.
-     *
-     * @param sender    The {@link CommandSender} that executed the command.
-     * @return True if queue command is removed from sender successfully, else false.
-     */
-    public boolean removeFromQueue(@NotNull CommandSender sender) {
-        CommandSender targetSender = parseSender(sender);
-        QueuedCommand previousCommand = this.queuedCommandMap.remove(targetSender);
-        if (previousCommand == null) {
-            Logging.finer("No queue command to remove for sender %s.", targetSender.getName());
-            return false;
-        }
-        previousCommand.getExpireTask().cancel();
-        Logging.finer("Removed queue command for sender %s.", targetSender.getName());
-        return true;
-    }
-
-    /**
-     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
-     * So confirm command can be used for a queue command on another command block.
-     *
-     * @param sender    The sender to parse.
-     * @return The sender, or if its a command block, a {@link DummyCommandBlockSender}.
-     */
-    @NotNull
-    private CommandSender parseSender(@NotNull CommandSender sender) {
-        Logging.fine(sender.getClass().getName());
-        if (isCommandBlock(sender)) {
-            Logging.finer("Is command block.");
-            return COMMAND_BLOCK;
-        }
-        return sender;
-    }
-
-    /**
-     * Check if sender is a command block.
-     *
-     * @param sender    The sender to check on.
-     * @return True if sender is a command block, else false.
-     */
-    private boolean isCommandBlock(@NotNull CommandSender sender) {
-        return sender instanceof BlockCommandSender
-                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/DummyCommandBlockSender.java

@@ -1,104 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.queue;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Set;
-
-/**
- * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
- */
-class DummyCommandBlockSender implements CommandSender {
-
-    @Override
-    public void sendMessage(@NotNull String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendMessage(@NotNull String[] messages) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull Server getServer() {
-        return Bukkit.getServer();
-    }
-
-    @Override
-    public @NotNull String getName() {
-        return "DummyCommandBlockSender";
-    }
-
-    @Override
-    public boolean isPermissionSet(@NotNull String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isPermissionSet(@NotNull Permission perm) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasPermission(@NotNull String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasPermission(@NotNull Permission perm) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeAttachment(@NotNull PermissionAttachment attachment) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void recalculatePermissions() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull Set<PermissionAttachmentInfo> getEffectivePermissions() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isOp() {
-        return true;
-    }
-
-    @Override
-    public void setOp(boolean value) {
-        throw new UnsupportedOperationException();
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/QueuedCommand.java

@@ -1,86 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * 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.commandtools.queue;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitTask;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
- * dangerous action.
- */
-public class QueuedCommand {
-
-    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
-    private static final int DEFAULT_VALID_TIME = 10;
-
-    private final CommandSender sender;
-    private final Runnable action;
-    private final String prompt;
-    private final int validDuration;
-    private BukkitTask expireTask;
-
-    public QueuedCommand(CommandSender sender, Runnable action) {
-        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
-        this(sender, action, prompt, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
-        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
-    }
-
-    /**
-     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
-     *
-     * @param sender        The sender that ran the command needed for confirmation.
-     * @param action        The logic to execute upon confirming.
-     * @param prompt        Question to ask sender to confirm.
-     * @param validDuration Duration in which the command is valid for confirm in seconds.
-     */
-    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
-        this.sender = sender;
-        this.action = action;
-        this.prompt = prompt;
-        this.validDuration = validDuration;
-    }
-
-    @NotNull
-    CommandSender getSender() {
-        return sender;
-    }
-
-    @NotNull
-    String getPrompt() {
-        return prompt;
-    }
-
-    int getValidDuration() {
-        return validDuration;
-    }
-
-    @NotNull
-    Runnable getAction() {
-        return action;
-    }
-
-    @NotNull
-    BukkitTask getExpireTask() {
-        return expireTask;
-    }
-
-    void setExpireTask(@NotNull BukkitTask expireTask) {
-        if (this.expireTask != null) {
-            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
-        }
-        this.expireTask = expireTask;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Manager queuing of dangerous commands in need of confirmation.
- */
-package com.onarandombox.MultiverseCore.commandtools.queue;

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

@@ -22,8 +22,6 @@ public class EntryFee extends SerializationConfig {
     @Nullable
     private Material currency;
 
-    private final Material DISABLED_MATERIAL = Material.AIR;
-
     public EntryFee() {
         super();
     }
@@ -53,9 +51,6 @@ public class EntryFee extends SerializationConfig {
      */
     @Nullable
     public Material getCurrency() {
-        if (currency == null || currency.equals(DISABLED_MATERIAL)) {
-            return null;
-        }
         return currency;
     }
 

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

@@ -1,7 +0,0 @@
-package com.onarandombox.MultiverseCore.enums;
-
-public enum RespawnType {
-    BED,
-    ANCHOR,
-    OTHER
-}

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,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 com.dumptruckman.minecraft.util.Logging;
-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);
-        Logging.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,12 +5,14 @@ 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 abstract class MVChatListener implements Listener {
+public class MVChatListener implements Listener {
     private final MultiverseCore plugin;
     private final MVWorldManager worldManager;
     private final MVPlayerListener playerListener;
@@ -22,10 +24,11 @@ public abstract class MVChatListener implements Listener {
     }
 
     /**
-     * This handles a {@link ChatEvent}.
-     * @param event The {@link ChatEvent}.
+     * This method is called when an a player sends a chat message.
+     * @param event The Event that was fired.
      */
-    public void playerChat(ChatEvent event) {
+    @EventHandler
+    public void playerChat(AsyncPlayerChatEvent event) {
         if (event.isCancelled()) {
             return;
         }

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

@@ -1,36 +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 com.dumptruckman.minecraft.util.Logging;
-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);
-        Logging.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

@@ -15,9 +15,7 @@ import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.RespawnType;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
-import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -71,16 +69,9 @@ public class MVPlayerListener implements Listener {
             return;
         }
 
-        RespawnType respawnType = RespawnType.OTHER;
-        if (event.isBedSpawn()) {
-            respawnType = RespawnType.BED;
-        }
-        if (CompatibilityLayer.isAnchorSpawn(event)) {
-            respawnType = RespawnType.ANCHOR;
-        }
 
-        if (mvWorld.getBedRespawn() && (respawnType == RespawnType.BED || respawnType == RespawnType.ANCHOR)) {
-            Logging.fine("Spawning %s at their %s", event.getPlayer().getName(), respawnType);
+        if (mvWorld.getBedRespawn() && event.isBedSpawn()) {
+            Logging.fine("Spawning " + event.getPlayer().getName() + " at their bed");
             return;
         }
 

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/utils/CompatibilityLayer.java

@@ -1,46 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Bukkit;
-import org.bukkit.event.player.PlayerRespawnEvent;
-
-import java.lang.reflect.Method;
-
-/**
- * A utility class to enable version specific minecraft features.
- */
-public class CompatibilityLayer {
-
-    private static Method checkAnchorSpawn;
-
-    /**
-     * Initialise the reflection methods.
-     */
-    public static void init() {
-        try {
-            checkAnchorSpawn = PlayerRespawnEvent.class.getDeclaredMethod("isAnchorSpawn");
-        } catch (NoSuchMethodException e) {
-            Logging.fine("%s does not support respawn anchors.", Bukkit.getVersion());
-        }
-    }
-
-    /**
-     * Check if the respawn point is of respawn anchor type.
-     * Introduced in minecraft 1.16
-     *
-     * @param event A player respawn event.
-     * @return If the respawn location is an anchor point.
-     */
-    public static boolean isAnchorSpawn(PlayerRespawnEvent event) {
-        if (checkAnchorSpawn == null) {
-            return false;
-        }
-        try {
-            return (boolean) checkAnchorSpawn.invoke(event);
-        } catch (Exception e) {
-            Logging.warning("Error checking for: %s", checkAnchorSpawn);
-            e.printStackTrace();
-        }
-        return false;
-    }
-}

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

@@ -40,15 +40,6 @@ public class SimpleLocationManipulation implements LocationManipulation {
         orientationInts.put("w", 90);
         orientationInts.put("nw", 135);
 
-        orientationInts.put("north", 180);
-        orientationInts.put("northeast", 225);
-        orientationInts.put("east", 270);
-        orientationInts.put("southeast", 315);
-        orientationInts.put("south", 0);
-        orientationInts.put("southwest", 45);
-        orientationInts.put("west", 90);
-        orientationInts.put("northwest", 135);
-
         // "freeze" the map:
         ORIENTATION_INTS = Collections.unmodifiableMap(orientationInts);
         // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck

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

@@ -50,10 +50,6 @@ public class TestEntryFeeConversion {
         WorldProperties props = new WorldProperties(config);
         assertNull(props.entryfee.getCurrency());
 
-        entryFee.put("currency", 0);
-        props = new WorldProperties(config);
-        assertNull(props.entryfee.getCurrency());
-
         entryFee.put("currency", 1);
         props = new WorldProperties(config);
         assertEquals(Material.STONE, props.entryfee.getCurrency());

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.MVAsyncPlayerChatListener;
+import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 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);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        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);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         // never because it's hidden!
         verify(playerChatEvent, never()).setFormat(
                 "[" + mvWorld.getColoredWorldString() + "]" + "format");
         mvWorld.setHidden(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        core.getChatListener().playerChat(playerChatEvent);
         verify(playerChatEvent).setFormat("[" + mvWorld.getColoredWorldString() + "]" + "format");
         core.getMVConfig().setPrefixChat(false);
-        ((MVAsyncPlayerChatListener) core.getChatListener()).playerChat(playerChatEvent);
+        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/TestInstanceCreator.java

@@ -10,6 +10,7 @@ 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;
@@ -214,18 +215,11 @@ public class TestInstanceCreator {
             serverfield.set(core, mockServer);
 
             // Set buscript
-            Buscript buscript;
+            Buscript buscript = PowerMockito.spy(new Buscript(core));
             Field buscriptfield = MultiverseCore.class.getDeclaredField("buscript");
             buscriptfield.setAccessible(true);
-
-            try {
-                buscript = PowerMockito.spy(new Buscript(core));
-                when(buscript.getPlugin()).thenReturn(core);
-            } catch (NullPointerException e) {
-                buscript = null;
-            }
-
             buscriptfield.set(core, buscript);
+            when(buscript.getPlugin()).thenReturn(core);
 
             // Set worldManager
             WorldManager wm = PowerMockito.spy(new WorldManager(core));
@@ -251,6 +245,12 @@ 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);