From fc50b8823c48f4c8a4d3d40fe39b1a66d06e5dc0 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Fri, 27 Aug 2021 22:17:47 +0200
Subject: [PATCH] Don't return null when linking is disabled

---
 .../floodgate/player/FloodgateHandshakeHandler.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java b/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
index f738e1ef..99f6f04e 100644
--- a/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
+++ b/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
@@ -35,7 +35,7 @@ import com.google.common.cache.CacheBuilder;
 import io.netty.channel.Channel;
 import io.netty.util.AttributeKey;
 import it.unimi.dsi.fastutil.Pair;
-import it.unimi.dsi.fastutil.objects.ObjectObjectMutablePair;
+import it.unimi.dsi.fastutil.objects.ObjectObjectImmutablePair;
 import java.net.InetSocketAddress;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -279,10 +279,10 @@ public final class FloodgateHandshakeHandler {
 
     private CompletableFuture<Pair<BedrockData, LinkedPlayer>> fetchLinkedPlayer(BedrockData data) {
         if (!api.getPlayerLink().isEnabled()) {
-            return CompletableFuture.completedFuture(null);
+            return CompletableFuture.completedFuture(new ObjectObjectImmutablePair<>(data, null));
         }
         return api.getPlayerLink().getLinkedPlayer(Utils.getJavaUuid(data.getXuid()))
-                .thenApply(link -> new ObjectObjectMutablePair<>(data, link));
+                .thenApply(link -> new ObjectObjectImmutablePair<>(data, link));
     }
 
     public enum ResultType {