Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-23 16:11:35 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
Upstream has released updates that appears 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:
f0908b66 Add optional 1.17 (21w19a) snapshot protocol support
5fa596fe #3084: (Regrettably) add a full SLF4J wrapper
This commit is contained in:
Shane Freeder 2021-05-15 02:46:23 +01:00
parent eb03f0627d
commit fea7ec356d
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
18 changed files with 1262 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit ada1b95ffc3b26eb6cd9d0ad768897cf139833d4
Subproject commit f0908b663f868ef5fe1f3ac8c81a29827cd6abe1

18
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From edd73ff3b9bd6de9849485ae8e0612cd8fbb0e83 Mon Sep 17 00:00:00 2001
From 8025bd96688d2dd7a6b83a8b2cf2d2b54bd56f64 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
- Deploy to papermc mvn repo
diff --git a/api/pom.xml b/api/pom.xml
index a502e8c3..0eb61e1d 100644
index 6e8e84f5..ee3ab347 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -491,7 +491,7 @@ index cf46174c..db15febb 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4305537d..12c285f2 100644
index 8b5feae5..2e9160a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -549,7 +549,7 @@ index 4305537d..12c285f2 100644
</developer>
</developers>
@@ -45,28 +64,24 @@
@@ -46,28 +65,24 @@
</modules>
<scm>
@ -588,7 +588,7 @@ index 4305537d..12c285f2 100644
</distributionManagement>
<properties>
@@ -123,12 +138,21 @@
@@ -124,12 +139,21 @@
</execution>
</executions>
</plugin>
@ -610,7 +610,7 @@ index 4305537d..12c285f2 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
@@ -153,6 +177,7 @@
@@ -154,6 +178,7 @@
</dependency>
</dependencies>
</plugin>
@ -618,7 +618,7 @@ index 4305537d..12c285f2 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -320,5 +345,88 @@
@@ -321,5 +346,88 @@
</plugins>
</build>
</profile>
@ -749,7 +749,7 @@ index 5ec853a5..402266ca 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 9f663469..4aeb9cbe 100644
index 086b9e79..bd636f36 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -861,5 +861,5 @@ index 3023d072..8ce88f4a 100644
<scope>compile</scope>
</dependency>
--
2.31.0
2.31.1

10
BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,4 +1,4 @@
From ffb65e34665a6850d6fad13f5df3d5281759d7d8 Mon Sep 17 00:00:00 2001
From 89ae104b3d0ab58d2ebb90d336173202455c9dd6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall
@ -18,10 +18,10 @@ index f1ccd4f6..d703d6d2 100644
}
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 c04c3e8e..b18d4854 100644
index f80c0486..998316c3 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -186,7 +186,7 @@ public class BungeeCord extends ProxyServer
@@ -187,7 +187,7 @@ public class BungeeCord extends ProxyServer
public BungeeCord() throws IOException
{
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@ -30,7 +30,7 @@ index c04c3e8e..b18d4854 100644
System.setSecurityManager( new BungeeSecurityManager() );
@@ -528,7 +528,7 @@ public class BungeeCord extends ProxyServer
@@ -530,7 +530,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -101,5 +101,5 @@ index c0620445..e65558ad 100644
SocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.27.0
2.31.1

8
BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
View File

@ -1,4 +1,4 @@
From fdd8855b8ca5c05d5a43b5a51888139a6c086911 Mon Sep 17 00:00:00 2001
From 7824ec691a9fb695159ed9a74c7b623f86668cd6 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files
@ -42,7 +42,7 @@ index 00000000..741ebfde
+
+}
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 b18d4854..c1c0f227 100644
index 998316c3..f8f3fb44 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -10,6 +10,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -53,7 +53,7 @@ index b18d4854..c1c0f227 100644
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
@@ -110,7 +111,7 @@ public class BungeeCord extends ProxyServer
@@ -111,7 +112,7 @@ public class BungeeCord extends ProxyServer
* Configuration.
*/
@Getter
@ -118,5 +118,5 @@ index e65558ad..65121ba2 100644
if ( permissions == null )
{
--
2.27.0
2.31.1

12
BungeeCord-Patches/0005-Disable-Metrics.patch
View File

@ -1,4 +1,4 @@
From 141101eee99241068152524fea62f05cc675267f Mon Sep 17 00:00:00 2001
From 667ad1f7ae23c9bb8010653312c5c6dba5c64823 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Disable Metrics
@ -6,10 +6,10 @@ Subject: [PATCH] Disable Metrics
MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
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 c1c0f227..15f37d61 100644
index f8f3fb44..16d4e433 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer
@@ -123,7 +123,7 @@ public class BungeeCord extends ProxyServer
* locations.yml save thread.
*/
private final Timer saveThread = new Timer( "Reconnect Saver" );
@ -18,7 +18,7 @@ index c1c0f227..15f37d61 100644
/**
* Server socket listener.
*/
@@ -302,7 +302,7 @@ public class BungeeCord extends ProxyServer
@@ -304,7 +304,7 @@ public class BungeeCord extends ProxyServer
}
}
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -27,7 +27,7 @@ index c1c0f227..15f37d61 100644
Runtime.getRuntime().addShutdownHook( new Thread()
{
@@ -460,7 +460,7 @@ public class BungeeCord extends ProxyServer
@@ -462,7 +462,7 @@ public class BungeeCord extends ProxyServer
reconnectHandler.close();
}
saveThread.cancel();
@ -177,5 +177,5 @@ index eabf7573..00000000
- }
-}
--
2.27.0
2.31.1

8
BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
View File

@ -1,4 +1,4 @@
From e4c9530598b8bd42274013d7830320f2ceef36e0 Mon Sep 17 00:00:00 2001
From 6263c6b63509c82ce47e619b02513b50cd5baa11 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Mon, 25 Jan 2016 01:19:07 -0500
Subject: [PATCH] Get rid of the security manager.
@ -6,10 +6,10 @@ Subject: [PATCH] Get rid of the security manager.
There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
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 15f37d61..bcb229c3 100644
index 16d4e433..8464fefb 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -189,8 +189,6 @@ public class BungeeCord extends ProxyServer
@@ -190,8 +190,6 @@ public class BungeeCord extends ProxyServer
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
@ -103,5 +103,5 @@ index 53c81923..00000000
- }
-}
--
2.27.0
2.31.1

12
BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
View File

@ -1,16 +1,16 @@
From d999240c7a6c80605cd508cf23bfd3c01cddbce2 Mon Sep 17 00:00:00 2001
From 71e089cca23ec8294bf19553e151b7c8e0f47f32 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
index bf316417..2202c4d3 100644
index 30f1306a..391443ca 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -74,6 +74,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_16_4
);
@@ -91,6 +91,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
+ public static final boolean isBeforeOrEq(int before, int other)
+ {
@ -26,5 +26,5 @@ index bf316417..2202c4d3 100644
{
--
2.29.2
2.31.1

10
BungeeCord-Patches/0016-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From 17dc40e613083bdbc436c7d7f075e09690fa1c58 Mon Sep 17 00:00:00 2001
From 38cac6bb66605dd7c39c7a1c0c7eba5ad25a43a7 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
@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
- Don't create a data input stream for every plugin message we get from servers
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 bcb229c3..b9d624f8 100644
index 8464fefb..a1752045 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -557,7 +557,9 @@ public class BungeeCord extends ProxyServer
@@ -559,7 +559,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>";
try
{
@ -23,7 +23,7 @@ index bcb229c3..b9d624f8 100644
{
}
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 653242f0..d1e57953 100644
index 552b0b17..a859195e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -250,7 +250,6 @@ public class DownstreamBridge extends PacketHandler
@ -43,5 +43,5 @@ index 653242f0..d1e57953 100644
String subChannel = in.readUTF();
--
2.24.0
2.31.1

14
BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From ce2efc22510538721c07bb4ba4d6cebe5da85885 Mon Sep 17 00:00:00 2001
From ec9c98165375395d0ab4726f8b56182495682203 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -37,10 +37,10 @@ index d36b7f3c..5e03e175 100644
{
packet.read( in, prot.getDirection(), protocolVersion );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index caf4a685..50a911c2 100644
index de94bfda..4b16a50f 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -441,14 +441,23 @@ public enum Protocol
@@ -475,14 +475,23 @@ public enum Protocol
return protocol;
}
@ -93,7 +93,7 @@ index bafd741b..4d0fa540 100644
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
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 e0b48763..b64d3f50 100644
index cb722d78..b0e7e392 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer
@ -105,10 +105,10 @@ index e0b48763..b64d3f50 100644
@Getter
@NonNull
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index 53911d1c..4a27148f 100644
index 93989ee9..2e6cf764 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -322,6 +322,12 @@ public abstract class EntityMap
@@ -324,6 +324,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index 53911d1c..4a27148f 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.30.1
2.31.1

16
BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch
View File

@ -1,4 +1,4 @@
From 8f074b87748c968933368cc6a9dbfe8daf018321 Mon Sep 17 00:00:00 2001
From a4f2f8f88907fb0652ef6f9585fa221f45d04e25 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,10 +8,10 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty.
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 b9d624f8..8649c91e 100644
index a1752045..7c19832f 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
@@ -118,7 +118,7 @@ public class BungeeCord extends ProxyServer
*/
private ResourceBundle baseBundle;
private ResourceBundle customBundle;
@ -20,7 +20,7 @@ index b9d624f8..8649c91e 100644
/**
* locations.yml save thread.
*/
@@ -258,7 +258,8 @@ public class BungeeCord extends ProxyServer
@@ -260,7 +260,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
}
@ -30,7 +30,7 @@ index b9d624f8..8649c91e 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -347,7 +348,7 @@ public class BungeeCord extends ProxyServer
@@ -349,7 +350,7 @@ public class BungeeCord extends ProxyServer
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index b9d624f8..8649c91e 100644
.localAddress( info.getSocketAddress() )
.bind().addListener( listener );
@@ -370,7 +371,7 @@ public class BungeeCord extends ProxyServer
@@ -372,7 +373,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index b9d624f8..8649c91e 100644
}
}
}
@@ -479,12 +480,14 @@ public class BungeeCord extends ProxyServer
@@ -481,12 +482,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
@ -83,5 +83,5 @@ index 9d581d9a..7b002089 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
.remoteAddress( socketAddress )
--
2.27.0
2.31.1

8
BungeeCord-Patches/0025-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 52eda421ee5716573aaa584cc7c08014f647b533 Mon Sep 17 00:00:00 2001
From f1d3445b11e8ebb0eec708d50155484086c89114 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -170,10 +170,10 @@ index 59c104d3..698b420f 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
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 8649c91e..1d141981 100644
index 7c19832f..99636fb4 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -633,10 +633,18 @@ public class BungeeCord extends ProxyServer
@@ -635,10 +635,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}
@ -311,5 +311,5 @@ index d640313a..115f614e 100644
+ // Waterfall end
}
--
2.27.0
2.31.1

8
BungeeCord-Patches/0028-Configurable-server-version-in-ping-response.patch
View File

@ -1,4 +1,4 @@
From 05f79876d9c969dd45af3c5c3d0e0751c19b997d Mon Sep 17 00:00:00 2001
From 412c2a4b879a3efbd8eab0cc66345f8a3146dcc0 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response
@ -66,10 +66,10 @@ index 91743f01..111404fb 100644
public int getTabThrottle() {
return tabThrottle;
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 1d141981..8c933123 100644
index 99636fb4..1f6ba085 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -687,7 +687,7 @@ public class BungeeCord extends ProxyServer
@@ -689,7 +689,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{
@ -79,5 +79,5 @@ index 1d141981..8c933123 100644
@Override
--
2.27.0
2.31.1

22
BungeeCord-Patches/0032-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,14 +1,14 @@
From 266bc30c5330ef442070a9e7d122d756ca7dca0b Mon Sep 17 00:00:00 2001
From f707e409d6b91c060aee223c15db2715f8df5693 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index ac31e435..252389bd 100644
index 15a61b7e..ee2317e8 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -7,6 +7,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
@@ -8,6 +8,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
import net.md_5.bungee.protocol.packet.Commands;
import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
@ -17,7 +17,7 @@ index ac31e435..252389bd 100644
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
import net.md_5.bungee.protocol.packet.Handshake;
@@ -178,4 +180,14 @@ public abstract class AbstractPacketHandler
@@ -193,4 +195,14 @@ public abstract class AbstractPacketHandler
public void handle(GameState gameState) throws Exception
{
}
@ -33,10 +33,10 @@ index ac31e435..252389bd 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 50a911c2..3a686e60 100644
index 4b16a50f..c856f365 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -17,6 +17,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@@ -18,6 +18,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
@ -45,9 +45,9 @@ index 50a911c2..3a686e60 100644
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
@@ -106,6 +108,18 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_15, 0x0D ),
map( ProtocolConstants.MINECRAFT_1_16, 0x0C )
@@ -114,6 +116,18 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_16, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_17, 0x0D )
);
+ // Waterfall start
+ TO_CLIENT.registerPacket(
@ -64,7 +64,7 @@ index 50a911c2..3a686e60 100644
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
@@ -501,9 +515,11 @@ public enum Protocol
@@ -535,9 +549,11 @@ public enum Protocol
}
}
@ -170,7 +170,7 @@ index 00000000..7ed2dc3a
+ }
+}
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 5e3c27a3..bc8156cc 100644
index 5e4c4518..c3cc914d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -1,7 +1,9 @@

1156
BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

File diff suppressed because it is too large Load Diff

8
BungeeCord-Patches/0043-Forge-is-a-first-class-citizen.patch
View File

@ -1,14 +1,14 @@
From 48f0ae897c372ea9a02a982991d2adda25095875 Mon Sep 17 00:00:00 2001
From be8460146ca653b8887f7010630a4c34852bbc21 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen
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 d71556a7..289a63d5 100644
index 617a077f..eeb63c43 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -280,8 +280,6 @@ public class BungeeCord extends ProxyServer
@@ -281,8 +281,6 @@ public class BungeeCord extends ProxyServer
registerChannel( ForgeConstants.FML_TAG );
registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
registerChannel( ForgeConstants.FORGE_REGISTER );
@ -31,5 +31,5 @@ index 115f614e..85d2197a 100644
@Synchronized("serversLock") // Waterfall
public void load()
--
2.27.0
2.31.1

6
BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 8f2d534b8f40b7a4738fabb88bb4d3ed5d735e54 Mon Sep 17 00:00:00 2001
From e2aa832097ee0d8f09cd8b84ec1a6dc11dcacebb Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -158,7 +158,7 @@ index 033877fc..72b6e9be 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index 509898e9..db5210d1 100644
index 2e6cf764..13456b34 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream;
@ -181,7 +181,7 @@ index 509898e9..db5210d1 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -284,7 +290,13 @@ public abstract class EntityMap
@@ -286,7 +292,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:

69
BungeeCord-Patches/0051-Speed-up-packet-construction.patch
View File

@ -1,14 +1,14 @@
From 25efdf442b60a21767250917e2d35da26d92372d Mon Sep 17 00:00:00 2001
From 5933064944a64327398feb3d07ccadbdcb41b629 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 17 Apr 2019 09:24:38 +0300
Subject: [PATCH] Speed up packet construction
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 3a686e60..0dffc8d2 100644
index c856f365..d2a11a82 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -54,6 +54,7 @@ public enum Protocol
@@ -57,6 +57,7 @@ public enum Protocol
{
TO_SERVER.registerPacket(
Handshake.class,
@ -16,7 +16,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
);
}
@@ -65,6 +66,7 @@ public enum Protocol
@@ -68,6 +69,7 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
KeepAlive.class,
@ -24,7 +24,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
@@ -75,6 +77,7 @@ public enum Protocol
@@ -79,6 +81,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Login.class,
@ -32,7 +32,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
@@ -84,6 +87,7 @@ public enum Protocol
@@ -89,6 +92,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Chat.class,
@ -40,7 +40,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
@@ -92,6 +96,7 @@ public enum Protocol
@@ -98,6 +102,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Respawn.class,
@ -48,15 +48,15 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x07 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
@@ -104,6 +109,7 @@ public enum Protocol
@@ -111,6 +116,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
BossBar.class,
+ BossBar::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_15, 0x0D ),
map( ProtocolConstants.MINECRAFT_1_16, 0x0C )
@@ -111,17 +117,20 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_16, 0x0C ),
@@ -119,17 +125,20 @@ public enum Protocol
// Waterfall start
TO_CLIENT.registerPacket(
EntityEffect.class,
@ -77,7 +77,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
@@ -133,6 +142,7 @@ public enum Protocol
@@ -142,6 +151,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
TabCompleteResponse.class,
@ -85,7 +85,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3A ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
@@ -142,6 +152,7 @@ public enum Protocol
@@ -152,6 +162,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardObjective.class,
@ -93,7 +93,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3B ),
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
@@ -152,6 +163,7 @@ public enum Protocol
@@ -163,6 +174,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardScore.class,
@ -101,7 +101,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3C ),
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
@@ -162,6 +174,7 @@ public enum Protocol
@@ -174,6 +186,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardDisplay.class,
@ -109,7 +109,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3D ),
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
@@ -172,6 +185,7 @@ public enum Protocol
@@ -185,6 +198,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Team.class,
@ -117,7 +117,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3E ),
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
@@ -182,6 +196,7 @@ public enum Protocol
@@ -196,6 +210,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
PluginMessage.class,
@ -125,7 +125,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
@@ -192,6 +207,7 @@ public enum Protocol
@@ -207,6 +222,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Kick.class,
@ -133,7 +133,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x40 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
@@ -202,6 +218,7 @@ public enum Protocol
@@ -218,6 +234,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Title.class,
@ -141,7 +141,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x45 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
@@ -212,6 +229,7 @@ public enum Protocol
@@ -239,6 +256,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
PlayerListHeaderFooter.class,
@ -149,7 +149,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
@@ -224,6 +242,7 @@ public enum Protocol
@@ -252,6 +270,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
EntityStatus.class,
@ -157,7 +157,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
@@ -234,6 +253,7 @@ public enum Protocol
@@ -263,6 +282,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Commands.class,
@ -165,22 +165,23 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_13, 0x11 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x12 ),
map( ProtocolConstants.MINECRAFT_1_16, 0x11 ),
@@ -241,12 +261,14 @@ public enum Protocol
@@ -271,6 +291,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
GameState.class,
+ GameState::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_15, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_16, 0x1E ),
map( ProtocolConstants.MINECRAFT_1_16_2, 0x1D )
map( ProtocolConstants.MINECRAFT_1_16_2, 0x1D ),
@@ -278,6 +299,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ViewDistance.class,
+ ViewDistance::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_14, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_16, 0x41 )
@@ -254,6 +276,7 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_16, 0x41 ),
@@ -286,6 +308,7 @@ public enum Protocol
TO_SERVER.registerPacket(
KeepAlive.class,
@ -188,7 +189,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
@@ -264,6 +287,7 @@ public enum Protocol
@@ -297,6 +320,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
Chat.class,
@ -196,7 +197,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
@@ -272,6 +296,7 @@ public enum Protocol
@@ -305,6 +329,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
TabCompleteRequest.class,
@ -204,7 +205,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x14 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
@@ -281,6 +306,7 @@ public enum Protocol
@@ -314,6 +339,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
ClientSettings.class,
@ -212,7 +213,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x15 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
@@ -289,6 +315,7 @@ public enum Protocol
@@ -322,6 +348,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
PluginMessage.class,
@ -220,7 +221,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x17 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
@@ -305,19 +332,23 @@ public enum Protocol
@@ -339,19 +366,23 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
StatusResponse.class,
@ -244,7 +245,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
);
}
@@ -329,35 +360,43 @@ public enum Protocol
@@ -363,35 +394,43 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
Kick.class,
@ -288,7 +289,7 @@ index 3a686e60..0dffc8d2 100644
map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
);
}
@@ -408,7 +447,7 @@ public enum Protocol
@@ -442,7 +481,7 @@ public enum Protocol
private final int protocolVersion;
private final TObjectIntMap<Class<? extends DefinedPacket>> packetMap = new TObjectIntHashMap<>( MAX_PACKET_ID );
@ -297,7 +298,7 @@ index 3a686e60..0dffc8d2 100644
}
@Data
@@ -476,21 +515,24 @@ public enum Protocol
@@ -510,21 +549,24 @@ public enum Protocol
throw new BadPacketException( "Packet with id " + id + " outside of range " );
}
@ -326,7 +327,7 @@ index 3a686e60..0dffc8d2 100644
int mappingIndex = 0;
ProtocolMapping mapping = mappings[mappingIndex];
@@ -521,11 +563,32 @@ public enum Protocol
@@ -555,11 +597,32 @@ public enum Protocol
data.packetConstructors[mapping.packetID] = constructor;
} // Waterfall
}

8
BungeeCord-Patches/0054-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From a570cc8c9e2ad578c6fa489b745c98220c33de96 Mon Sep 17 00:00:00 2001
From b498c27f2197205ed7acb59939a6d1eeeef818e8 Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Wed, 22 Apr 2020 14:00:44 +1000
Subject: [PATCH] Add exception reporting event
@ -642,7 +642,7 @@ index fbfbd546..ae85a1d4 100644
@EventHandler
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 289a63d5..2938f2f1 100644
index eeb63c43..c09f5b4c 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -11,6 +11,8 @@ import com.google.gson.Gson;
@ -654,7 +654,7 @@ index 289a63d5..2938f2f1 100644
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
@@ -475,7 +477,11 @@ public class BungeeCord extends ProxyServer
@@ -476,7 +478,11 @@ public class BungeeCord extends ProxyServer
}
} catch ( Throwable t )
{
@ -695,5 +695,5 @@ index 67db0cc4..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.31.0
2.31.1