From 58634ef30e1ce1c7ac606c11c2ea01a8fd838e20 Mon Sep 17 00:00:00 2001
From: micle <realmicle@protonmail.com>
Date: Thu, 3 Jun 2021 20:56:04 +0100
Subject: [PATCH] Fixed grace period updating when it shouldn't. Fixed
 singleplayer making player invulnerable.

---
 .../java/com/micle/loginprotection/data/ProtectedPlayers.java | 2 ++
 .../loginprotection/events/OnPlayerJoinEventHandler.java      | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java b/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
index bb8b8d9..fcfd9e8 100644
--- a/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
+++ b/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
@@ -44,6 +44,8 @@ public class ProtectedPlayers {
 
     public void updateGracePeriod(UUID player_uuid) {
         ProtectedPlayer protected_player = getPlayer(player_uuid);
+        if (protected_player.isLoading()) { return; }
+
         int grace_period = protected_player.getGracePeriod()-1;
         protected_player.setGracePeriod(grace_period);
         if (grace_period <= 0) {
diff --git a/src/main/java/com/micle/loginprotection/events/OnPlayerJoinEventHandler.java b/src/main/java/com/micle/loginprotection/events/OnPlayerJoinEventHandler.java
index fa343bc..233de75 100644
--- a/src/main/java/com/micle/loginprotection/events/OnPlayerJoinEventHandler.java
+++ b/src/main/java/com/micle/loginprotection/events/OnPlayerJoinEventHandler.java
@@ -1,12 +1,16 @@
 package com.micle.loginprotection.events;
 
 import com.micle.loginprotection.LoginProtection;
+import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class OnPlayerJoinEventHandler {
     @SubscribeEvent
+    @OnlyIn(Dist.DEDICATED_SERVER)
     public void EntityJoinWorldEvent(PlayerEvent.PlayerLoggedInEvent event) {
         if (!(event.getEntity() instanceof PlayerEntity)) { return; }
         PlayerEntity player = (PlayerEntity) event.getEntity();