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

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

View File

@ -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) {

View File

@ -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) { }
}
}