From 763ede8817270fc0ceaad4a3d2b0c7ce3c40b2ed Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Thu, 20 Jan 2022 19:34:14 +0100
Subject: [PATCH] Don't assume that BedrockData can't be null

---
 .../org/geysermc/floodgate/util/SpigotHandshakeHandler.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotHandshakeHandler.java b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotHandshakeHandler.java
index f14d569c..b425fb67 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotHandshakeHandler.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotHandshakeHandler.java
@@ -37,6 +37,12 @@ public class SpigotHandshakeHandler implements HandshakeHandler {
 
     @Override
     public void handle(HandshakeData data) {
+        // we never have to do anything when BedrockData is null.
+        // BedrockData is null when something went wrong (e.g. invalid key / exception)
+        if (data.getBedrockData() == null) {
+            return;
+        }
+
         BedrockData bedrockData = data.getBedrockData();
         UUID correctUuid = data.getCorrectUniqueId();