missed attack cooldown factor for was_critical

DenizenScript · Oct 28, 2021 · 8cd5adb · 8cd5adb
1 parent 4943158
commit 8cd5adb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -1,5 +1,6 @@
 package com.denizenscript.denizen.events.entity;
 
+import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.ItemTag;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
@@ -188,6 +189,9 @@ public boolean calculateWasCritical() {
             return false;
         }
         Player player = damager.getPlayer();
+        if (NMSHandler.getPlayerHelper().getAttackCooldownPercent(player) < 0.999) { // attack cooldown is also checked in that method earlier
+            return false;
+        }
         if (player.getFallDistance() <= 0 || player.isOnGround() || player.isClimbing() || player.isInWater()) {
             return false;
         }