From 696feae22a56bc05ccbc8c975f75810ffeb70da8 Mon Sep 17 00:00:00 2001
From: Micle <micle@micle.dev>
Date: Wed, 8 Jun 2022 12:49:24 +0100
Subject: [PATCH] OnPlayerDamageEventHandler: Removed old grace period time
 remaining check.

---
 .../events/OnPlayerDamageEventHandler.java            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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);
     }
 }