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

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-04-28 21:22:02 +01:00
parent bfb622eb23
commit 11f46ca049
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit bfab8a1d9c757d8e5f414ead5e0a5cf8d3df5815
Subproject commit 806a6dfacaadb7538860889f8a50612bb496a2d3

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

@ -1,4 +1,4 @@
From dbda96c0e643167a28b173be02282cd92ab43046 Mon Sep 17 00:00:00 2001
From 3db1b8755a261637bf6bd9d7db9e3d110266ee93 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 9852a0a0..0353f954 100644
index b30e913c..1faab816 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
@@ -597,7 +597,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -599,7 +599,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -271,5 +271,5 @@ index 9852a0a0..0353f954 100644
@Override
--
2.11.0
2.12.0

8
BungeeCord-Patches/0015-Allow-removing-servers-or-changing-addresses-on-relo.patch
View File

@ -1,4 +1,4 @@
From 2ba4d2a3da76d19e3503c97b7d4d7483f6b2ced4 Mon Sep 17 00:00:00 2001
From 0734250ce1c5f9406fd23d69cb5c66e09ac5a73d Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload
@ -10,7 +10,7 @@ Kicks players on failure to move.
Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 81dd4af..db9ebbd 100644
index 1d267a63..b3ff1448 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -11,12 +11,15 @@ import java.util.UUID;
@ -29,7 +29,7 @@ index 81dd4af..db9ebbd 100644
import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -97,18 +100,31 @@ public abstract class Configuration implements ProxyConfig
@@ -99,18 +102,31 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -72,5 +72,5 @@ index 81dd4af..db9ebbd 100644
}
}
--
2.8.3
2.12.0

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

@ -1,4 +1,4 @@
From 56e3108c0a0c095cb85ad542c0d755de22b29191 Mon Sep 17 00:00:00 2001
From 4e7690e8e721f42b83cb94e879540934d885a1cf 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 0353f954..915b4152 100644
index 1faab816..7886f518 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
@@ -280,19 +280,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -281,19 +281,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -112,7 +112,7 @@ index 0353f954..915b4152 100644
thisState = State.USERNAME;
ch.setProtocol( Protocol.LOGIN );
@@ -603,7 +606,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -605,7 +608,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -134,5 +134,5 @@ index 654be214..618e76e3 100644
}
}
--
2.11.0
2.12.0

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

@ -1,4 +1,4 @@
From eccac24c6bbc21f25e308135b3061885dd4f1fa9 Mon Sep 17 00:00:00 2001
From eaff91b2f9e5a8422dfe751efdfbe7e8c001a399 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 915b4152..875ac5e3 100644
index 7886f518..be3e0869 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
@@ -246,10 +246,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -247,10 +247,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}
@ -29,5 +29,5 @@ index 915b4152..875ac5e3 100644
disconnect( "" );
}
--
2.11.0
2.12.0

12
BungeeCord-Patches/0032-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 9cb84743b549d8586a3ce7c762e06b1c8e84df34 Mon Sep 17 00:00:00 2001
From 135b4d01ad4b618ba569f66bff535e8217785cb1 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -168,7 +168,7 @@ index 8a4b2283..95750d44 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index db9ebbdd..4d16fa3a 100644
index b3ff1448..669720a6 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -1,6 +1,7 @@
@ -195,15 +195,15 @@ index db9ebbdd..4d16fa3a 100644
/**
* Set of all servers.
*/
@@ -61,6 +64,7 @@ public abstract class Configuration implements ProxyConfig
private Favicon favicon;
@@ -62,6 +65,7 @@ public abstract class Configuration implements ProxyConfig
private int compressionThreshold = 256;
private boolean preventProxyConnections;
+ @Synchronized("serversLock") // Waterfall
public void load()
{
ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
@@ -100,7 +104,7 @@ public abstract class Configuration implements ProxyConfig
@@ -102,7 +106,7 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -212,7 +212,7 @@ index db9ebbdd..4d16fa3a 100644
this.servers = new CaseInsensitiveMap<>(newServers);
for ( ServerInfo oldServer : oldServers.values() )
@@ -158,4 +162,71 @@ public abstract class Configuration implements ProxyConfig
@@ -160,4 +164,71 @@ public abstract class Configuration implements ProxyConfig
{
return favicon;
}

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

@ -1,14 +1,14 @@
From 0862ba1ee5c047fbf6db4594d9196dc886a6238d Mon Sep 17 00:00:00 2001
From 45faf355951dec8e69967ffaf90a3e1006af706b 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 875ac5e3..fce9ca9d 100644
index be3e0869..af787eae 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
@@ -265,7 +265,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -266,7 +266,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
this.handshake = handshake;
ch.setVersion( handshake.getProtocolVersion() );
@ -17,7 +17,7 @@ index 875ac5e3..fce9ca9d 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
@@ -544,7 +544,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -546,7 +546,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void disconnect(final BaseComponent... reason)
{
@ -27,5 +27,5 @@ index 875ac5e3..fce9ca9d 100644
ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
} else
--
2.11.0
2.12.0