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

Updated Waterfall to Minecraft 1.11.1

Browse Source
This commit is contained in:
Tux 2016-12-21 02:34:59 -05:00
parent d8d9dc852a
commit 722e89f245
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 3ee7fdd90eb7b79e3e0049789a111324acfe6454 Subproject commit b728aea382c8d54691cce53749c6f15c4ed89dd5

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

@ -1,4 +1,4 @@
From 589e016fa89ab5857d865d1e88d8f71c3631046b Mon Sep 17 00:00:00 2001 From ed69b7e08433166181a6c167d14d932c775ea472 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600 Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers Subject: [PATCH] Allow invalid packet ids for forge servers
@ -37,10 +37,10 @@ index e7cb380..447eaae 100644
{ {
packet.read( in, prot.getDirection(), protocolVersion ); 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 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 01f2344..b36e65f 100644 index ac9129c..9153303 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -280,14 +280,18 @@ public enum Protocol @@ -282,14 +282,18 @@ public enum Protocol
return protocol; return protocol;
} }
@ -89,7 +89,7 @@ index f25b26d..ed057b8 100644
ch.write( BungeeCord.getInstance().registerChannels() ); ch.write( BungeeCord.getInstance().registerChannels() );
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java 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 042dab3..6d197ef 100644 index a439f79..f278a48 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -69,6 +69,7 @@ public final class UserConnection implements ProxiedPlayer @@ -69,6 +69,7 @@ public final class UserConnection implements ProxiedPlayer
@ -101,10 +101,10 @@ index 042dab3..6d197ef 100644
@Getter @Getter
@NonNull @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 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 34ddc19..a86b6d5 100644 index a8728bb..13d794e 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -107,6 +107,12 @@ public abstract class EntityMap @@ -108,6 +108,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet ); int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex; int packetIdLength = packet.readerIndex() - readerIndex;
@ -118,5 +118,5 @@ index 34ddc19..a86b6d5 100644
{ {
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
-- --
2.10.0 2.7.4

8
BungeeCord-Patches/0030-Better-debug-checks.patch
View File

@ -1,14 +1,14 @@
From 218cba36169895a2d0184c132cec9c7aca00e334 Mon Sep 17 00:00:00 2001 From 8123715386948ff4bf580cd258caeaebccb3f26c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Wed, 6 Apr 2016 23:46:00 -0700 Date: Wed, 6 Apr 2016 23:46:00 -0700
Subject: [PATCH] Better debug checks Subject: [PATCH] Better debug checks
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 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 b36e65f..8a857ad 100644 index 9153303..e62a38b 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -348,7 +348,7 @@ public enum Protocol @@ -350,7 +350,7 @@ public enum Protocol
{ {
throw new BadPacketException( "Unsupported protocol version" ); throw new BadPacketException( "Unsupported protocol version" );
} }
@ -18,5 +18,5 @@ index b36e65f..8a857ad 100644
return protocolData.packetMap.get( packet ); return protocolData.packetMap.get( packet );
} }
-- --
2.10.0 2.7.4

10
BungeeCord-Patches/0036-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From 30ba27e5de5a18b6dada9d3b2591966ef0e3e1a4 Mon Sep 17 00:00:00 2001 From 51c093da1160167eb42ed2214a8d78ea38c1b2c6 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io> From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400 Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods Subject: [PATCH] Add timeout variant to connect methods
@ -49,7 +49,7 @@ index 375815c..c49e900 100644
* Gets the server this player is connected to. * Gets the server this player is connected to.
* *
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java 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 a5f0e15..bbe4f15 100644 index f278a48..b984c0b 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -248,6 +248,12 @@ public final class UserConnection implements ProxiedPlayer @@ -248,6 +248,12 @@ public final class UserConnection implements ProxiedPlayer
@ -69,8 +69,8 @@ index a5f0e15..bbe4f15 100644
if ( retry && def != null && ( getServer() == null || def != getServer().getInfo() ) ) if ( retry && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{ {
sendMessage( bungee.getTranslation( "fallback_lobby" ) ); sendMessage( bungee.getTranslation( "fallback_lobby" ) );
- connect( def, null, false ); - connect( def, null, true );
+ connect( def, null, false, timeout ); // Waterfall + connect( def, null, true, timeout ); // Waterfall
} else if ( dimensionChange ) } else if ( dimensionChange )
{ {
disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) ); disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
@ -84,5 +84,5 @@ index a5f0e15..bbe4f15 100644
// Windows is bugged, multi homed users will just have to live with random connecting IPs // Windows is bugged, multi homed users will just have to live with random connecting IPs
if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() ) if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() )
-- --
2.10.0 2.7.4