From 26153775c3f3d82f16ea7bfc712ddb93ff3cee76 Mon Sep 17 00:00:00 2001
From: micle <realmicle@protonmail.com>
Date: Thu, 3 Jun 2021 20:37:18 +0100
Subject: [PATCH] Fixed dumb error in ProtectedPlayers.java getPlayer method.
 Fixed client crash when joining server and clicking/pressing keys.

---
 .../com/micle/loginprotection/data/ProtectedPlayers.java | 6 +++---
 .../loginprotection/events/OnKeyPressEventHandler.java   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java b/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
index 38bd5e1..14c912f 100644
--- a/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
+++ b/src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
@@ -22,14 +22,14 @@ public class ProtectedPlayers {
     }
 
     public ProtectedPlayer getPlayer(UUID player_uuid) {
-        ProtectedPlayer player = null;
+        ProtectedPlayer player;
         for (ProtectedPlayer protected_player : protected_players) {
             player = protected_player;
             if (player.getPlayerUUID() == player_uuid) {
-                break;
+                return player;
             }
         }
-        return player;
+        return null;
     }
 
     public void removePlayer(UUID player_uuid) {
diff --git a/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java b/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java
index 6235b3a..4e83591 100644
--- a/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java
+++ b/src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java
@@ -7,6 +7,7 @@ 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 {
@@ -15,7 +16,9 @@ public class OnKeyPressEventHandler {
     public void KeyPressEvent(InputEvent.KeyInputEvent event) {
         ServerData server = Minecraft.getInstance().getCurrentServer();
         if (server == null) { return; }
-        LoginProtection.INSTANCE.sendToServer(new C2SKeyPress());
+        try {
+            LoginProtection.INSTANCE.sendToServer(new C2SKeyPress());
+        } catch (NullPointerException ignored) { }
     }
 
     @SubscribeEvent
@@ -23,6 +26,8 @@ public class OnKeyPressEventHandler {
     public void MouseClickEvent(InputEvent.ClickInputEvent event) {
         ServerData server = Minecraft.getInstance().getCurrentServer();
         if (server == null) { return; }
-        LoginProtection.INSTANCE.sendToServer(new C2SKeyPress());
+        try {
+            LoginProtection.INSTANCE.sendToServer(new C2SKeyPress());
+        } catch (NullPointerException ignored) { }
     }
 }