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

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-05-28 22:00:27 +01:00
parent aab96dc7e8
commit f539c023a3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 2c84083153ed1845e432b350517c09fdd85939af Subproject commit 968916c0b83550961e96da858f4be29a81c785b8

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

@ -1,4 +1,4 @@
From ef839d48f68cbcbb545180ff88559c0d7a9f1b59 Mon Sep 17 00:00:00 2001 From fcc7a9df25e9acec9056283d51533eb12f059c85 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
@ -6,7 +6,7 @@ Subject: [PATCH] Don't access a ByteBuf's underlying array
It returns the underlying array storage, and does *not* return a view of the buffer as an array It returns the underlying array storage, and does *not* return a view of the buffer as an array
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
index 6dcdece5..e67773d9 100644 index d578402b..756f7c2f 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
@@ -2,6 +2,7 @@ package net.md_5.bungee.protocol.packet; @@ -2,6 +2,7 @@ package net.md_5.bungee.protocol.packet;
@ -18,7 +18,7 @@ index 6dcdece5..e67773d9 100644
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@@ -29,10 +30,23 @@ public class PluginMessage extends DefinedPacket @@ -29,10 +30,23 @@ public class PluginMessage extends DefinedPacket
return input.getTag().equals( "REGISTER" ) || input.getTag().equals( "MC|Brand" ); return ( input.getTag().equals( "REGISTER" ) || input.getTag().equals( "MC|Brand" ) ) && input.getData().length < Byte.MAX_VALUE;
} }
}; };
- // - //
@ -43,7 +43,7 @@ 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 b2eef8e6..8194dbde 100644 index b34247ce..67a6d247 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
@@ -201,7 +201,7 @@ public class ServerConnector extends PacketHandler @@ -201,7 +201,7 @@ public class ServerConnector extends PacketHandler
@ -86,5 +86,5 @@ index 551ae1e1..be9685b9 100644
{ {
@Override @Override
-- --
2.16.3 2.17.0.windows.1

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

@ -1,4 +1,4 @@
From da1be2161a2c3c701996135871c9a53080c4c66b Mon Sep 17 00:00:00 2001 From 58fd8c6129c3d7a113d43f5afec755f6dee0d334 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com> From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200 Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -234,10 +234,10 @@ index c6da6c47..1edb9439 100644
public void handle(Respawn respawn) public void handle(Respawn respawn)
{ {
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
index 673497e5..17e250d4 100644 index 0d683856..c1272da3 100644
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java --- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
@@ -8,6 +8,8 @@ import lombok.NonNull; @@ -9,6 +9,8 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import net.md_5.bungee.UserConnection; import net.md_5.bungee.UserConnection;
@ -246,7 +246,7 @@ index 673497e5..17e250d4 100644
import net.md_5.bungee.protocol.packet.PluginMessage; import net.md_5.bungee.protocol.packet.PluginMessage;
/** /**
@@ -90,9 +92,23 @@ public class ForgeClientHandler @@ -92,9 +94,23 @@ public class ForgeClientHandler
public void resetHandshake() public void resetHandshake()
{ {
state = ForgeClientHandshakeState.HELLO; state = ForgeClientHandshakeState.HELLO;
@ -271,5 +271,5 @@ index 673497e5..17e250d4 100644
* Sends the server mod list to the client, or stores it for sending later. * Sends the server mod list to the client, or stores it for sending later.
* *
-- --
2.16.3 2.17.0.windows.1