mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-01-19 06:02:02 +01:00
d6688e05e6
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 511017ab #3396: Update Netty version c3e8cfac #3374, #3389: Improve log handling of normal java.util Logger usage by forwarding the LogRecords directly to the BungeeLogger instead of the fallback err stream. bf2b3c68 #3384: Update documentation of ProxyPingEvent 68e74a8c #3378: Remove KickStringWriter from the pipeline after handshake arrives 5b4a5404 #3361: Cache MessageFormats for translations 88da5c05 #3353: Update GitHub actions
27 lines
925 B
Diff
27 lines
925 B
Diff
From 2cd21b7b20cde396fa6d8713116f055dce6b72f4 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Fri, 9 Jul 2021 13:20:36 +0100
|
|
Subject: [PATCH] Don't bother locking to fetch a v4 UUID from the offline
|
|
UUIDs map
|
|
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
index 15fb4ad2..e0fcd8fb 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
@@ -634,6 +634,11 @@ public class BungeeCord extends ProxyServer
|
|
|
|
public UserConnection getPlayerByOfflineUUID(UUID name)
|
|
{
|
|
+ // Waterfall start - Skip lock if we get a v4 UUID, we're not gonna be in here
|
|
+ if (name != null && name.version() == 4) {
|
|
+ return null;
|
|
+ }
|
|
+ // Waterfall end
|
|
connectionLock.readLock().lock();
|
|
try
|
|
{
|
|
--
|
|
2.38.1
|
|
|