minecraft-mods/login_protection
Private
Public Access
1
0
Fork 0
Code Issues 1 Projects Releases 16 Wiki Activity

Fixed dumb error in ProtectedPlayers.java getPlayer method. Fixed client crash when joining server and clicking/pressing keys.

Browse Source
This commit is contained in:
micle
2021-06-03 20:37:18 +01:00
parent e900082a27
commit 26153775c3
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
View File

@ -22,14 +22,14 @@ public class ProtectedPlayers {
} }
public ProtectedPlayer getPlayer(UUID player_uuid) { public ProtectedPlayer getPlayer(UUID player_uuid) {
ProtectedPlayer player = null; ProtectedPlayer player;
for (ProtectedPlayer protected_player : protected_players) { for (ProtectedPlayer protected_player : protected_players) {
player = protected_player; player = protected_player;
if (player.getPlayerUUID() == player_uuid) { if (player.getPlayerUUID() == player_uuid) {
break; return player;
} }
} }
return player; return null;
} }
public void removePlayer(UUID player_uuid) { public void removePlayer(UUID player_uuid) {

9
src/main/java/com/micle/loginprotection/events/OnKeyPressEventHandler.java
View File

@ -7,6 +7,7 @@ import net.minecraft.client.multiplayer.ServerData;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
public class OnKeyPressEventHandler { public class OnKeyPressEventHandler {
@ -15,7 +16,9 @@ public class OnKeyPressEventHandler {
public void KeyPressEvent(InputEvent.KeyInputEvent event) { public void KeyPressEvent(InputEvent.KeyInputEvent event) {
ServerData server = Minecraft.getInstance().getCurrentServer(); ServerData server = Minecraft.getInstance().getCurrentServer();
if (server == null) { return; } if (server == null) { return; }
LoginProtection.INSTANCE.sendToServer(new C2SKeyPress()); try {
LoginProtection.INSTANCE.sendToServer(new C2SKeyPress());
} catch (NullPointerException ignored) { }
} }
@SubscribeEvent @SubscribeEvent
@ -23,6 +26,8 @@ public class OnKeyPressEventHandler {
public void MouseClickEvent(InputEvent.ClickInputEvent event) { public void MouseClickEvent(InputEvent.ClickInputEvent event) {
ServerData server = Minecraft.getInstance().getCurrentServer(); ServerData server = Minecraft.getInstance().getCurrentServer();
if (server == null) { return; } if (server == null) { return; }
LoginProtection.INSTANCE.sendToServer(new C2SKeyPress()); try {
LoginProtection.INSTANCE.sendToServer(new C2SKeyPress());
} catch (NullPointerException ignored) { }
} }
} }