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 (BungeeCord)

Browse Source 
Fixes #356

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:
caeabb5b #2610: Fix out of date message for unsupported versions
This commit is contained in:
Shane Freeder 2019-03-09 01:29:03 +00:00
parent 504670360d
commit c31195b627
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit e2bc7ed797c5e8d76d61339d0eb1f067521e5bb7
Subproject commit caeabb5b62694ef761d5a0524b80cef2fa1d7abd

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

@ -1,4 +1,4 @@
From 9e9254228993e2de0601a0644dac5b8abf0491ca Mon Sep 17 00:00:00 2001
From f39c08d489df643450f3e8270c0f799da0c89858 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,11 +37,11 @@ index ea44573d..5b32effe 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 56d8a0de..fac02784 100644
index 98be98e8..3e73345f 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
@@ -359,14 +359,23 @@ public enum Protocol
}
@@ -370,14 +370,23 @@ public enum Protocol
return protocol;
}
+ public boolean hasPacket(int i, boolean supportsForge) {
@ -55,7 +55,7 @@ index 56d8a0de..fac02784 100644
+
+ public final DefinedPacket createPacket(int id, int version, boolean supportsForge)
{
ProtocolData protocolData = protocols.get( version );
ProtocolData protocolData = getProtocolData( version );
if ( protocolData == null )
{
throw new BadPacketException( "Unsupported protocol version " + version );
@ -122,5 +122,5 @@ index 1ecee69e..994670cd 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.21.0
2.20.1

10
BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From e933e744f00c8910885eb33b2f3c55c0c3eeb946 Mon Sep 17 00:00:00 2001
From 177925e31475b3720037d0765f44d9bfff151a09 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,10 +33,10 @@ index 219488dd..bef7b370 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 fac02784..4966d0a5 100644
index 3e73345f..01af5c1c 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
@@ -15,6 +15,8 @@ import net.md_5.bungee.protocol.packet.Commands;
@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Commands;
import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
import net.md_5.bungee.protocol.packet.EntityStatus;
@ -45,7 +45,7 @@ index fac02784..4966d0a5 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;
@@ -88,6 +90,25 @@ public enum Protocol
@@ -89,6 +91,25 @@ public enum Protocol
BossBar.class,
map( ProtocolConstants.MINECRAFT_1_9, 0x0C )
);
@ -273,5 +273,5 @@ index 0d683856..c1272da3 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.21.0
2.20.1