diff --git a/Waterfall-Proxy-Patches/0004-Make-PlayerHandshakeEvent-cancellable.patch b/Waterfall-Proxy-Patches/0003-Make-PlayerHandshakeEvent-cancellable.patch similarity index 92% rename from Waterfall-Proxy-Patches/0004-Make-PlayerHandshakeEvent-cancellable.patch rename to Waterfall-Proxy-Patches/0003-Make-PlayerHandshakeEvent-cancellable.patch index 1137cae..5d321fd 100644 --- a/Waterfall-Proxy-Patches/0004-Make-PlayerHandshakeEvent-cancellable.patch +++ b/Waterfall-Proxy-Patches/0003-Make-PlayerHandshakeEvent-cancellable.patch @@ -1,4 +1,4 @@ -From 52968afed745e49517f2eefa5aae6be6a36aa714 Mon Sep 17 00:00:00 2001 +From f83c723e3637308caaeb936b9549827f53f36cc9 Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> Date: Wed, 16 Dec 2020 17:57:23 +0800 Subject: [PATCH] Make PlayerHandshakeEvent cancellable @@ -35,10 +35,10 @@ index 2f7b38d9..e29b0ed3 100644 /** * Connection attempting to login. 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 3b82219d..5407c20a 100644 +index b7ecd828..49ba34db 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 -@@ -338,7 +338,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -320,7 +320,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() ); @@ -52,5 +52,5 @@ index 3b82219d..5407c20a 100644 switch ( handshake.getRequestedProtocol() ) { -- -2.20.1 +2.31.1.windows.1 diff --git a/Waterfall-Proxy-Patches/0005-Make-a-getter-for-the-callback.patch b/Waterfall-Proxy-Patches/0004-Make-a-getter-for-the-callback.patch similarity index 91% rename from Waterfall-Proxy-Patches/0005-Make-a-getter-for-the-callback.patch rename to Waterfall-Proxy-Patches/0004-Make-a-getter-for-the-callback.patch index a9189cd..3ac1952 100644 --- a/Waterfall-Proxy-Patches/0005-Make-a-getter-for-the-callback.patch +++ b/Waterfall-Proxy-Patches/0004-Make-a-getter-for-the-callback.patch @@ -1,4 +1,4 @@ -From dc79f49dd3b926c3f156f66dd6996fcfd00a47b3 Mon Sep 17 00:00:00 2001 +From d6e3943dcc28a4e9a6639fafbeab0526010cdadb Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> Date: Wed, 16 Dec 2020 17:58:18 +0800 Subject: [PATCH] Make a getter for the callback @@ -19,5 +19,5 @@ index cf85ca06..8a945a99 100644 private final Map intents = new ConcurrentHashMap<>(); private final AtomicBoolean fired = new AtomicBoolean(); -- -2.20.1 +2.31.1.windows.1 diff --git a/Waterfall-Proxy-Patches/0006-FlameCord-POM-Changes.patch b/Waterfall-Proxy-Patches/0005-FlameCord-POM-Changes.patch similarity index 96% rename from Waterfall-Proxy-Patches/0006-FlameCord-POM-Changes.patch rename to Waterfall-Proxy-Patches/0005-FlameCord-POM-Changes.patch index c08c067..7b67e21 100644 --- a/Waterfall-Proxy-Patches/0006-FlameCord-POM-Changes.patch +++ b/Waterfall-Proxy-Patches/0005-FlameCord-POM-Changes.patch @@ -1,4 +1,4 @@ -From 2d04ddc88508fef44e738bad09a805d84b86201a Mon Sep 17 00:00:00 2001 +From 390c73f1736afb9ea786fcfa142b671f087aeb1f Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> Date: Wed, 16 Dec 2020 17:59:15 +0800 Subject: [PATCH] FlameCord POM Changes @@ -6,7 +6,7 @@ Subject: [PATCH] FlameCord POM Changes diff --git a/flamecord/pom.xml b/flamecord/pom.xml new file mode 100644 -index 00000000..ca88559e +index 00000000..5f618ddf --- /dev/null +++ b/flamecord/pom.xml @@ -0,0 +1,44 @@ @@ -55,7 +55,7 @@ index 00000000..ca88559e + + diff --git a/pom.xml b/pom.xml -index aa57fe03..23153179 100644 +index b1052b2b..c46258f2 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,9 @@ @@ -69,7 +69,7 @@ index aa57fe03..23153179 100644 diff --git a/protocol/pom.xml b/protocol/pom.xml -index 993cbca9..3867501a 100644 +index 044be0c3..6fa1ade1 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -64,5 +64,14 @@ @@ -88,7 +88,7 @@ index 993cbca9..3867501a 100644 diff --git a/proxy/pom.xml b/proxy/pom.xml -index 5dfc6f51..8fb07275 100644 +index d3750214..05255a29 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -150,6 +150,51 @@ @@ -144,5 +144,5 @@ index 5dfc6f51..8fb07275 100644 -- -2.31.1 +2.31.1.windows.1 diff --git a/Waterfall-Proxy-Patches/0007-Disable-update-checker-Use-bungee-name.patch b/Waterfall-Proxy-Patches/0006-Disable-update-checker-Use-bungee-name.patch similarity index 95% rename from Waterfall-Proxy-Patches/0007-Disable-update-checker-Use-bungee-name.patch rename to Waterfall-Proxy-Patches/0006-Disable-update-checker-Use-bungee-name.patch index 514e23e..3b4b5e4 100644 --- a/Waterfall-Proxy-Patches/0007-Disable-update-checker-Use-bungee-name.patch +++ b/Waterfall-Proxy-Patches/0006-Disable-update-checker-Use-bungee-name.patch @@ -1,14 +1,14 @@ -From a8a33b052d445c78560370674f7b287e77396721 Mon Sep 17 00:00:00 2001 +From acb48a3f1ccc1ec0047025c71ca77d6c70eac9b7 Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> Date: Wed, 16 Dec 2020 18:00:49 +0800 Subject: [PATCH] Disable update checker & Use bungee name diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -index 6a5193fe..e82073d4 100644 +index 713bbbef..96db5e5e 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -@@ -53,25 +53,12 @@ public class BungeeCordLauncher +@@ -58,25 +58,12 @@ public class BungeeCordLauncher return; } @@ -38,7 +38,7 @@ index 6a5193fe..e82073d4 100644 if ( !options.has( "noconsole" ) ) diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java -index d4fad294..7994c1c1 100644 +index d5b3e6f8..7994c1c1 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java @@ -22,6 +22,7 @@ import java.util.Locale; @@ -70,5 +70,5 @@ index d4fad294..7994c1c1 100644 int maxPlayers = get( "max_players", 1, val ); -- -2.31.1 +2.31.1.windows.1 diff --git a/Waterfall-Proxy-Patches/0007-Change-replaceAll-to-replace.patch b/Waterfall-Proxy-Patches/0007-Change-replaceAll-to-replace.patch new file mode 100644 index 0000000..a1018bd --- /dev/null +++ b/Waterfall-Proxy-Patches/0007-Change-replaceAll-to-replace.patch @@ -0,0 +1,23 @@ +From 91cb9c13a57df9a21e2e2894a3365d36e2e54d08 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 2d9c0cda..af73283e 100644 +--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java ++++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +@@ -126,7 +126,8 @@ public class ServerConnector extends PacketHandler + newp[newp.length - 2] = new LoginResult.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 LoginResult.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" ); ++ // FlameCord - Change replaceAll() to replace() ++ newp[newp.length - 1] = new LoginResult.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replace( "\0", "\1"), "" ); + + // All done. + properties = newp; +-- +2.31.1.windows.1 +