Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-27 22:17:57 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Shane Freeder 2018-11-04 20:27:05 +00:00
parent b52c1ae633
commit c4351109e8
23 changed files with 111 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit cb4108c1b4638e83cb891e9d3acfc68cf1e1052c
Subproject commit 6c44ccd5978c8381d67f1a7604389d4cb5f92a80

14
BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,4 +1,4 @@
From f1112af6ff635230023c76474d4d7bfe9bcb4ad6 Mon Sep 17 00:00:00 2001
From 07f1a21a2ec62989967c0f86c1cd5c63f9f9ade3 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall
@ -53,10 +53,10 @@ index 9d51608d..446dfe2f 100644
while ( bungee.isRunning )
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 8d6fc41e..71f30980 100644
index 20e14557..7fe5bbea 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -182,7 +182,7 @@ public class BungeeCord extends ProxyServer
@@ -181,7 +181,7 @@ public class BungeeCord extends ProxyServer
public BungeeCord() throws IOException
{
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@ -65,7 +65,7 @@ index 8d6fc41e..71f30980 100644
System.setSecurityManager( new BungeeSecurityManager() );
@@ -487,7 +487,7 @@ public class BungeeCord extends ProxyServer
@@ -486,7 +486,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -101,10 +101,10 @@ index 771ef5dc..f5c028dd 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index 408312fd..95590b6d 100644
index e15c24c1..8a17c8d4 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -207,7 +207,7 @@ public class YamlConfig implements ConfigurationAdapter
@@ -208,7 +208,7 @@ public class YamlConfig implements ConfigurationAdapter
Map<String, Object> val = entry.getValue();
String name = entry.getKey();
String addr = get( "address", "localhost:25565", val );
@ -114,5 +114,5 @@ index 408312fd..95590b6d 100644
InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.18.0
2.19.1

20
BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
View File

@ -1,4 +1,4 @@
From b1daa760c06c5e706ae3bc34a67b2f646ed6b047 Mon Sep 17 00:00:00 2001
From 646d6568f7a1d99bf28ab4651ffa6f48140a99b2 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files
@ -42,10 +42,10 @@ index 00000000..741ebfde
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 71f30980..084bc11e 100644
index 7fe5bbea..a8bb4fd0 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -11,6 +11,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -10,6 +10,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@ -53,7 +53,7 @@ index 71f30980..084bc11e 100644
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
@@ -110,7 +111,7 @@ public class BungeeCord extends ProxyServer
@@ -109,7 +110,7 @@ public class BungeeCord extends ProxyServer
* Configuration.
*/
@Getter
@ -63,7 +63,7 @@ index 71f30980..084bc11e 100644
* Localization bundle.
*/
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 1ee82eec..6c722e8b 100644
index d7879d10..1c585e60 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
@@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;
@ -76,10 +76,10 @@ index 1ee82eec..6c722e8b 100644
/**
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index 95590b6d..1019c307 100644
index 8a17c8d4..5237182a 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -43,10 +43,15 @@ public class YamlConfig implements ConfigurationAdapter
@@ -44,10 +44,15 @@ public class YamlConfig implements ConfigurationAdapter
}
private final Yaml yaml;
private Map<String, Object> config;
@ -97,7 +97,7 @@ index 95590b6d..1019c307 100644
DumperOptions options = new DumperOptions();
options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
yaml = new Yaml( options );
@@ -54,6 +59,11 @@ public class YamlConfig implements ConfigurationAdapter
@@ -55,6 +60,11 @@ public class YamlConfig implements ConfigurationAdapter
@Override
public void load()
@ -109,7 +109,7 @@ index 95590b6d..1019c307 100644
{
try
{
@@ -82,6 +92,7 @@ public class YamlConfig implements ConfigurationAdapter
@@ -83,6 +93,7 @@ public class YamlConfig implements ConfigurationAdapter
throw new RuntimeException( "Could not load configuration!", ex );
}
@ -118,5 +118,5 @@ index 95590b6d..1019c307 100644
if ( permissions.isEmpty() )
{
--
2.18.0
2.19.1

12
BungeeCord-Patches/0005-Disable-Metrics.patch
View File

@ -1,4 +1,4 @@
From 0253c1e81e0ba939642670b1d68a7e71caaa537e Mon Sep 17 00:00:00 2001
From 4aabe9a68bec1377ce1f669eb45d9496ff52b46a Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Disable Metrics
@ -6,10 +6,10 @@ Subject: [PATCH] Disable Metrics
MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 084bc11e..b27aa939 100644
index a8bb4fd0..bfb83c21 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer
@@ -121,7 +121,7 @@ public class BungeeCord extends ProxyServer
* locations.yml save thread.
*/
private final Timer saveThread = new Timer( "Reconnect Saver" );
@ -18,7 +18,7 @@ index 084bc11e..b27aa939 100644
/**
* Server socket listener.
*/
@@ -298,7 +298,7 @@ public class BungeeCord extends ProxyServer
@@ -297,7 +297,7 @@ public class BungeeCord extends ProxyServer
}
}
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -27,7 +27,7 @@ index 084bc11e..b27aa939 100644
}
public void startListeners()
@@ -424,7 +424,7 @@ public class BungeeCord extends ProxyServer
@@ -423,7 +423,7 @@ public class BungeeCord extends ProxyServer
reconnectHandler.close();
}
saveThread.cancel();
@ -172,5 +172,5 @@ index a7ce8d82..00000000
- }
-}
--
2.19.0
2.19.1

8
BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
View File

@ -1,4 +1,4 @@
From 77ebde84a5230eb442dcb33a91c31452d83ce3fa Mon Sep 17 00:00:00 2001
From 4306f1a1ad51415e9e9951901036fa612cf55d08 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Mon, 25 Jan 2016 01:19:07 -0500
Subject: [PATCH] Get rid of the security manager.
@ -6,10 +6,10 @@ Subject: [PATCH] Get rid of the security manager.
There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index b27aa939..4a13910e 100644
index bfb83c21..49c97cd9 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -185,8 +185,6 @@ public class BungeeCord extends ProxyServer
@@ -184,8 +184,6 @@ public class BungeeCord extends ProxyServer
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
@ -103,5 +103,5 @@ index 53c81923..00000000
- }
-}
--
2.19.0
2.19.1

27
BungeeCord-Patches/0012-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From c564a733d0c0425b5d50255ab1401c08c0e62f04 Mon Sep 17 00:00:00 2001
From b5478f00dae047628ec4875a6f06b59a9074365d 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
@ -208,13 +208,13 @@ index 00000000..cc24dd35
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
index 86a00555..6c9c6d61 100644
index cb84917e..52bdb94d 100644
--- a/api/src/main/java/net/md_5/bungee/Util.java
+++ b/api/src/main/java/net/md_5/bungee/Util.java
@@ -1,11 +1,15 @@
package net.md_5.bungee;
@@ -2,11 +2,14 @@ package net.md_5.bungee;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLongs;
+import com.google.common.primitives.Ints;
import java.net.InetSocketAddress;
import java.net.URI;
@ -222,12 +222,11 @@ index 86a00555..6c9c6d61 100644
import java.util.UUID;
+import io.github.waterfallmc.waterfall.utils.Hex;
+import io.github.waterfallmc.waterfall.utils.UUIDUtils;
+
/**
* Series of utility classes to perform various operations.
*/
@@ -42,7 +46,7 @@ public class Util
@@ -43,7 +46,7 @@ public class Util
*/
public static String hex(int i)
{
@ -236,19 +235,11 @@ index 86a00555..6c9c6d61 100644
}
/**
@@ -78,6 +82,6 @@ public class Util
*/
public static UUID getUUID(String uuid)
{
- return UUID.fromString( uuid.substring( 0, 8 ) + "-" + uuid.substring( 8, 12 ) + "-" + uuid.substring( 12, 16 ) + "-" + uuid.substring( 16, 20 ) + "-" + uuid.substring( 20, 32 ) );
+ return UUIDUtils.fromString(uuid);
}
}
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
index 2f707ba6..8bf17f9c 100644
index 88d36ad2..fc92a7b5 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -75,7 +75,7 @@ public class ServerPing
@@ -74,7 +74,7 @@ public class ServerPing
public String getId()
{
@ -258,10 +249,10 @@ index 2f707ba6..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 d4fadcf6..0e8041f8 100644
index 34dd743c..8c79f9b0 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
@@ -625,7 +625,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -623,7 +623,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{

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

@ -1,4 +1,4 @@
From eb9f4837f090b83f109bfe1f33e8de123fbcdaad Mon Sep 17 00:00:00 2001
From ce1779441154b3ee785a35b2e2e594eea34ebe9f Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -12,14 +12,14 @@ However, there is now at least one Forge coremod that intends to support IP forw
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
index 29245c94..ee8cdff2 100644
index 15fc538a..ad5124e8 100644
--- a/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;
import com.google.common.base.Preconditions;
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
+import java.util.Arrays;
import java.util.Locale;
+import java.util.Arrays; // Waterfall
import java.util.Queue;
import java.util.Set;
import java.util.UUID;
@ -67,10 +67,10 @@ index 29245c94..ee8cdff2 100644
}
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 63742805..99cd19a1 100644
index 3d4208a8..c2cb40b9 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -166,8 +166,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );

6
BungeeCord-Patches/0017-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From 7efdaf9473c1dc4618d0dc8ac5c18ae196ac2a06 Mon Sep 17 00:00:00 2001
From 4eea1f91caa8823bfa82c670435f9dfd272b7550 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
- Don't create a data input stream for every plugin message we get from servers
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 4a13910e..4fbc307c 100644
index 49c97cd9..19b897c0 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -516,7 +516,9 @@ public class BungeeCord extends ProxyServer
@@ -515,7 +515,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>";
try
{

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

@ -1,4 +1,4 @@
From 8aeac5bd2bd635e4ec33db84f59b1159b6c3c391 Mon Sep 17 00:00:00 2001
From dea6ce57a1fd39a97f8538f1077a41fea125e3ce Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -66,7 +66,7 @@ index c4dd00a5..acd28a94 100644
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
index ee8cdff2..44821171 100644
index ad5124e8..07fdcedd 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -31,7 +31,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -93,10 +93,10 @@ index ee8cdff2..44821171 100644
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
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 99cd19a1..6146cb44 100644
index c2cb40b9..6843fd8b 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -70,6 +70,7 @@ public final class UserConnection implements ProxiedPlayer
@NonNull
private final ProxyServer bungee;
@NonNull

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

@ -1,4 +1,4 @@
From 8a3803baf50aa378e45427c5d631782ce8123a43 Mon Sep 17 00:00:00 2001
From 231014c38e148cc8f7b525da9fcff7e1bcfc0dbe 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.
@ -61,7 +61,7 @@ index 91743f01..a5db82b8 100644
public int getTabThrottle() {
return tabThrottle;
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 44821171..47904de1 100644
index 07fdcedd..1e9c4f1c 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -405,6 +405,6 @@ public class ServerConnector extends PacketHandler
@ -85,10 +85,10 @@ index 30f8a7df..ce8da75d 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 0e8041f8..cd240460 100644
index 8c79f9b0..1ebdd3f7 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
@@ -293,16 +293,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -291,16 +291,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -108,7 +108,7 @@ index 0e8041f8..cd240460 100644
// Ping
thisState = State.STATUS;
ch.setProtocol( Protocol.STATUS );
@@ -631,7 +630,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -629,7 +628,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{

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

@ -1,4 +1,4 @@
From 9eb7c9469fc69ff6c020baa704f58c97a2af9b9f Mon Sep 17 00:00:00 2001
From e860abea488203b54693c9bf1e458ca567884b30 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 cd240460..aa2d465e 100644
index 1ebdd3f7..689d9d72 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
@@ -259,10 +259,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -257,10 +257,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}

16
BungeeCord-Patches/0023-Use-a-worker-and-a-boss-event-loop-group.patch
View File

@ -1,4 +1,4 @@
From 594e46581ad93aebc8a12857247a35a9a75dddb4 Mon Sep 17 00:00:00 2001
From 1adff2bcbf3ec2a30cbe03cb0220029b43d1f9df Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,10 +8,10 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 4fbc307c..43abe22e 100644
index 19b897c0..20ef5b0d 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
@@ -116,7 +116,7 @@ public class BungeeCord extends ProxyServer
*/
private ResourceBundle baseBundle;
private ResourceBundle customBundle;
@ -20,7 +20,7 @@ index 4fbc307c..43abe22e 100644
/**
* locations.yml save thread.
*/
@@ -254,7 +254,8 @@ public class BungeeCord extends ProxyServer
@@ -253,7 +253,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
}
@ -30,7 +30,7 @@ index 4fbc307c..43abe22e 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -328,7 +329,7 @@ public class BungeeCord extends ProxyServer
@@ -327,7 +328,7 @@ public class BungeeCord extends ProxyServer
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index 4fbc307c..43abe22e 100644
.localAddress( info.getHost() )
.bind().addListener( listener );
@@ -349,7 +350,7 @@ public class BungeeCord extends ProxyServer
@@ -348,7 +349,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index 4fbc307c..43abe22e 100644
}
}
}
@@ -444,12 +445,14 @@ public class BungeeCord extends ProxyServer
@@ -443,12 +444,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
@ -70,7 +70,7 @@ index 4fbc307c..43abe22e 100644
getLogger().info( "Thank you and goodbye" );
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index 9756c09c..648cd273 100644
index 875ad538..ec96d1fd 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -145,7 +145,7 @@ public class BungeeServerInfo implements ServerInfo

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

@ -1,4 +1,4 @@
From f5d5d0c3e84b58853c7c906c99134b5ea89dd6be Mon Sep 17 00:00:00 2001
From 8334a03d4f60df604ea20808354c9c74fa3f5075 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.
@ -144,23 +144,23 @@ index 262b29c8..d7ed3e11 100644
{
int index = path.indexOf( SEPARATOR );
diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
index 416c54e3..920b9b36 100644
index 27672410..91b4bed9 100644
--- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
+++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
@@ -84,7 +84,7 @@ public class CommandServer extends Command implements TabExecutor
@@ -85,7 +85,7 @@ public class CommandServer extends Command implements TabExecutor
@Override
public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
{
- return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate<ServerInfo>()
+ return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServersCopy().values(), new Predicate<ServerInfo>() // Waterfall: use #getServersCopy()
{
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase();
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 43abe22e..07eeea16 100644
index 20ef5b0d..9dee3bff 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -592,10 +592,18 @@ public class BungeeCord extends ProxyServer
@@ -591,10 +591,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}

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

@ -1,14 +1,14 @@
From eb80d2fbc538e46b9dae8431f582ce2c73d4c958 Mon Sep 17 00:00:00 2001
From 141f6b978b357db3b6415352353329227960e068 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 aa2d465e..45cd5237 100644
index 689d9d72..67ec0628 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
@@ -568,7 +568,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -566,7 +566,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void disconnect(final BaseComponent... reason)
{

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

@ -1,4 +1,4 @@
From 69ed7d98ee77a01aec56aa398ef79bb944d0fb91 Mon Sep 17 00:00:00 2001
From 93618bd99aeee183cd0c81987a06c2f4196fc2b5 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent
@ -62,7 +62,7 @@ index 0e1ef5c4..ee63732d 100644
@Deprecated
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
index 47904de1..0937c39d 100644
index 1e9c4f1c..1d75cd0d 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -328,7 +328,7 @@ public class ServerConnector extends PacketHandler
@ -71,7 +71,7 @@ index 47904de1..0937c39d 100644
ServerInfo def = user.updateAndGetNextServer( target );
- ServerKickEvent event = new ServerKickEvent( user, target, ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTING );
+ ServerKickEvent event = new ServerKickEvent( user, target, ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTING, ServerKickEvent.Cause.SERVER ); // Waterfall
if ( event.getKickReason().toLowerCase().contains( "outdated" ) && def != null )
if ( event.getKickReason().toLowerCase( Locale.ROOT ).contains( "outdated" ) && def != null )
{
// Pre cancel the event if we are going to try another server
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java

6
BungeeCord-Patches/0030-Configurable-server-version-in-ping-response.patch
View File

@ -1,4 +1,4 @@
From b08ce33715814a6afd88323c8351dcab3fe5b39d Mon Sep 17 00:00:00 2001
From 083b58bf741464f3b964a497b30d91b3503b901b Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response
@ -68,10 +68,10 @@ index a5db82b8..e55c28d8 100644
public int getTabThrottle() {
return tabThrottle;
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 07eeea16..595b7375 100644
index 9dee3bff..5f34eb4e 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -646,7 +646,7 @@ public class BungeeCord extends ProxyServer
@@ -645,7 +645,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{

8
BungeeCord-Patches/0031-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From dd3d26f55d4271de7f08dea122985c3bb1b5a609 Mon Sep 17 00:00:00 2001
From c6d0eb39009c26b22c0902675d9e139df9ab16f9 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
@ -75,10 +75,10 @@ index e3e999b0..de09cd54 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
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 6146cb44..d1d3142e 100644
index 6843fd8b..6dae9a88 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -257,9 +257,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -255,9 +255,20 @@ public final class UserConnection implements ProxiedPlayer
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{
@ -99,7 +99,7 @@ index 6146cb44..d1d3142e 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -353,7 +364,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -351,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );

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

@ -1,4 +1,4 @@
From a9838cfb9f29641112d334f3f625d107b30aa5d0 Mon Sep 17 00:00:00 2001
From d2390a542d1ff7a0767a288a7c1de649b5f583df Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -165,12 +165,12 @@ index 00000000..7ed2dc3a
+ }
+}
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 d1d3142e..032ffcbe 100644
index 6dae9a88..9c872a1c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -2,7 +2,9 @@ package net.md_5.bungee;
@@ -1,7 +1,9 @@
package net.md_5.bungee;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
+import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableMap;
@ -178,7 +178,7 @@ index d1d3142e..032ffcbe 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -127,6 +129,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();

16
BungeeCord-Patches/0038-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From d89e83caad7e2663ed8835ef5c8d45121afc4fde Mon Sep 17 00:00:00 2001
From 378fbb34c6b7b1aaf2513cfcb35b52fcd279c1ac Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -368,10 +368,10 @@ index 00000000..765d24bc
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 595b7375..cba6f0b2 100644
index 5f34eb4e..d246adb7 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -44,7 +44,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -379,7 +379,7 @@ index 595b7375..cba6f0b2 100644
import lombok.Getter;
import lombok.Setter;
import lombok.Synchronized;
@@ -78,14 +77,11 @@ import net.md_5.bungee.command.CommandEnd;
@@ -77,14 +76,11 @@ import net.md_5.bungee.command.CommandEnd;
import net.md_5.bungee.command.CommandIP;
import net.md_5.bungee.command.CommandPerms;
import net.md_5.bungee.command.CommandReload;
@ -394,7 +394,7 @@ index 595b7375..cba6f0b2 100644
import net.md_5.bungee.module.ModuleManager;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.DefinedPacket;
@@ -95,7 +91,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
@@ -94,7 +90,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
import net.md_5.bungee.query.RemoteQuery;
import net.md_5.bungee.scheduler.BungeeScheduler;
import net.md_5.bungee.util.CaseInsensitiveMap;
@ -402,7 +402,7 @@ index 595b7375..cba6f0b2 100644
/**
* Main BungeeCord proxy class.
@@ -151,8 +146,12 @@ public class BungeeCord extends ProxyServer
@@ -150,8 +145,12 @@ public class BungeeCord extends ProxyServer
private final File pluginsFolder = new File( "plugins" );
@Getter
private final BungeeScheduler scheduler = new BungeeScheduler();
@ -415,7 +415,7 @@ index 595b7375..cba6f0b2 100644
@Getter
private final Logger logger;
public final Gson gson = new GsonBuilder()
@@ -194,6 +193,8 @@ public class BungeeCord extends ProxyServer
@@ -193,6 +192,8 @@ public class BungeeCord extends ProxyServer
}
reloadMessages();
@ -424,7 +424,7 @@ index 595b7375..cba6f0b2 100644
// This is a workaround for quite possibly the weirdest bug I have ever encountered in my life!
// When jansi attempts to extract its natives, by default it tries to extract a specific version,
// using the loading class's implementation version. Normally this works completely fine,
@@ -212,6 +213,9 @@ public class BungeeCord extends ProxyServer
@@ -211,6 +212,9 @@ public class BungeeCord extends ProxyServer
logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );

6
BungeeCord-Patches/0042-Add-console-command-completion.patch
View File

@ -1,4 +1,4 @@
From 6416fac20ab6c775f7215b522ba3ca4694fddb48 Mon Sep 17 00:00:00 2001
From b13b48f5d49cde1a9a2a414ee7afa16ccfaf19d5 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion
@ -7,10 +7,10 @@ Register command completer for JLine to complete command names and
command arguments (if supported).
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index 05dbe499..f882a678 100644
index afa98ed9..c9ac96d6 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -180,6 +180,41 @@ public class PluginManager
@@ -181,6 +181,41 @@ public class PluginManager
return true;
}

6
BungeeCord-Patches/0043-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
View File

@ -1,4 +1,4 @@
From b34a16032901128a9ebfe6a5ab454883b521d488 Mon Sep 17 00:00:00 2001
From 6109fd66b8240d689787b5e0dccddb001af5f5a2 Mon Sep 17 00:00:00 2001
From: phenomax <phenomax@revayd.net>
Date: Thu, 10 Aug 2017 18:41:17 +0200
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@ -52,10 +52,10 @@ similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
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 45cd5237..c546e7be 100644
index 67ec0628..e5392222 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
@@ -550,7 +550,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -548,7 +548,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
};
// fire login event

6
BungeeCord-Patches/0044-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From 13823f5f24ba50f4d43145ae740b5207933e8716 Mon Sep 17 00:00:00 2001
From 30331abf6b9c9b7b77ad2ed9fa35c46712504de2 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 8 Feb 2018 19:10:52 +0100
Subject: [PATCH] Optionally log InitialHandler connections
@ -59,10 +59,10 @@ index b7e3dad0..d343e9b8 100644
public String getGameVersion() {
return gameVersion;
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 c546e7be..8f63e997 100644
index e5392222..16d60577 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
@@ -312,7 +312,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -310,7 +310,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
// Login

6
BungeeCord-Patches/0045-Forge-is-a-first-class-citizen.patch
View File

@ -1,14 +1,14 @@
From b36df95c6c0854c374215b5992de07cdcf59d059 Mon Sep 17 00:00:00 2001
From 6e0df61d18f3c78c6565a70dd15ec73030676ef1 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index cba6f0b2..1e86728f 100644
index d246adb7..c1c04995 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -276,8 +276,6 @@ public class BungeeCord extends ProxyServer
@@ -275,8 +275,6 @@ public class BungeeCord extends ProxyServer
registerChannel( ForgeConstants.FML_TAG );
registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
registerChannel( ForgeConstants.FORGE_REGISTER );