From baede33abc12f381577e075cbcdf3f3874995924 Mon Sep 17 00:00:00 2001 From: games647 Date: Tue, 15 Jun 2021 10:31:53 +0200 Subject: [PATCH] Make Bedrock check nullsafe If the UUID was not set by FloodGate or any other plugin, it's null by in BungeeCord Fixes #548 --- .../games647/fastlogin/bungee/listener/ConnectListener.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java index 8a81b142..90ddd944 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java @@ -217,9 +217,11 @@ public class ConnectListener implements Listener { // Floodgate will set a correct UUID at the beginning of the PreLoginEvent // and will cancel the online mode login for those players // Therefore we just ignore those - if (floodgateHook == null) { + if (floodgateHook == null || correctedUUID == null) { + // Also ignore if not set by floodgate or any other plugin return false; } + return this.floodgateHook.isBedrockPlayer(correctedUUID); } }