mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-18 16:25:14 +01:00
2554ec2219
Upstream has released updates that appear 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:59dbd08Updated Upstream (BungeeCord) (#747)9719e25Temp disable protocol limits for 1.199b0080aFix crash on startup (#743)958ae29Updated Upstream (BungeeCord) (#741)29f1cfbImprove login state transitiona44c78aVarious library bumps
24 lines
1.3 KiB
Diff
24 lines
1.3 KiB
Diff
From dca52858df4acbd78c9128f6e40e447b86824150 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Wed, 16 Dec 2020 18:01:37 +0800
|
|
Subject: [PATCH] Change replaceAll() to replace()
|
|
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
index d672c8ef..9067b806 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
@@ -129,7 +129,8 @@ public class ServerConnector extends PacketHandler
|
|
newp[newp.length - 2] = new net.md_5.bungee.protocol.Property( ForgeConstants.FML_LOGIN_PROFILE, "true", null );
|
|
|
|
// If we do not perform the replacement, then the IP Forwarding code in Spigot et. al. will try to split on this prematurely.
|
|
- newp[newp.length - 1] = new net.md_5.bungee.protocol.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" );
|
|
+ // FlameCord - Change replaceAll() to replace()
|
|
+ newp[newp.length - 1] = new net.md_5.bungee.protocol.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replace( "\0", "\1"), "" );
|
|
|
|
// All done.
|
|
properties = newp;
|
|
--
|
|
2.36.1.windows.1
|
|
|