Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 13:15:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-09-05 18:17:15 +01:00
parent 1625d25ae9
commit c676a410b0
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit d7010d629d12bc12578d770bfdf48bcf068994d5 Subproject commit ef326dba192fe532dc6509e0975266715da5ccea

8
BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From 7079e38721fbfbd4821c240c44fd958038146041 Mon Sep 17 00:00:00 2001 From efe1e7fd8d05933f94e21c8be493f41a6a8d0025 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700 Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -43,10 +43,10 @@ index 6dcdece5..e67773d9 100644
* Allow this packet to be sent as an "extended" packet. * Allow this packet to be sent as an "extended" packet.
*/ */
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java 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 111ee8b4..fcb3dc0d 100644 index 6c31f15f..4a96a601 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -199,7 +199,7 @@ public class ServerConnector extends PacketHandler @@ -200,7 +200,7 @@ public class ServerConnector extends PacketHandler
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -69,7 +69,7 @@ index 4049e815..1010f361 100644
// changes in the packet are ignored so we need to send it manually // changes in the packet are ignored so we need to send it manually
con.unsafe().sendPacket( pluginMessage ); con.unsafe().sendPacket( pluginMessage );
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 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 5f4020cc..9d6a1013 100644 index 551ae1e1..be9685b9 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -42,9 +42,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender; @@ -42,9 +42,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;

8
BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From 6741481b996f418b8572825b0530ba62a4003f74 Mon Sep 17 00:00:00 2001 From 3a77b663f41bad162c3af12e57ec27e60e7f947f Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk> From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400 Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
No breaking changes occur due to this patch. No breaking changes occur due to this patch.
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java 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 fcb3dc0d..e0235212 100644 index 4a96a601..61c53b30 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -3,6 +3,7 @@ package net.md_5.bungee; @@ -3,6 +3,7 @@ package net.md_5.bungee;
@ -23,7 +23,7 @@ index fcb3dc0d..e0235212 100644
import java.util.Queue; import java.util.Queue;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@@ -92,15 +93,39 @@ public class ServerConnector extends PacketHandler @@ -93,15 +94,39 @@ public class ServerConnector extends PacketHandler
String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID(); String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID();
LoginResult profile = user.getPendingConnection().getLoginProfile(); LoginResult profile = user.getPendingConnection().getLoginProfile();
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token. * The FML 1.8 handshake token.
*/ */
-- --
2.13.4 2.14.1

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

@ -1,4 +1,4 @@
From 9df293758781b8339407ae80df62e0f091821188 Mon Sep 17 00:00:00 2001 From 061e26b5c385d34e39b848275ee1b25a6a025033 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
@ -66,7 +66,7 @@ index 61e2b42d..c92a922a 100644
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 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 e0235212..dc5b82e2 100644 index 61c53b30..b29ee7c5 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -29,7 +29,9 @@ import net.md_5.bungee.forge.ForgeUtils; @@ -29,7 +29,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -79,7 +79,7 @@ index e0235212..dc5b82e2 100644
import net.md_5.bungee.protocol.Protocol; import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.packet.EncryptionRequest; import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.Handshake; import net.md_5.bungee.protocol.packet.Handshake;
@@ -183,6 +185,12 @@ public class ServerConnector extends PacketHandler @@ -184,6 +186,12 @@ public class ServerConnector extends PacketHandler
ServerConnection server = new ServerConnection( ch, target ); ServerConnection server = new ServerConnection( ch, target );
ServerConnectedEvent event = new ServerConnectedEvent( user, server ); ServerConnectedEvent event = new ServerConnectedEvent( user, server );

6
BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 93f11d0a72f6eaae08ff78ec356db302aeb53919 Mon Sep 17 00:00:00 2001 From dda08d057e2f6a042eb7c68b45acbd8ba6ca8046 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de> From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100 Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging. Subject: [PATCH] Optional server list ping logging.
@ -61,10 +61,10 @@ index e56d3591..68f25460 100644
+ } + }
} }
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java 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 dc5b82e2..f8532dc2 100644 index b29ee7c5..79e88cc5 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -388,6 +388,6 @@ public class ServerConnector extends PacketHandler @@ -389,6 +389,6 @@ public class ServerConnector extends PacketHandler
@Override @Override
public String toString() public String toString()
{ {

6
BungeeCord-Patches/0034-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 1463032538618e57bb22aee7125c75cb3f424471 Mon Sep 17 00:00:00 2001 From 55096ef5dba0f4d8a11db03b2a757f0245429193 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io> From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500 Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent Subject: [PATCH] Improve ServerKickEvent
@ -62,10 +62,10 @@ index 0e1ef5c4..ee63732d 100644
@Deprecated @Deprecated
public String getKickReason() public String getKickReason()
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java 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 f8532dc2..c447524e 100644 index 79e88cc5..38361c2b 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -313,7 +313,7 @@ public class ServerConnector extends PacketHandler @@ -314,7 +314,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception public void handle(Kick kick) throws Exception
{ {
ServerInfo def = user.updateAndGetNextServer( target ); ServerInfo def = user.updateAndGetNextServer( target );