Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) 

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:
b7935d4b Downgrade SnakeYAML due to issues with comments parsing
00982f36 #3104: Use lambdas rather than reflection to create packets
088b2045 #3109: Made file log level configurable
This commit is contained in:
Shane Freeder 2021-06-11 21:13:31 +01:00
parent c74fe8a9b2
commit cd2ccc6d2c
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
15 changed files with 54 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 633ff1cfc810c23f2aa368e4a588df3beb9d79c1
Subproject commit b7935d4b1437bd03e8063df584cbf917894bfdd3

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

@ -1,4 +1,4 @@
From 13cfd996d8e278f969fc503fffc5773219584361 Mon Sep 17 00:00:00 2001
From 1bdda79d53b7b37044cf10f1090df656342aabef 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 de94bfda..4b16a50f 100644
index f29355bb..1cec1657 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
@@ -475,14 +475,23 @@ public enum Protocol
@@ -518,14 +518,23 @@ public enum Protocol
return protocol;
}
@ -63,7 +63,7 @@ index de94bfda..4b16a50f 100644
- if ( id > MAX_PACKET_ID )
+ if ( !hasPacket(id, supportsForge) )
{
throw new BadPacketException( "Packet with id " + id + " outside of range " );
throw new BadPacketException( "Packet with id " + id + " outside of range" );
}
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 2762aede..a8516462 100644
@ -93,7 +93,7 @@ index 2762aede..a8516462 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 cb722d78..b0e7e392 100644
index ed0a12c5..dcdf94c9 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
@ -122,5 +122,5 @@ index 93989ee9..2e6cf764 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.31.1.windows.1
2.32.0

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

@ -1,4 +1,4 @@
From f707e409d6b91c060aee223c15db2715f8df5693 Mon Sep 17 00:00:00 2001
From ad9cce2866823d6344b9682f395d9687c45e45d5 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
@ -33,7 +33,7 @@ index 15a61b7e..ee2317e8 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 4b16a50f..c856f365 100644
index 1cec1657..e95431a0 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
@@ -18,6 +18,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@ -45,37 +45,40 @@ index 4b16a50f..c856f365 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;
@@ -114,6 +116,18 @@ public enum Protocol
@@ -120,6 +122,20 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_16, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_17, 0x0D )
);
+ // Waterfall start
+ TO_CLIENT.registerPacket(
+ EntityEffect.class,
+ EntityEffect::new,
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
+ map(ProtocolConstants.MINECRAFT_1_9, Integer.MIN_VALUE)
+ );
+ TO_CLIENT.registerPacket(
+ EntityRemoveEffect.class,
+ EntityRemoveEffect::new,
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1E),
+ map(ProtocolConstants.MINECRAFT_1_9, Integer.MIN_VALUE)
+ );
+ // Waterfall end
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
@@ -535,9 +549,11 @@ public enum Protocol
}
PlayerListItem::new,
@@ -567,10 +583,11 @@ public enum Protocol
mappingIndex++;
}
+ if (mapping.packetID != Integer.MIN_VALUE) { // Waterfall
ProtocolData data = protocols.get( protocol );
data.packetMap.put( packetClass, mapping.packetID );
data.packetConstructors[mapping.packetID] = constructor;
+ } // Waterfall
}
} catch ( NoSuchMethodException ex )
{
-
+ if (mapping.packetID != Integer.MIN_VALUE) { // Waterfall
ProtocolData data = protocols.get( protocol );
data.packetMap.put( packetClass, mapping.packetID );
data.packetConstructors[mapping.packetID] = constructor;
+ } // Waterfall
}
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
new file mode 100644
index 00000000..d11a9ea9
@ -170,7 +173,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 5e4c4518..c3cc914d 100644
index e677e032..f804ae3a 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 @@
@ -278,5 +281,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.31.1
2.32.0

6
BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,15 +1,15 @@
From d948241c419815bafdb3e50408d0a1131da61b3e Mon Sep 17 00:00:00 2001
From c2a00dbdee271905c3553c2a733e6e8ee584b541 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml
index 9868a6ab..87c17046 100644
index 338864f8..0680a5a5 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -76,5 +76,11 @@
<version>1.29</version>
<version>1.28</version>
<scope>compile</scope>
</dependency>
+ <!-- Waterfall - Add SLF4J -->

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

@ -1,365 +0,0 @@
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 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
@@ -57,6 +57,7 @@ public enum Protocol
{
TO_SERVER.registerPacket(
Handshake.class,
+ Handshake::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
);
}
@@ -68,6 +69,7 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
KeepAlive.class,
+ KeepAlive::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
@@ -79,6 +81,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Login.class,
+ Login::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
@@ -89,6 +92,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Chat.class,
+ Chat::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
@@ -98,6 +102,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Respawn.class,
+ Respawn::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x07 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
@@ -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 ),
@@ -119,17 +125,20 @@ public enum Protocol
// Waterfall start
TO_CLIENT.registerPacket(
EntityEffect.class,
+ EntityEffect::new, // Waterfall - speed up packet construction
map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
map(ProtocolConstants.MINECRAFT_1_9, Integer.MIN_VALUE)
);
TO_CLIENT.registerPacket(
EntityRemoveEffect.class,
+ EntityRemoveEffect::new, // Waterfall - speed up packet construction
map(ProtocolConstants.MINECRAFT_1_8, 0x1E),
map(ProtocolConstants.MINECRAFT_1_9, Integer.MIN_VALUE)
);
// Waterfall end
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
+ PlayerListItem::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
@@ -142,6 +151,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
TabCompleteResponse.class,
+ TabCompleteResponse::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x3A ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
@@ -152,6 +162,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardObjective.class,
+ ScoreboardObjective::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x3B ),
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
@@ -163,6 +174,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardScore.class,
+ ScoreboardScore::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x3C ),
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
@@ -174,6 +186,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardDisplay.class,
+ ScoreboardDisplay::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x3D ),
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
@@ -185,6 +198,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Team.class,
+ Team::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x3E ),
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
@@ -196,6 +210,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
PluginMessage.class,
+ PluginMessage::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
@@ -207,6 +222,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Kick.class,
+ Kick::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x40 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
@@ -218,6 +234,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Title.class,
+ Title::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x45 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
@@ -239,6 +256,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
PlayerListHeaderFooter.class,
+ PlayerListHeaderFooter::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
@@ -252,6 +270,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
EntityStatus.class,
+ EntityStatus::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
@@ -263,6 +282,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Commands.class,
+ Commands::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_13, 0x11 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x12 ),
map( ProtocolConstants.MINECRAFT_1_16, 0x11 ),
@@ -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 ),
@@ -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 ),
@@ -286,6 +308,7 @@ public enum Protocol
TO_SERVER.registerPacket(
KeepAlive.class,
+ KeepAlive::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
@@ -297,6 +320,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
Chat.class,
+ Chat::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
@@ -305,6 +329,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
TabCompleteRequest.class,
+ TabCompleteRequest::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x14 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
@@ -314,6 +339,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
ClientSettings.class,
+ ClientSettings::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x15 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
@@ -322,6 +348,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
PluginMessage.class,
+ PluginMessage::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x17 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
@@ -339,19 +366,23 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
StatusResponse.class,
+ StatusResponse::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
);
TO_CLIENT.registerPacket(
PingPacket.class,
+ PingPacket::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
);
TO_SERVER.registerPacket(
StatusRequest.class,
+ StatusRequest::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
);
TO_SERVER.registerPacket(
PingPacket.class,
+ PingPacket::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
);
}
@@ -363,35 +394,43 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
Kick.class,
+ Kick::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
);
TO_CLIENT.registerPacket(
EncryptionRequest.class,
+ EncryptionRequest::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
);
TO_CLIENT.registerPacket(
LoginSuccess.class,
+ LoginSuccess::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x02 )
);
TO_CLIENT.registerPacket(
SetCompression.class,
+ SetCompression::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x03 )
);
TO_CLIENT.registerPacket(
LoginPayloadRequest.class,
+ LoginPayloadRequest::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_13, 0x04 )
);
TO_SERVER.registerPacket(
LoginRequest.class,
+ LoginRequest::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
);
TO_SERVER.registerPacket(
EncryptionResponse.class,
+ EncryptionResponse::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
);
TO_SERVER.registerPacket(
LoginPayloadResponse.class,
+ LoginPayloadResponse::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
);
}
@@ -442,7 +481,7 @@ public enum Protocol
private final int protocolVersion;
private final TObjectIntMap<Class<? extends DefinedPacket>> packetMap = new TObjectIntHashMap<>( MAX_PACKET_ID );
- private final Constructor<? extends DefinedPacket>[] packetConstructors = new Constructor[ MAX_PACKET_ID ];
+ private final java.util.function.Supplier<? extends DefinedPacket>[] packetConstructors = new java.util.function.Supplier[ MAX_PACKET_ID ]; // Waterfall - speed up packet construction
}
@Data
@@ -510,21 +549,24 @@ public enum Protocol
throw new BadPacketException( "Packet with id " + id + " outside of range " );
}
- Constructor<? extends DefinedPacket> constructor = protocolData.packetConstructors[id];
+ java.util.function.Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction
try
{
- return ( constructor == null ) ? null : constructor.newInstance();
- } catch ( ReflectiveOperationException ex )
+ return ( constructor == null ) ? null : constructor.get(); // Waterfall - speed up packet construction
+ } catch ( Exception ex ) // Waterfall - speed up packet construction
{
throw new BadPacketException( "Could not construct packet with id " + id, ex );
}
}
- private void registerPacket(Class<? extends DefinedPacket> packetClass, ProtocolMapping... mappings)
+ private <P extends DefinedPacket> void registerPacket(Class<P> packetClass, java.util.function.Supplier<P> constructor, ProtocolMapping... mappings) // Waterfall - speed up packet construction
{
+ // Waterfall start - speed up packet construction
+ /*
try
{
Constructor<? extends DefinedPacket> constructor = packetClass.getDeclaredConstructor();
+ */ // Waterfall end
int mappingIndex = 0;
ProtocolMapping mapping = mappings[mappingIndex];
@@ -555,11 +597,32 @@ public enum Protocol
data.packetConstructors[mapping.packetID] = constructor;
} // Waterfall
}
+ // Waterfall start - speed up packet construction
+ /*
} catch ( NoSuchMethodException ex )
{
throw new BadPacketException( "No NoArgsConstructor for packet class " + packetClass );
}
+ */ // Waterfall end
}
+ // Waterfall start - speed up packet construction (backwards compat)
+ private <P extends DefinedPacket> void registerPacket(Class<P> packetClass, ProtocolMapping... mappings) {
+ java.util.function.Supplier<P> packetSupplier;
+ try {
+ Constructor<? extends DefinedPacket> constructor = packetClass.getDeclaredConstructor();
+ packetSupplier = () -> {
+ try {
+ return (P) constructor.newInstance();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ };
+ } catch (ReflectiveOperationException e) {
+ throw new BadPacketException( "No NoArgsConstructor for packet class " + packetClass );
+ }
+ registerPacket(packetClass, packetSupplier, mappings);
+ }
+ // Waterfall end
final int getId(Class<? extends DefinedPacket> packet, int version)
{
--
2.31.1

8
BungeeCord-Patches/0052-Speed-up-some-common-exceptions.patch → BungeeCord-Patches/0051-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From 5b7a8861bb1b6079762e28a1a14711de15db3fe8 Mon Sep 17 00:00:00 2001
From a1d39a207c1b1bcbfcc753f31599990ccbf72a23 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
@ -133,7 +133,7 @@ index 00000000..2583aa2c
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index a2c72c9b..1a647f2b 100644
index 8b7e0708..37d28c01 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -78,7 +78,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -146,7 +146,7 @@ index a2c72c9b..1a647f2b 100644
{
if ( slice != null )
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 3d3b2352..4b22b232 100644
index 8fb25af1..aad82d49 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
@@ -12,6 +12,8 @@ import java.util.List;
@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.30.0
2.32.0

6
BungeeCord-Patches/0053-ConnectionInitEvent.patch → BungeeCord-Patches/0052-ConnectionInitEvent.patch
View File

@ -1,4 +1,4 @@
From d332c9ff37c72dfc44b32e16f43705f900b1fafc Mon Sep 17 00:00:00 2001
From 285774285d044a7087b12f67b7c225d35c6556ac Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 2 Dec 2019 11:35:17 +0000
Subject: [PATCH] ConnectionInitEvent
@ -67,7 +67,7 @@ index 00000000..6e79675f
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 8969a5ed..9a39f69e 100644
index abc60316..96704d5e 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -1,6 +1,7 @@
@ -119,5 +119,5 @@ index 8969a5ed..9a39f69e 100644
};
public static final Base BASE = new Base();
--
2.26.1
2.32.0

6
BungeeCord-Patches/0054-Add-exception-reporting-event.patch → BungeeCord-Patches/0053-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From e6d62e8999fba8fdb5409175d81238ddd383404b Mon Sep 17 00:00:00 2001
From 3088c32039b873d9ca1e45c3a185182d9223a3f1 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
@ -551,7 +551,7 @@ index 4180c995..90031156 100644
* Register a {@link Listener} for receiving called events. Methods in this
* Object which wish to receive events must be annotated with the
diff --git a/event/src/main/java/net/md_5/bungee/event/EventBus.java b/event/src/main/java/net/md_5/bungee/event/EventBus.java
index 8da5f275..d28fd528 100644
index a6d717f2..ac6b9758 100644
--- a/event/src/main/java/net/md_5/bungee/event/EventBus.java
+++ b/event/src/main/java/net/md_5/bungee/event/EventBus.java
@@ -34,7 +34,8 @@ public class EventBus
@ -695,5 +695,5 @@ index 67db0cc4..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.31.1.windows.1
2.32.0

4
BungeeCord-Patches/0055-Allow-to-disable-tablist-rewrite.patch → BungeeCord-Patches/0054-Allow-to-disable-tablist-rewrite.patch
View File

@ -1,4 +1,4 @@
From fb7568a79620b227112e820f4b3e7e88d64afe70 Mon Sep 17 00:00:00 2001
From 56cb3c65d1f2e5f10b5b635bf49f12b9fb849f76 Mon Sep 17 00:00:00 2001
From: xDark <aleshkailyashevich@gmail.com>
Date: Fri, 31 May 2019 08:11:31 +0300
Subject: [PATCH] Allow to disable tablist rewrite
@ -71,5 +71,5 @@ index ace177ba..f4494898 100644
@Override
--
2.28.0
2.32.0

4
BungeeCord-Patches/0056-Remove-version-from-brand-info.patch → BungeeCord-Patches/0055-Remove-version-from-brand-info.patch
View File

@ -1,4 +1,4 @@
From 554f71e17dab9a0e129d9bb813369e406fcebd54 Mon Sep 17 00:00:00 2001
From 8cc29367cfb4d1b64df8774113a779fa0b03e504 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 20 Jun 2020 18:21:17 +0100
Subject: [PATCH] Remove version from brand info
@ -18,5 +18,5 @@ index f4494898..9e180c30 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.31.1
2.32.0

6
BungeeCord-Patches/0057-Add-auth-url-option.patch → BungeeCord-Patches/0056-Add-auth-url-option.patch
View File

@ -1,11 +1,11 @@
From e27d12545aaf1ee62f66d796cbc4f4acd9552482 Mon Sep 17 00:00:00 2001
From e3bcba72ee4cb96c3dd38fd9d55b6da9795819b7 Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Sun, 19 Jul 2020 10:18:23 +1000
Subject: [PATCH] Add auth url option
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 4b22b232..b7ecd828 100644
index aad82d49..08c49fcc 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
@@ -72,6 +72,8 @@ import net.md_5.bungee.util.QuietException;
@ -27,5 +27,5 @@ index 4b22b232..b7ecd828 100644
Callback<String> handler = new Callback<String>()
{
--
2.31.1
2.32.0

4
BungeeCord-Patches/0058-Add-the-ability-to-generate-decoder-traces-for-debug.patch → BungeeCord-Patches/0057-Add-the-ability-to-generate-decoder-traces-for-debug.patch
View File

@ -1,4 +1,4 @@
From a0a1f3d00766fd291d68a8ce93bac5f331263c97 Mon Sep 17 00:00:00 2001
From 29461b7407dbe62ed50a90fd0f8fc3dbe4443ca8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 15 Sep 2020 18:11:49 +0100
Subject: [PATCH] Add the ability to generate decoder traces for debugging
@ -40,5 +40,5 @@ index 2583aa2c..334d5054 100644
}
}
--
2.31.1
2.32.0

4
BungeeCord-Patches/0059-Additional-DoS-mitigations.patch → BungeeCord-Patches/0058-Additional-DoS-mitigations.patch
View File

@ -1,4 +1,4 @@
From 27dd755c7d2ca99b302ae28b61a9e4a00823130e Mon Sep 17 00:00:00 2001
From a46065c54e536379cf3328642e23e03092dd9691 Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@fivepb.me>
Date: Sat, 30 Jan 2021 18:04:14 +0100
Subject: [PATCH] Additional DoS mitigations
@ -241,5 +241,5 @@ index 738f0c92..ec33d337 100644
+ // Waterfall end
}
--
2.31.1
2.32.0

4
BungeeCord-Patches/0060-Add-support-for-hex-color-codes-in-console.patch → BungeeCord-Patches/0059-Add-support-for-hex-color-codes-in-console.patch
View File

@ -1,4 +1,4 @@
From 56382997d3154a999688ff36d31038a0e77ff7b3 Mon Sep 17 00:00:00 2001
From 5e209c23e70b72cf2828a16ea042545daba9c382 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Sun, 21 Feb 2021 23:52:11 -0500
Subject: [PATCH] Add support for hex color codes in console
@ -242,5 +242,5 @@ index 00000000..5d1a6126
+}
+
--
2.31.1
2.32.0

4
BungeeCord-Patches/0061-Set-Netty-pooled-buffer-size-to-4MB.patch → BungeeCord-Patches/0060-Set-Netty-pooled-buffer-size-to-4MB.patch
View File

@ -1,4 +1,4 @@
From a1ae8aaff1a3e357072baf7115d1eadbc9c148a5 Mon Sep 17 00:00:00 2001
From 93a9757046c606b5564332e6cb16719bc909dd92 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sat, 24 Apr 2021 17:52:33 +0100
Subject: [PATCH] Set Netty pooled buffer size to 4MB
@ -29,5 +29,5 @@ index 0db3d76a..35680528 100644
parser.allowsUnrecognizedOptions();
parser.acceptsAll( Arrays.asList( "help" ), "Show the help" );
--
2.31.1
2.32.0