Apple
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

null safety on auth/handshake errors

This commit is contained in:
Blue Kelp 2019-08-02 13:54:40 -07:00
parent f62aa390d2
commit 5f93b5bec4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View File

@ -158,8 +158,12 @@ public class GeyserSession implements PlayerSession, Player {
public void disconnect(String reason) {
if (!closed) {
loggedIn = false;
downstream.getSession().disconnect(reason);
upstream.disconnect(reason);
if (downstream != null && downstream.getSession() != null) {
downstream.getSession().disconnect(reason);
}
if (upstream != null) {
upstream.disconnect(reason);
}
}
}

9
connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
View File

@ -150,10 +150,13 @@ public class LoginEncryptionUtils {
return false;
CustomFormResponse response = (CustomFormResponse) customFormWindow.getResponse();
String email = response.getInputResponses().get(2);
String password = response.getInputResponses().get(3);
session.authenticate(email, password);
if (response != null) {
String email = response.getInputResponses().get(2);
String password = response.getInputResponses().get(3);
session.authenticate(email, password);
}
// TODO should we clear the window cache in all cases or just if not already logged in?
// Clear windows so authentication data isn't accidentally cached