Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 19:17:41 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
f1c32f84 #2379: Add ServerSwitchEvent getFrom API
cb3f87bb Update Netty to 4.1.48.Final
This commit is contained in:
Shane Freeder 2020-04-02 18:05:14 +01:00
parent 6f3e7d0d4d
commit e10d558b8b
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 697f0875e65bc57676165b94654992f018e6851c
Subproject commit f1c32f84f46589632d7721d8de87d5589ef8e6a6

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

@ -1,4 +1,4 @@
From 049625bef454fd6b564e95af81abc79eeb0252a7 Mon Sep 17 00:00:00 2001
From 51ae3b4db60a3e32284f940a05db847890e16e65 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Improve server list ping logging
@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this
patch remains for a few misc improvements around here
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 031ea985..fbe4ffe2 100644
index 4bf82153..d431f514 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -422,6 +422,6 @@ public class ServerConnector extends PacketHandler
@@ -423,6 +423,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index c7e1a621..d44d4c2e 100644
}
}
--
2.25.0
2.26.0

8
BungeeCord-Patches/0028-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From d44e2a7fcbcea35ab7e30ca7c9cb64abd75cfe1a Mon Sep 17 00:00:00 2001
From 1bda4c40029c9fd1a017222bdabe5ee9cb65afaf 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,10 +62,10 @@ 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 fbe4ffe2..8b3ff379 100644
index d431f514..f594a287 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -345,7 +345,7 @@ public class ServerConnector extends PacketHandler
@@ -346,7 +346,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = user.updateAndGetNextServer( target );
@ -146,5 +146,5 @@ index 6598781b..d1654bcc 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.25.0
2.26.0