Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-27 22:17:57 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Shane Freeder 2018-09-10 20:54:41 +01:00
parent 0b5d132185
commit c56f1321bc
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit ba0739798a0b6f184eca4def52750e8633623487
Subproject commit 98860214282441786d759ae200db4d40d4af6de0

10
BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From ed0c6a80f6c16fa5ff25a0ab1bc0812b74995af9 Mon Sep 17 00:00:00 2001
From 6c9a2c2cbbba3df1c0b01721e2d92581c26744c4 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -245,27 +245,27 @@ index 86a00555..6c9c6d61 100644
}
}
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
index 27b51849..8bf17f9c 100644
index 2f707ba6..8bf17f9c 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -75,7 +75,7 @@ public class ServerPing
public String getId()
{
- return uniqueId.toString().replaceAll( "-", "" );
- return uniqueId.toString().replace( "-", "" );
+ return io.github.waterfallmc.waterfall.utils.UUIDUtils.undash( uniqueId.toString() ); // Waterfall
}
}
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 a6bd3720..0e8041f8 100644
index d4fadcf6..0e8041f8 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
@@ -625,7 +625,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
- return uniqueId.toString().replaceAll( "-", "" );
- return uniqueId.toString().replace( "-", "" );
+ return io.github.waterfallmc.waterfall.utils.UUIDUtils.undash( uniqueId.toString() ); // Waterfall
}

15
BungeeCord-Patches/0017-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From a8818d5dcc92a302c72c4cc7dfd99c0289013a22 Mon Sep 17 00:00:00 2001
From 977c4a0f8cddfad7fd46b2c08c0f82bc6d442cb1 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -45,19 +45,6 @@ index 9f11f0a2..c8d1d225 100644
} catch ( MissingResourceException ex )
{
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 5fd5ce80..99cd19a1 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -585,7 +585,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public Locale getLocale()
{
- return ( locale == null && settings != null ) ? locale = Locale.forLanguageTag( settings.getLocale().replaceAll( "_", "-" ) ) : locale;
+ return ( locale == null && settings != null ) ? locale = Locale.forLanguageTag( settings.getLocale().replace( '_', '-' ) ) : locale;
}
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index d4c58098..30f8a7df 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java