GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Don't return null when linking is disabled

Browse Source
This commit is contained in:
Tim203
2021-08-27 22:17:47 +02:00
parent 1ec0d7e8fb
commit fc50b8823c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
View File

@@ -35,7 +35,7 @@ import com.google.common.cache.CacheBuilder;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.util.AttributeKey; import io.netty.util.AttributeKey;
import it.unimi.dsi.fastutil.Pair; 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.net.InetSocketAddress;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@@ -279,10 +279,10 @@ public final class FloodgateHandshakeHandler {
private CompletableFuture<Pair<BedrockData, LinkedPlayer>> fetchLinkedPlayer(BedrockData data) { private CompletableFuture<Pair<BedrockData, LinkedPlayer>> fetchLinkedPlayer(BedrockData data) {
if (!api.getPlayerLink().isEnabled()) { if (!api.getPlayerLink().isEnabled()) {
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(new ObjectObjectImmutablePair<>(data, null));
} }
return api.getPlayerLink().getLinkedPlayer(Utils.getJavaUuid(data.getXuid())) return api.getPlayerLink().getLinkedPlayer(Utils.getJavaUuid(data.getXuid()))
.thenApply(link -> new ObjectObjectMutablePair<>(data, link)); .thenApply(link -> new ObjectObjectImmutablePair<>(data, link));
} }
public enum ResultType { public enum ResultType {