Update to Maven

* Project changed to Maven * ArrayList changed to HashSet
AhmHkn0 · Sep 7, 2021 · ec4c4f2 · ec4c4f2
1 parent 1714fc0
commit ec4c4f2
Show file tree

Hide file tree

Showing 5 changed files with 870 additions and 22 deletions.
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
diff --git a/src/me/AhmHkn/ChatCooldown/Main.java → ...ain/java/me/AhmHkn/ChatCooldown/Main.java b/src/me/AhmHkn/ChatCooldown/Main.java → ...ain/java/me/AhmHkn/ChatCooldown/Main.java
@@ -1,6 +1,9 @@
 package me.AhmHkn.ChatCooldown;
 
-import java.util.ArrayList;
+import java.util.HashSet;
+
+import me.AhmHkn.ChatCooldown.bStats.Metrics;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -11,38 +14,39 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class Main extends JavaPlugin implements Listener {
-    ArrayList<String> cooldownlist = new ArrayList<>();
+    public static HashSet<Player> cooldownlist;
     public static Main plugin;
+    public static Integer cooldown;
+    public static Metrics metrics;
 
-    int Cooldown;
 
     public void onEnable() {
+        saveDefaultConfig();
         plugin = this;
-        this.saveDefaultConfig();
-        this.Cooldown = getConfig().getInt("Cooldown");
+        cooldown = getConfig().getInt("Cooldown");
+        cooldownlist = new HashSet<>();
         getServer().getPluginManager().registerEvents(plugin, plugin);
+        int pluginID = 12728;
+        metrics = new Metrics(plugin, pluginID);
     }
 
     @EventHandler
     public void onPlayerChat(AsyncPlayerChatEvent e) {
-        final Player p = e.getPlayer();
+        Player p = e.getPlayer();
         if (p.hasPermission("chatcooldown.bypass"))
             return;
-        if (plugin.cooldownlist.contains(p.getName())) {
+        if (cooldownlist.contains(p)) {
             msg(p, "Message");
             e.setCancelled(true);
         } else {
-            plugin.cooldownlist.add(p.getName());
-            e.getPlayer().getServer().getScheduler().scheduleAsyncDelayedTask(this, new Runnable() {
-
-                public void run() {
-                    if (Main.plugin.cooldownlist.contains(p.getName()))
-                        Main.plugin.cooldownlist.remove(p.getName());
-                }
-            }, (20L * plugin.Cooldown));
+            cooldownlist.add(p);
+            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+                cooldownlist.remove(p);
+            }, 10L * cooldown);
         }
     }
 
+
     public static void msg(Player p, String cfg) {
         p.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("Prefix")) + ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString(cfg)));
     }
@@ -68,4 +72,4 @@ public boolean onCommand(CommandSender sender, Command cmd, String s, String[] a
     }
 
 
-}
+}