From 47b27d67c8bac1d0898b811e4f5e1a79a79a2ee2 Mon Sep 17 00:00:00 2001
From: micle <realmicle@protonmail.com>
Date: Thu, 3 Jun 2021 20:49:56 +0100
Subject: [PATCH] Optimized imports. Changed ServerTickEventHandler to
 PlayerTickEventHandler and made grace periods are now updated per player.

---
 .../loginprotection/data/ProtectedPlayers.java | 18 +++++++-----------
 .../events/OnKeyPressEventHandler.java         |  1 -
 .../events/OnPlayerTickEventHandler.java       | 14 ++++++++++++++
 .../events/OnServerTickEventHandler.java       | 12 ------------
 .../loginprotection/setup/Registration.java    |  2 +-
 5 files changed, 22 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/com/micle/loginprotection/events/OnPlayerTickEventHandler.java
 delete mode 100644 src/main/java/com/micle/loginprotection/events/OnServerTickEventHandler.java

diff --git a/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java b/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
index 14c912f..bb8b8d9 100644
--- a/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
+++ b/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
@@ -42,17 +42,13 @@ public class ProtectedPlayers {
         player.sendMessage(new StringTextComponent("Grace Period over!"), player_uuid);
     }
 
-    public void updateGracePeriods() {
-        for (ProtectedPlayer protected_player : protected_players) {
-            if (protected_player.isLoading()) { continue; }
-
-            int grace_period = protected_player.getGracePeriod()-1;
-            protected_player.setGracePeriod(grace_period);
-            if (grace_period <= 0) {
-                removePlayer(protected_player.getPlayerUUID());
-                System.out.println(protected_player.getPlayerUUID() + " is no longer being protected!");
-                break;
-            }
+    public void updateGracePeriod(UUID player_uuid) {
+        ProtectedPlayer protected_player = getPlayer(player_uuid);
+        int grace_period = protected_player.getGracePeriod()-1;
+        protected_player.setGracePeriod(grace_period);
+        if (grace_period <= 0) {
+            removePlayer(player_uuid);
+            System.out.println(protected_player.getPlayerUUID() + " is no longer being protected!");
         }
     }
 }
diff --git a/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java b/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java
index 4e83591..6f44862 100644
--- a/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java
+++ b/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java
@@ -7,7 +7,6 @@ import net.minecraft.client.multiplayer.ServerData;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.InputEvent;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class OnKeyPressEventHandler {
diff --git a/src/main/java/com/micle/loginprotection/events/OnPlayerTickEventHandler.java b/src/main/java/com/micle/loginprotection/events/OnPlayerTickEventHandler.java
new file mode 100644
index 0000000..a8c7a86
--- /dev/null
+++ b/src/main/java/com/micle/loginprotection/events/OnPlayerTickEventHandler.java
@@ -0,0 +1,14 @@
+package com.micle.loginprotection.events;
+
+import com.micle.loginprotection.LoginProtection;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+public class OnPlayerTickEventHandler {
+    @SubscribeEvent
+    public void PlayerTickEvent(TickEvent.PlayerTickEvent event) {
+        if (LoginProtection.protected_players.getPlayer(event.player.getUUID()) == null) { return; }
+
+        LoginProtection.protected_players.updateGracePeriod(event.player.getUUID());
+    }
+}
diff --git a/src/main/java/com/micle/loginprotection/events/OnServerTickEventHandler.java b/src/main/java/com/micle/loginprotection/events/OnServerTickEventHandler.java
deleted file mode 100644
index 4896ce4..0000000
--- a/src/main/java/com/micle/loginprotection/events/OnServerTickEventHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.micle.loginprotection.events;
-
-import com.micle.loginprotection.LoginProtection;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-
-public class OnServerTickEventHandler {
-    @SubscribeEvent
-    public void ServerTickEvent(TickEvent.ServerTickEvent event) {
-        LoginProtection.protected_players.updateGracePeriods();
-    }
-}
diff --git a/src/main/java/com/micle/loginprotection/setup/Registration.java b/src/main/java/com/micle/loginprotection/setup/Registration.java
index 473ed85..c0ad513 100644
--- a/src/main/java/com/micle/loginprotection/setup/Registration.java
+++ b/src/main/java/com/micle/loginprotection/setup/Registration.java
@@ -13,7 +13,7 @@ public class Registration {
 
         MinecraftForge.EVENT_BUS.register(new OnPlayerJoinEventHandler());
         MinecraftForge.EVENT_BUS.register(new OnPlayerDamageEventHandler());
-        MinecraftForge.EVENT_BUS.register(new OnServerTickEventHandler());
+        MinecraftForge.EVENT_BUS.register(new OnPlayerTickEventHandler());
         MinecraftForge.EVENT_BUS.register(new OnKeyPressEventHandler());
         MinecraftForge.EVENT_BUS.register(new OnPlayerLeaveEventHandler());