Add Messaging! (finally)

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

@@ -33,7 +33,6 @@ import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
 import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.utils.SpoutInterface;
-import com.onarandombox.MultiverseCore.utils.UpdateChecker;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
@@ -208,6 +207,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.getServer().getPluginManager().disablePlugin(this);
             return;
         }
+        this.messaging = new MVMessaging();
         this.banker = new AllPay(this, LOG_TAG + " ");
         // Output a little snippet to show it's enabled.
         this.log(Level.INFO, "- Version " + this.getDescription().getVersion() + " (API v" + PROTOCOL + ") Enabled - By " + getAuthors());
@@ -362,7 +362,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         FirstSpawnOverride = this.multiverseConfig.getBoolean("firstspawnoverride", true);
         // Should permissions errors display to users?
         DisplayPermErrors = this.multiverseConfig.getBoolean("displaypermerrors", true);
-        this.messaging = new MVMessaging(this);
+
         this.messaging.setCooldown(this.multiverseConfig.getInt("messagecooldown", 5000));
         this.saveMVConfigs();
     }

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

@@ -11,18 +11,16 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 public class MVMessaging {
-    private MultiverseCore plugin;
-    private Map<String, Date> sentList;
-    private int cooldown = 1000;
+    private Map<String, Long> sentList;
+    private int cooldown;
 
-    public MVMessaging(MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.sentList = new HashMap<String, Date>();
+    public MVMessaging() {
+        this.sentList = new HashMap<String, Long>();
+        this.cooldown = 5000;
     }
 
     public void setCooldown(int milliseconds) {
@@ -35,28 +33,22 @@ public class MVMessaging {
      * @param sender         The person/console to send the message to.
      * @param message        The message to send.
      * @param ignoreCooldown If true this message will always be sent. Useful for things like menus
-     *
      * @return true if the message was sent, false if not.
      */
     public boolean sendMessage(CommandSender sender, String message, boolean ignoreCooldown) {
-        if (!(sender instanceof Player) || ignoreCooldown) {
-            sender.sendMessage(message);
-            return true;
-        }
-        if (!this.sentList.containsKey(sender.getName())) {
-            sender.sendMessage(message);
-            this.sentList.put(sender.getName(), new Date());
-            return true;
-        } else {
-            if (this.sentList.get(sender.getName()).after(new Date((new Date()).getTime() + this.cooldown))) {
-                sender.sendMessage(message);
-                this.sentList.put(sender.getName(), new Date());
-                return true;
-            }
-        }
-        return false;
+        return this.sendMessages(sender, new String[]{ message }, ignoreCooldown);
     }
 
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
     public boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown) {
         if (!(sender instanceof Player) || ignoreCooldown) {
 
@@ -65,27 +57,26 @@ public class MVMessaging {
         }
         if (!this.sentList.containsKey(sender.getName())) {
             this.sendMessages(sender, messages);
-            this.sentList.put(sender.getName(), new Date());
+            this.sentList.put(sender.getName(), System.currentTimeMillis());
             return true;
         } else {
-            if (this.sentList.get(sender.getName()).after(new Date((new Date()).getTime() + this.cooldown))) {
+            long time = System.currentTimeMillis();
+            if (time >= this.sentList.get(sender.getName()) + this.cooldown) {
                 this.sendMessages(sender, messages);
-                this.sentList.put(sender.getName(), new Date());
+                this.sentList.put(sender.getName(), System.currentTimeMillis());
                 return true;
             }
         }
         return false;
     }
 
-    public boolean sendMessage(CommandSender sender, String message) {
-        return this.sendMessage(sender, message, true);
+    private void sendMessage(CommandSender sender, String message) {
+        sender.sendMessage(message);
     }
 
-    public boolean sendMessages(CommandSender sender, String[] messages) {
-        boolean success = true;
+    private void sendMessages(CommandSender sender, String[] messages) {
         for (String s : messages) {
-            success = (!(!this.sendMessage(sender, s, true) && success));
+            sender.sendMessage(s);
         }
-        return success;
     }
 }

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

@@ -282,11 +282,11 @@ public class SafeTTeleporter {
         }
         if (e instanceof Player) {
             Player p = (Player) e;
-            this.plugin.getMessaging().sendMessage(p, "No safe locations found!");
+            this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
             this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
         } else if (e.getPassenger() instanceof Player) {
             Player p = (Player) e.getPassenger();
-            this.plugin.getMessaging().sendMessage(p, "No safe locations found!");
+            this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
             this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
         }
         this.plugin.log(Level.FINE, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");

src/main/resources/defaults/config.yml

@@ -8,7 +8,8 @@ worldnameprefix: true
 enforceaccess: true
 enforcegamemodes: true
 bedrespawn: true
-version: 2.5
+version: 2.6
 displaypermerrors: true
 teleportintercept: true
 firstspawnoverride: true
+messagecooldown: 5000