diff --git a/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java b/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java index d1282f4..ea882df 100755 --- a/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java +++ b/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java @@ -9,12 +9,15 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; public class OnPlayerDamageEventHandler { @SubscribeEvent 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.ACTIVE) && - protectedPlayer.getGracePeriodTimeRemaining() == 0) { + if (!(event.getEntity() instanceof Player player)) { return; } + + ProtectedPlayer protectedPlayer = ProtectedPlayerManager.getPlayer(player.getUUID()); + if (protectedPlayer == null || protectedPlayer.getState().equals(ProtectedPlayer.State.ACTIVE)) { + return; + } + event.setCanceled(true); } }