mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-11-21 03:11:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Redirect player without message (#581)

Browse Source
This commit is contained in:
Foorcee 2021-10-10 02:32:04 +02:00 committed by GitHub
parent 567582b2e2
commit 08f1b87267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/main/java/com/velocitypowered/api/event/player/KickedFromServerEvent.java
View File

@ -130,8 +130,7 @@ public final class KickedFromServerEvent implements
}
/**
* Tells the proxy to redirect the player to another server. No messages will be sent from the
* proxy when this result is used.
* Tells the proxy to redirect the player to another server.
*/
public static final class RedirectPlayer implements ServerKickResult {
@ -159,8 +158,11 @@ public final class KickedFromServerEvent implements
/**
* Creates a new redirect result to forward the player to the specified {@code server}.
* The specified {@code message} will be sent to the player after the redirection.
* Use {@code Component.empty()} to skip sending any messages to the player.
*
* @param server the server to send the player to
* @param message the message will be sent to the player after redirecting
* @return the redirect result
*/
public static RedirectPlayer create(RegisteredServer server,
@ -168,6 +170,13 @@ public final class KickedFromServerEvent implements
return new RedirectPlayer(server, message);
}
/**
* Creates a new redirect result to forward the player to the specified {@code server}.
* The kick reason will be displayed to the player
*
* @param server the server to send the player to
* @return the redirect result
*/
public static ServerKickResult create(RegisteredServer server) {
return new RedirectPlayer(server, null);
}

4
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@ -641,7 +641,9 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
if (requestedMessage == null) {
requestedMessage = friendlyReason;
}
sendMessage(requestedMessage);
if (requestedMessage != Component.empty()) {
sendMessage(requestedMessage);
}
break;
default:
// The only remaining value is successful (no need to do anything!)