Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +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:
67c2dfd8 #2794: connection throttle race condition
eeb3c6d3 #2811: Shorten "Cannot request protocol" exception
727281e6 Make all BaseComponent.duplicate methods specific
4e99a325 #2808: TextComponent.duplicate should return TextComponent
3373eb86 #2834: Add support for long array NBT tag
b85df4f2 #2830: CommandSend - replace iterator-while with for-each
This commit is contained in:
Aikar 2020-05-09 21:44:18 -04:00
parent 2cab85cbef
commit ffe3d76ee6
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
7 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 855d1525038369950db427b8ea7299fb6227f0f3
Subproject commit 67c2dfd8848689c6d5052fbc99b3bc92a6d21ea2

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

@ -1,4 +1,4 @@
From 647f3f5933722d4c7230d8586ab48e385d8d8806 Mon Sep 17 00:00:00 2001
From 03b72d293bb4598ca28422582d010a72b292d3e2 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
@ -491,7 +491,7 @@ index f11cad04..f8b549dc 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 63f7d6d3..acc79895 100644
index 8681a688..872f8fc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -741,7 +741,7 @@ index e11af008..4592e2b3 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index a682d3c6..9ac3c1af 100644
index c2b454ff..e6052fbf 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -768,7 +768,7 @@ index a682d3c6..9ac3c1af 100644
<description>Proxy component of the Elastic Portal Suite</description>
<properties>
@@ -56,32 +56,32 @@
@@ -50,32 +50,32 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -853,5 +853,5 @@ index 9c7d6f5a..c3a29122 100644
<scope>compile</scope>
</dependency>
--
2.26.1
2.26.2

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

@ -1,4 +1,4 @@
From 990153b9c40bd80f395eb4fa9983e57259e7019a Mon Sep 17 00:00:00 2001
From b62228801e1e291129d01643e9eae09993feae06 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
@ -66,7 +66,7 @@ index 3e3cf99e..17f2bf4c 100644
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 674de454..031ea985 100644
index ccbc0e9e..4bf82153 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -32,7 +32,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -93,7 +93,7 @@ index 674de454..031ea985 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 e77804f8..51aed6da 100644
index 87c7b5dc..ecde76ec 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 e77804f8..51aed6da 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 b15045f6..05e6b438 100644
index fe900fcf..ec84f339 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
@@ -318,6 +318,12 @@ public abstract class EntityMap
@@ -315,6 +315,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index b15045f6..05e6b438 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.25.0
2.26.2

8
BungeeCord-Patches/0033-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From 9b4905038437b59bb1348eee4e45051c2c65396e Mon Sep 17 00:00:00 2001
From 5baa001a554607a1b2dd10e182e533c9b9e4d9cb Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -24,10 +24,10 @@ index 749059ab..6141128b 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 1e1df054..38392b64 100644
index 15ce6884..56a83e68 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -42,6 +42,14 @@
@@ -36,6 +36,14 @@
<version>${netty.version}</version>
<scope>compile</scope>
</dependency>
@ -171,5 +171,5 @@ index e0c52f21..37337429 100644
+ // Waterfall End
}
--
2.26.1
2.26.2

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

@ -1,4 +1,4 @@
From c80f530476acd698a1ad345bc8f8de8b5dc2d77b Mon Sep 17 00:00:00 2001
From 8682d0bf0119fff69a0dedd1470d4b678e07eec4 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -245,10 +245,10 @@ index 872f8fc1..c9531d39 100644
<module>protocol</module>
<module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 38392b64..54500dde 100644
index 56a83e68..0341a6bc 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -71,7 +71,7 @@
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>io.github.waterfallmc</groupId>
@ -458,5 +458,5 @@ index 10366c88..8c5cc949 100644
}
--
2.26.1
2.26.2

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

@ -1,4 +1,4 @@
From d5377834246c8b9d93ee383981289e25d0a0e6e4 Mon Sep 17 00:00:00 2001
From 7151de9564711a2024fecdbe477cbbb1cb8107f3 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
@ -156,18 +156,18 @@ index cfd25859..f845da09 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 05e6b438..e6afb98d 100644
index ec84f339..bc1de55a 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
@@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufInputStream;
import java.io.IOException;
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream;
import java.io.DataInputStream;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
@@ -26,6 +27,11 @@ public abstract class EntityMap
import se.llbit.nbt.NamedTag;
@@ -27,6 +28,11 @@ public abstract class EntityMap
// Returns the correct entity map for the protocol version
public static EntityMap getEntityMap(int version)
{
@ -179,7 +179,7 @@ index 05e6b438..e6afb98d 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -278,7 +284,13 @@ public abstract class EntityMap
@@ -277,7 +283,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -232,5 +232,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.26.1
2.26.2

22
BungeeCord-Patches/0055-Cap-tab-complete-packets-to-clients-max.patch Normal file
View File

@ -0,0 +1,22 @@
From 2a8a64e7e53e5c6784f65274ca35900bb47ed622 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 9 May 2020 21:40:23 -0400
Subject: [PATCH] Cap tab complete packets to clients max
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
index d6865ae2..fca4c5d2 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
@@ -41,7 +41,7 @@ public class TabCompleteRequest extends DefinedPacket
{
transactionId = readVarInt( buf );
}
- cursor = readString( buf );
+ cursor = readString( buf , 256); // Waterfall
if ( protocolVersion < ProtocolConstants.MINECRAFT_1_13 )
{
--
2.26.2