Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-19 08:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Use configured timeout value in UserConnection#connect (#490)

Browse Source
This commit is contained in:
_tomcraft 2020-04-24 16:52:33 +02:00 committed by GitHub
parent d5adc93e5e
commit 351a94db0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From fb2ee4df44963c8232471e2cef7964144697a67e Mon Sep 17 00:00:00 2001 From 90b458f4915b37108a21fcaaf2d29dabf53c4185 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io> From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400 Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods 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 * Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method * 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 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 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/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 @@ -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<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason) public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{ {
+ // Waterfall start + // 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<Boolean> callback, final boolean retry, int timeout) { + public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, int timeout) {
+ connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, 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() ) ); disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
-- --
2.25.0 2.26.2.windows.1