diff --git a/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch index f4aba18c6..4a64f05ac 100644 --- a/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch +++ b/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch @@ -1,4 +1,4 @@ -From fb2ee4df44963c8232471e2cef7964144697a67e Mon Sep 17 00:00:00 2001 +From 90b458f4915b37108a21fcaaf2d29dabf53c4185 Mon Sep 17 00:00:00 2001 From: Ichbinjoe Date: Sat, 16 Jul 2016 20:44:01 -0400 Subject: [PATCH] Add timeout variant to connect methods @@ -75,7 +75,7 @@ index 867e4428..f7459860 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 3c0c4189..3f9a91e3 100644 +index 51aed6da..c270cd77 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -254,9 +254,20 @@ public final class UserConnection implements ProxiedPlayer @@ -83,7 +83,7 @@ index 3c0c4189..3f9a91e3 100644 public void connect(ServerInfo info, final Callback callback, final boolean retry, ServerConnectEvent.Reason reason) { + // Waterfall start -+ connect(info, callback, retry, reason, 5000); // todo: configurable ++ connect(info, callback, retry, reason, bungee.getConfig().getServerConnectTimeout()); + } + public void connect(ServerInfo info, final Callback callback, final boolean retry, int timeout) { + connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout); @@ -109,5 +109,5 @@ index 3c0c4189..3f9a91e3 100644 { disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) ); -- -2.25.0 +2.26.2.windows.1