git-mirrors/GeyserConnect
1
0
Fork 1
mirror of https://github.com/GeyserMC/GeyserConnect.git synced 2025-06-26 14:15:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPE when user disconnects from embedded Geyser server

Browse source
This commit is contained in:
rtm516 2020-12-10 10:15:38 +00:00
parent f014ca4ef8
commit 9d1ecdf52c
No known key found for this signature in database
GPG key ID: 331715B8B007C67A
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/geysermc/connect/proxy/ProxyConnectorServerEventHandler.java
View file

@ -53,6 +53,14 @@ public class ProxyConnectorServerEventHandler extends ConnectorServerEventHandle
// Add another disconnect handler to remove the player on final disconnect // Add another disconnect handler to remove the player on final disconnect
bedrockServerSession.addDisconnectHandler(disconnectReason -> { bedrockServerSession.addDisconnectHandler(disconnectReason -> {
// Make sure nothing is null before locating the player
if (MasterServer.getInstance() == null
|| MasterServer.getInstance().getPlayers().size() == 0
|| session.getAuthData() == null
|| session.getAuthData().getXboxUUID() == null) {
return;
}
Player player = MasterServer.getInstance().getPlayers().get(session.getAuthData().getXboxUUID()); Player player = MasterServer.getInstance().getPlayers().get(session.getAuthData().getXboxUUID());
if (player != null) { if (player != null) {
MasterServer.getInstance().getLogger().debug("Player disconnected from Geyser proxy: " + player.getDisplayName() + " (" + disconnectReason + ")"); MasterServer.getInstance().getLogger().debug("Player disconnected from Geyser proxy: " + player.getDisplayName() + " (" + disconnectReason + ")");