11.0.0.0: (CheatPrevention) Fixed blocked command message not showing…

… up sometimes.
SolarMC-Dev · May 27, 2021 · d6c168a · d6c168a
1 parent b67dd10
commit d6c168a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...ansion/src/main/java/combatlogx/expansion/cheat/prevention/listener/ListenerCommands.java b/...ansion/src/main/java/combatlogx/expansion/cheat/prevention/listener/ListenerCommands.java
@@ -131,6 +131,6 @@ private void checkEvent(PlayerCommandPreprocessEvent e) {
 
         e.setCancelled(true);
         Replacer replacer = message -> message.replace("{command}", realCommand);
-        sendMessage(player, "expansion.cheat-prevention.command-blocked", replacer);
+        sendMessageIgnoreCooldown(player, "expansion.cheat-prevention.command-blocked", replacer);
     }
-}
+}
diff --git a/...src/main/java/combatlogx/expansion/cheat/prevention/listener/CheatPreventionListener.java b/...src/main/java/combatlogx/expansion/cheat/prevention/listener/CheatPreventionListener.java
@@ -20,14 +20,18 @@ public CheatPreventionListener(Expansion expansion) {
         this.messageCooldownMap = new HashMap<>();
     }
 
+    protected final void sendMessageIgnoreCooldown(Player player, String key, Replacer replacer) {
+        LanguageManager languageManager = getLanguageManager();
+        languageManager.sendMessage(player, key, replacer, true);
+        addMessageCooldown(player, key);
+    }
+
     protected final void sendMessage(Player player, String key, Replacer replacer) {
         long systemMillis = System.currentTimeMillis();
         long expireMillis = getCooldownExpireTime(player, key);
-        if(expireMillis < systemMillis) return;
+        if(systemMillis < expireMillis) return;
 
-        LanguageManager languageManager = getLanguageManager();
-        languageManager.sendMessage(player, key, replacer, true);
-        addMessageCooldown(player, key);
+        sendMessageIgnoreCooldown(player, key, replacer);
     }
 
     private long getNewMessageCooldownExpireTime() {