diff --git a/BungeeCord b/BungeeCord index 697f087..f1c32f8 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 697f0875e65bc57676165b94654992f018e6851c +Subproject commit f1c32f84f46589632d7721d8de87d5589ef8e6a6 diff --git a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch index eb31233..6403251 100644 --- a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From 049625bef454fd6b564e95af81abc79eeb0252a7 Mon Sep 17 00:00:00 2001 +From 51ae3b4db60a3e32284f940a05db847890e16e65 Mon Sep 17 00:00:00 2001 From: Janmm14 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 diff --git a/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch index 4089730..1f37497 100644 --- a/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch +++ b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch @@ -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 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