Added permission to bypass command cooldowns

BG-Software-LLC · Feb 26, 2022 · 5c42b45 · 5c42b45
1 parent 464bc1c
commit 5c42b45
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/CommandsHandler.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/CommandsHandler.java
@@ -4,6 +4,7 @@
 import com.bgsoftware.superiorskyblock.api.commands.SuperiorCommand;
 import com.bgsoftware.superiorskyblock.api.handlers.CommandsManager;
 import com.bgsoftware.superiorskyblock.api.island.Island;
+import com.bgsoftware.superiorskyblock.api.objects.Pair;
 import com.bgsoftware.superiorskyblock.api.wrappers.SuperiorPlayer;
 import com.bgsoftware.superiorskyblock.handler.AbstractHandler;
 import com.bgsoftware.superiorskyblock.lang.Message;
@@ -245,26 +246,30 @@ public boolean execute(CommandSender sender, String label, String[] args) {
 
                     String commandLabel = command.getAliases().get(0);
 
-                    if (sender instanceof Player && plugin.getSettings().getCommandsCooldown().containsKey(commandLabel)) {
+                    if (sender instanceof Player) {
                         UUID uuid = ((Player) sender).getUniqueId();
-
-                        long timeToExecute = commandsCooldown.containsKey(uuid) && commandsCooldown.get(uuid).containsKey(commandLabel) ?
-                                commandsCooldown.get(uuid).get(commandLabel) : -1;
-
-                        long timeNow = System.currentTimeMillis();
-
-                        if (timeNow < timeToExecute) {
-                            Message.COMMAND_COOLDOWN_FORMAT.send(sender, locale,
-                                    StringUtils.formatTime(locale, timeToExecute - timeNow, TimeUnit.MILLISECONDS));
-                            return false;
+                        SuperiorPlayer superiorPlayer = plugin.getPlayers().getSuperiorPlayer(uuid);
+                        if (!superiorPlayer.hasPermission("superior.admin.bypass.cooldowns")) {
+                            Pair<Integer, String> commandCooldown = plugin.getSettings().getCommandsCooldown().get(commandLabel);
+                            if (commandCooldown != null) {
+                                Map<String, Long> playerCooldowns = commandsCooldown.get(uuid);
+                                long timeNow = System.currentTimeMillis();
+
+                                if (playerCooldowns != null) {
+                                    Long timeToExecute = playerCooldowns.get(commandLabel);
+                                    if (timeToExecute != null) {
+                                        if (timeNow < timeToExecute) {
+                                            Message.COMMAND_COOLDOWN_FORMAT.send(sender, locale,
+                                                    StringUtils.formatTime(locale, timeToExecute - timeNow, TimeUnit.MILLISECONDS));
+                                            return false;
+                                        }
+                                    }
+                                }
+
+                                commandsCooldown.computeIfAbsent(uuid, u -> new HashMap<>()).put(commandLabel,
+                                        timeNow + commandCooldown.getKey());
+                            }
                         }
-
-                        if (!commandsCooldown.containsKey(uuid)) {
-                            commandsCooldown.put(uuid, new HashMap<>());
-                        }
-
-                        commandsCooldown.get(uuid).put(commandLabel,
-                                timeNow + plugin.getSettings().getCommandsCooldown().get(commandLabel).getKey());
                     }
 
                     command.execute(plugin, sender, args);