Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-06-26 14:35:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-05-10 18:54:46 +01:00
parent 11f46ca049
commit ec611c5d0a
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 806a6dfacaadb7538860889f8a50612bb496a2d3
Subproject commit 5bc189fbb7e8ca19984544af78a083024404fb2a

6
BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From 3db1b8755a261637bf6bd9d7db9e3d110266ee93 Mon Sep 17 00:00:00 2001
From 5ef37b1ee040906e1b3d31ca110c505d8422145c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -258,10 +258,10 @@ index 27b51849..8bf17f9c 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index b30e913c..1faab816 100644
index 68aa3f85..616e9ee8 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -599,7 +599,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -601,7 +601,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{

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

@ -1,4 +1,4 @@
From 4e7690e8e721f42b83cb94e879540934d885a1cf Mon Sep 17 00:00:00 2001
From 94262394783a847ac69092a99336359f25a073cb Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.
@ -85,10 +85,10 @@ index ce32f6b1..470f0bef 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 1faab816..7886f518 100644
index 616e9ee8..497384c4 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -281,19 +281,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -282,19 +282,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -112,7 +112,7 @@ index 1faab816..7886f518 100644
thisState = State.USERNAME;
ch.setProtocol( Protocol.LOGIN );
@@ -605,7 +608,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -607,7 +610,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{

6
BungeeCord-Patches/0024-Add-a-property-to-accept-invalid-ping-packets.patch
View File

@ -1,4 +1,4 @@
From eaff91b2f9e5a8422dfe751efdfbe7e8c001a399 Mon Sep 17 00:00:00 2001
From 9d7e3ff31779f813dcecb055a610325fbc5b00da Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets
@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
Fixes #23
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 7886f518..be3e0869 100644
index 497384c4..d6c0ce2a 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -247,10 +247,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -248,10 +248,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}

8
BungeeCord-Patches/0033-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch
View File

@ -1,14 +1,14 @@
From 45faf355951dec8e69967ffaf90a3e1006af706b Mon Sep 17 00:00:00 2001
From 2222e21e5db34c66ba69e801e56308b6d4d9166a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:36:10 -0600
Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index be3e0869..af787eae 100644
index d6c0ce2a..62cbf70f 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -266,7 +266,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -267,7 +267,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
this.handshake = handshake;
ch.setVersion( handshake.getProtocolVersion() );
@ -17,7 +17,7 @@ index be3e0869..af787eae 100644
// with Bungee's IP forwarding, so we detect it, and remove it from the host string, for now.
// We know FML appends \00FML\00. However, we need to also consider that other systems might
// add their own data to the end of the string. So, we just take everything from the \0 character
@@ -546,7 +546,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -548,7 +548,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void disconnect(final BaseComponent... reason)
{