Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-21 07:01:43 +01:00
Code Issues Projects Releases Wiki Activity

Pass through server request feedback to retry connection attempts

Browse Source
This commit is contained in:
Shane Freeder 2022-01-29 06:58:36 +00:00
parent 3f86a428c9
commit acff2e0148
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch
View File

@ -1,4 +1,4 @@
From 8e2bdaf9cb2da6becb7065bd7a9ef94c18665f66 Mon Sep 17 00:00:00 2001 From 58b01511fca0b3add7805775d42b9ea4661396a2 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 16 Apr 2021 06:29:28 +0100 Date: Fri, 16 Apr 2021 06:29:28 +0100
Subject: [PATCH] ServerConnectRequest#sendFeedback Subject: [PATCH] ServerConnectRequest#sendFeedback
@ -31,10 +31,29 @@ index c81b0a4e..d21370be 100644
} }
} }
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 871a2990..8e274169 100644 index 871a2990..8e85f0e6 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
@@ -321,7 +321,7 @@ public final class UserConnection implements ProxiedPlayer @@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer
connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
}
- public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason, final int timeout)
+ public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason, final int timeout) {
+ this.connect(info, callback, retry, reason, timeout, true);
+ }
+
+ public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason, final int timeout, boolean sendFeedback)
{
// Waterfall end
Preconditions.checkNotNull( info, "info" );
- ServerConnectRequest.Builder builder = ServerConnectRequest.builder().retry( retry ).reason( reason ).target( info );
+ ServerConnectRequest.Builder builder = ServerConnectRequest.builder().retry( retry ).reason( reason ).target( info ).sendFeedback(sendFeedback); // Waterfall - feedback param
builder.connectTimeout(timeout); // Waterfall
if ( callback != null )
{
@@ -321,7 +325,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null ); callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
} }
@ -43,7 +62,7 @@ index 871a2990..8e274169 100644
return; return;
} }
if ( pendingConnects.contains( target ) ) if ( pendingConnects.contains( target ) )
@@ -331,7 +331,7 @@ public final class UserConnection implements ProxiedPlayer @@ -331,7 +335,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null ); callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
} }
@ -52,13 +71,14 @@ index 871a2990..8e274169 100644
return; return;
} }
@@ -367,14 +367,14 @@ public final class UserConnection implements ProxiedPlayer @@ -367,14 +371,14 @@ public final class UserConnection implements ProxiedPlayer
ServerInfo def = updateAndGetNextServer( target ); ServerInfo def = updateAndGetNextServer( target );
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) ) if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{ {
- sendMessage( bungee.getTranslation( "fallback_lobby" ) ); - sendMessage( bungee.getTranslation( "fallback_lobby" ) );
- connect( def, null, true, ServerConnectEvent.Reason.LOBBY_FALLBACK, request.getConnectTimeout() ); // Waterfall
+ if (request.isSendFeedback()) sendMessage( bungee.getTranslation( "fallback_lobby" ) ); // Waterfall + if (request.isSendFeedback()) sendMessage( bungee.getTranslation( "fallback_lobby" ) ); // Waterfall
connect( def, null, true, ServerConnectEvent.Reason.LOBBY_FALLBACK, request.getConnectTimeout() ); // Waterfall + connect( def, null, true, ServerConnectEvent.Reason.LOBBY_FALLBACK, request.getConnectTimeout(), request.isSendFeedback() ); // Waterfall
} else if ( dimensionChange ) } else if ( dimensionChange )
{ {
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) ); disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );