Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-28 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

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

Waterfall Changes:
2b3b0ec Ignore empty packets
This commit is contained in:
Shane Freeder 2019-10-10 16:43:52 +01:00
parent 3fcb94c77e
commit 997635669d
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 420f7836b36fc3163a1773f4cda800626a579b09
Subproject commit 2b3b0ec9982a4526aa1edc305254e1a08bfc3743

20
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From b5eeebb87a78f3bf1449b60aa82ef04c7d1b9c80 Mon Sep 17 00:00:00 2001
From e96543ee3dba4b62ae0a82c944fbe35ca9289523 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch
@ -129,7 +129,7 @@ index 9951c1f9..34f9c373 100644
@Override
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 a46bbc78..01997098 100644
index 71ddf022..e6f8d705 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
@@ -5,10 +5,11 @@ import io.netty.buffer.ByteBufUtil;
@ -145,7 +145,7 @@ index a46bbc78..01997098 100644
@AllArgsConstructor
public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
{
@@ -57,7 +58,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -49,7 +50,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
if ( packet != null )
{
packetTypeInfo = packet.getClass();
@ -489,7 +489,7 @@ index ff1f28aa..ba6faa8d 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1,
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index 8de4d9be..d2e319f3 100644
index 743d65e4..37bf6b4b 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -6,10 +6,12 @@ import io.netty.channel.ChannelHandlerContext;
@ -503,11 +503,11 @@ index 8de4d9be..d2e319f3 100644
+ private AtomicLong lastEmptyPacket = new AtomicLong(0); // Travertine
private static boolean DIRECT_WARNING;
// Waterfall start
private boolean allowEmptyPackets;
@@ -41,7 +43,15 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@Override
@@ -34,7 +36,15 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
// Waterfall end
if ( length == 0 && !allowEmptyPackets) // Waterfall
if ( false && length == 0) // Waterfall - ignore
{
- throw new CorruptedFrameException( "Empty Packet!" );
+ // Travertine start - vanilla 1.7 client sometimes sends empty packets.
@ -1411,7 +1411,7 @@ index 72f487dc..a92b979a 100644
throw CancelSendSignal.INSTANCE;
}
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 15f7c5b5..6b6847ac 100644
index 7e9678d9..18cecf6d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -53,6 +53,7 @@ import net.md_5.bungee.protocol.MinecraftDecoder;
@ -2008,5 +2008,5 @@ index daf12f74..e33861ab 100644
@Override
--
2.22.0
2.23.0