Fixed bug with not synchronized cooldowns of command and command aliases.

Author: MairwunNx

src/main/kotlin/com/mairwunnx/projectessentialscooldown/CooldownAPI.kt

@@ -1,6 +1,7 @@
 package com.mairwunnx.projectessentialscooldown
 
 import com.google.common.collect.HashBasedTable
+import com.mairwunnx.projectessentialscooldown.essentials.CommandsAliases
 import java.time.Duration
 import java.time.ZonedDateTime
 import kotlin.time.ExperimentalTime
@@ -42,6 +43,16 @@ object CooldownAPI {
      */
     fun addCooldown(nickname: String, command: String) {
         removeCooldown(nickname, command)
+        CommandsAliases.aliases.keys.forEach { baseCommand ->
+            val aliasesOfCommands = CommandsAliases.aliases[baseCommand]
+            if (aliasesOfCommands != null &&
+                aliasesOfCommands.contains(command)
+            ) {
+                aliasesOfCommands.forEach {
+                    cooldownTable.put(nickname, it, ZonedDateTime.now())
+                }
+            }
+        }
         cooldownTable.put(nickname, command, ZonedDateTime.now())
     }
 

src/main/kotlin/com/mairwunnx/projectessentialscooldown/CooldownUtils.kt

@@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger
 internal object CooldownUtils {
     private val logger: Logger = LogManager.getLogger()
 
-    internal fun processCooldownsCommandsList(
+    private fun processCooldownsCommandsList(
         cooldowns: List<String>
     ): HashMap<String, Int> {
         val hashMap = hashMapOf<String, Int>()
@@ -47,12 +47,15 @@ internal object CooldownUtils {
             ?: CommandsAliases.searchForAliasesForCooldown(
                 commandName, cooldownsMap
             ).let {
+                logger.info("original command: ${it.b} and cooldown: ${it.a}")
                 originalCommand = it.b
                 return@let it.a
             }
-            ?: cooldownsMap[CooldownAPI.defaultCooldownLiterals[0]]
+            ?: cooldownsMap[CooldownAPI.defaultCooldownLiterals.iterator().next()]
             ?: CooldownAPI.DEFAULT_COOLDOWN
 
+        logger.info("Getting cooldown expired for command: $command when raw command: $commandName")
+        logger.info("Cooldown for $command when raw command $commandName is $commandCooldown")
         if (CooldownAPI.getCooldownIsExpired(commandSenderNickName, command, commandCooldown)) {
             CooldownAPI.addCooldown(commandSenderNickName, command)
             return false

src/main/kotlin/com/mairwunnx/projectessentialscooldown/essentials/CommandsAliases.kt

@@ -2,6 +2,8 @@ package com.mairwunnx.projectessentialscooldown.essentials
 
 import com.mairwunnx.projectessentialscore.extensions.empty
 import net.minecraft.util.Tuple
+import org.apache.logging.log4j.LogManager
+import org.apache.logging.log4j.Logger
 
 /**
  * Command aliases basically for working with
@@ -12,6 +14,7 @@ import net.minecraft.util.Tuple
  * @since 1.14.4-1.0.0.0
  */
 object CommandsAliases {
+    private val logger: Logger = LogManager.getLogger()
     /**
      * This stores all aliases, just add your alias here.
      *
@@ -26,18 +29,15 @@ object CommandsAliases {
         command: String,
         cooldownsMap: HashMap<String, Int>
     ): Tuple<Int?, String> {
-        return try {
-            aliases.keys.forEach { baseCommand ->
-                val aliasesOfCommands = aliases[baseCommand]
-                if (aliasesOfCommands != null &&
-                    aliasesOfCommands.contains(command)
-                ) {
-                    Tuple(cooldownsMap[baseCommand]!!, baseCommand)
-                }
+        aliases.keys.forEach { baseCommand ->
+            val aliasesOfCommands = aliases[baseCommand]
+            if (aliasesOfCommands != null &&
+                command in aliasesOfCommands
+            ) {
+                logger.info("Command: $baseCommand; Cooldown: ${cooldownsMap[baseCommand]}")
+                return Tuple(cooldownsMap[baseCommand], baseCommand)
             }
-            Tuple(null, String.empty)
-        } catch (ex: KotlinNullPointerException) {
-            Tuple(null, String.empty)
         }
+        return Tuple(null, String.empty)
     }
 }