From 0f1950b5cde2450deff9b9cb9c61a1cfecde07e3 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 24 May 2022 00:00:46 +0100 Subject: [PATCH] Fixed damage event not cancelling when it should. --- .../loginprotection/events/OnPlayerDamageEventHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java b/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java index 97d0199..d1282f4 100755 --- a/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java +++ b/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java @@ -11,8 +11,8 @@ public class OnPlayerDamageEventHandler { public void LivingDamageEvent(LivingDamageEvent event) { if (!(event.getEntity() instanceof Player player)) { return; } ProtectedPlayer protectedPlayer = ProtectedPlayerManager.getPlayer(player.getUUID()); - if (protectedPlayer == null || protectedPlayer.getState().equals(ProtectedPlayer.State.JOINING) || - protectedPlayer.getState().equals(ProtectedPlayer.State.AFK) || protectedPlayer.getGracePeriodTimeRemaining() == 0) { + if (protectedPlayer == null || protectedPlayer.getState().equals(ProtectedPlayer.State.ACTIVE) && + protectedPlayer.getGracePeriodTimeRemaining() == 0) { return; } event.setCanceled(true);