Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Disconnect client if using an invalid Mojang account (#975)

Browse source 
This commit supresses the NPE that was previously sent when using an invalid Mojang account. Instead, the Bedrock client is disconnected with an error message.
This commit is contained in:
Camotoy 2020-07-18 16:56:12 -04:00 committed by GitHub
parent 64d5390800
commit 221e5bd103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -350,6 +350,11 @@ public class GeyserSession implements CommandSender {
public void connected(ConnectedEvent event) { public void connected(ConnectedEvent event) {
loggingIn = false; loggingIn = false;
loggedIn = true; loggedIn = true;
if (protocol.getProfile() == null) {
// Java account is offline
disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
return;
}
connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect", authData.getName(), protocol.getProfile().getName(), remoteServer.getAddress())); connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.remote.connect", authData.getName(), protocol.getProfile().getName(), remoteServer.getAddress()));
playerEntity.setUuid(protocol.getProfile().getId()); playerEntity.setUuid(protocol.getProfile().getId());
playerEntity.setUsername(protocol.getProfile().getName()); playerEntity.setUsername(protocol.getProfile().getName());