mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-06 10:45:37 +01:00
d75d7d1edc
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by 2LStudios and as with ANY update, please do your own testing Waterfall Changes:a5c78a9(Maybe) Fix javadoc searcheb920b8Updated Upstream (BungeeCord)8e9b90afix compile-native not working on linuxee819dfUpdated Upstream (BungeeCord)66601f7[ci skip] link to javadocs page instead of attempting direct
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From ae64b8938eadb7ee4b0c68572b4e270530603ad9 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Wed, 16 Dec 2020 18:43:17 +0800
|
|
Subject: [PATCH] Don't declare uuid unless it's null
|
|
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
index e643d8a7..dc5b64b7 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
@@ -490,7 +490,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
{
|
|
loginProfile = obj;
|
|
name = obj.getName();
|
|
- uniqueId = Util.getUUID( obj.getId() );
|
|
+ // FlameCord - Don't declare uuid unless it's null
|
|
+ if (uniqueId == null) {
|
|
+ uniqueId = Util.getUUID(obj.getId());
|
|
+ }
|
|
finish();
|
|
return;
|
|
}
|
|
--
|
|
2.32.0.windows.1
|
|
|