Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-10-01 07:57:31 +02:00
Code Issues Projects Releases Wiki Activity

Update Bungeecord

Browse Source
This commit is contained in:
Shane Freeder 2018-12-26 23:40:37 +00:00
parent 61b6cadebb
commit a177c30d89
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
14 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 7dd09289ee7aed473caaf228e461f8927c51f1a5
Subproject commit 5ef5dd2c098b69908a04a4ca2dc06824ec2e75c1

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

@ -1,4 +1,4 @@
From 1df2c40d2044cc8992d1fb9c1a646964f30cf162 Mon Sep 17 00:00:00 2001
From c0816a3c82b0eef1e18ff3b8ffd735dac3aa0968 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -69,10 +69,10 @@ index 25b81722..1693f42b 100644
// changes in the packet are ignored so we need to send it manually
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
index ffee7062..09486b4a 100644
index 16e07a4c..a2af0a36 100644
--- a/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;
@@ -43,9 +43,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
public class PipelineUtils
{

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

@ -1,4 +1,4 @@
From 4a5bbd52b44ae6c14c66164cc52e32d32a0b6651 Mon Sep 17 00:00:00 2001
From 16db7bf30fa514ef45a16b5725e986f513f61f36 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
@ -249,10 +249,10 @@ index 88d36ad2..fc92a7b5 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 dbd77a35..4c5fbb68 100644
index fff532de..13215254 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
@@ -624,7 +624,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -623,7 +623,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{

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

@ -1,4 +1,4 @@
From d70125960b62f1f6c896a0a324a1882140d788ed Mon Sep 17 00:00:00 2001
From ef5769511bea1499c03d9fac88efc172e18852c8 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 dddc57a8..45736498 100644
index 62c4bc74..7b82ced7 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 dddc57a8..45736498 100644
import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -109,18 +112,31 @@ public abstract class Configuration implements ProxyConfig
@@ -111,18 +114,31 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{

8
BungeeCord-Patches/0015-Enable-TCP_NODELAY.patch
View File

@ -1,4 +1,4 @@
From bb2127c0b92d7b97160e81045a7dc3ed80cd3814 Mon Sep 17 00:00:00 2001
From d913cae4e3057567b2ddf147342de2ae3cdca2a1 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Sun, 24 Jan 2016 15:13:29 -0700
Subject: [PATCH] Enable TCP_NODELAY.
@ -6,10 +6,10 @@ Subject: [PATCH] Enable TCP_NODELAY.
This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
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 09486b4a..41330ec2 100644
index a2af0a36..ba274eea 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -134,6 +134,7 @@ public class PipelineUtils
@@ -141,6 +141,7 @@ public class PipelineUtils
{
// IP_TOS is not supported (Windows XP / Windows Server 2003)
}
@ -18,5 +18,5 @@ index 09486b4a..41330ec2 100644
ch.config().setWriteBufferWaterMark( MARK );
--
2.19.1
2.20.1

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

@ -1,4 +1,4 @@
From 705dc82dc595ad8c539d46cefd51127523d18eea Mon Sep 17 00:00:00 2001
From 0d6d91e54aa7e1112a193107d52c1cf4de6e6214 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 b54e7b9b..54be8954 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 4c5fbb68..efced0e8 100644
index 13215254..4e1a4413 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
@@ -292,16 +292,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -296,16 +296,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -108,7 +108,7 @@ index 4c5fbb68..efced0e8 100644
// Ping
thisState = State.STATUS;
ch.setProtocol( Protocol.STATUS );
@@ -630,7 +629,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/0021-Add-a-property-to-accept-invalid-ping-packets.patch
View File

@ -1,4 +1,4 @@
From 694cea94842d2064df0231be1f7b6ffa1ab9c805 Mon Sep 17 00:00:00 2001
From d19cb1d5f3a20e34e22ead4ec7d7883990db3710 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 efced0e8..282d5ec2 100644
index 4e1a4413..3b565575 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
@@ -258,10 +258,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -262,10 +262,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}

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

@ -1,4 +1,4 @@
From 588ff53bcf3df531bc5de1a913adeb72aa1b46d4 Mon Sep 17 00:00:00 2001
From 31493ce2966e381dd290cf0a99eb1219fe91da76 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.
@ -157,7 +157,7 @@ index ebf9a12d..489b0018 100644
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 20ef5b0d..9dee3bff 100644
index d8ea68ea..9f1e5a0a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -591,10 +591,18 @@ public class BungeeCord extends ProxyServer
@ -181,7 +181,7 @@ index 20ef5b0d..9dee3bff 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 45736498..ba7a1e61 100644
index 7b82ced7..7d54e41a 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 @@
@ -208,7 +208,7 @@ index 45736498..ba7a1e61 100644
/**
* Set of all servers.
*/
@@ -65,6 +68,7 @@ public abstract class Configuration implements ProxyConfig
@@ -66,6 +69,7 @@ public abstract class Configuration implements ProxyConfig
private boolean forgeSupport;
private boolean injectCommands;
@ -216,7 +216,7 @@ index 45736498..ba7a1e61 100644
public void load()
{
ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
@@ -112,7 +116,7 @@ public abstract class Configuration implements ProxyConfig
@@ -114,7 +118,7 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -225,7 +225,7 @@ index 45736498..ba7a1e61 100644
this.servers = new CaseInsensitiveMap<>(newServers);
for ( ServerInfo oldServer : oldServers.values() )
@@ -170,4 +174,71 @@ public abstract class Configuration implements ProxyConfig
@@ -172,4 +176,71 @@ public abstract class Configuration implements ProxyConfig
{
return favicon;
}

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

@ -1,14 +1,14 @@
From f43c192dfecdd497e246131497933cdbae36eded Mon Sep 17 00:00:00 2001
From 8f6e98f20b6661478c0d488272561d375897c9ff 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 282d5ec2..5ba336d5 100644
index 3b565575..af3a8200 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
@@ -567,7 +567,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)
{

10
BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From 415429349c08dff2df7d415d2adc3d34e6585f0d Mon Sep 17 00:00:00 2001
From 1402d27067ec700f3a01ad7ceb1613e56d5e43cc Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -22,7 +22,7 @@ index 34d7e2cb..47d4ab36 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index b45cdba0..3542b6da 100644
index 03e35f42..fa1e6046 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -41,6 +41,14 @@
@ -168,10 +168,10 @@ index 2feb4d66..b265bb43 100644
+ // Waterfall End
}
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 41330ec2..c26fc55b 100644
index ba274eea..feea59d6 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -112,7 +112,7 @@ public class PipelineUtils
@@ -119,7 +119,7 @@ public class PipelineUtils
return epoll ? EpollSocketChannel.class : NioSocketChannel.class;
}
@ -181,5 +181,5 @@ index 41330ec2..c26fc55b 100644
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
}
--
2.19.1
2.20.1

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

@ -1,4 +1,4 @@
From 4fd06e8257c663bd26e05a05e4787954fd7b76f8 Mon Sep 17 00:00:00 2001
From 1b3b7473bbd23f585eb6bb27ead5fd4c526da180 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 5ba336d5..b1c086bf 100644
index af3a8200..b0b2994a 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
@@ -549,7 +549,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/0043-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From a4f26c5cac0e1c3782c0f5113967638c272572c0 Mon Sep 17 00:00:00 2001
From 7757dae81e5065844336d28a60919ca9806428fc 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 b1c086bf..e84c8aa4 100644
index b0b2994a..e81236fc 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
@@ -311,7 +311,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -315,7 +315,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
// Login

8
BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch
View File

@ -1,11 +1,11 @@
From 799eed4305aa7a672cf3cede6ff43bccfb78b17f Mon Sep 17 00:00:00 2001
From 0e00fe3d861d036364105256e5cba4dcbde97371 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 d246adb7..c1c04995 100644
index bda6525c..a518fe45 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -275,8 +275,6 @@ public class BungeeCord extends ProxyServer
@ -18,10 +18,10 @@ index d246adb7..c1c04995 100644
isRunning = true;
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 ba7a1e61..1d3a1113 100644
index 7d54e41a..2a3a47af 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
@@ -65,7 +65,7 @@ public abstract class Configuration implements ProxyConfig
@@ -66,7 +66,7 @@ public abstract class Configuration implements ProxyConfig
private Favicon favicon;
private int compressionThreshold = 256;
private boolean preventProxyConnections;

8
BungeeCord-Patches/0045-Add-Configuration-to-allow-empty-packets.patch
View File

@ -1,4 +1,4 @@
From 3cfe0e4cd7612acdd852103fc878b098fa95eeea Mon Sep 17 00:00:00 2001
From 23381cff6c1af4999870811c3461c5fce1c8cb6b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 12 Oct 2018 14:28:52 +0100
Subject: [PATCH] Add Configuration to allow empty packets
@ -89,10 +89,10 @@ index d343e9b8..ea06f3ba 100644
+ }
}
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 c26fc55b..3f082afb 100644
index feea59d6..042bccb5 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -139,7 +139,7 @@ public class PipelineUtils
@@ -146,7 +146,7 @@ public class PipelineUtils
ch.config().setWriteBufferWaterMark( MARK );
ch.pipeline().addLast( TIMEOUT_HANDLER, new ReadTimeoutHandler( BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS ) );
@ -102,5 +102,5 @@ index c26fc55b..3f082afb 100644
ch.pipeline().addLast( BOSS_HANDLER, new HandlerBoss() );
--
2.19.1
2.20.1