Mirrors/Velocity
1
0
Fork 1
mirror of https://github.com/PaperMC/Velocity.git synced 2026-06-21 09:47:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert PlayerChooseInitialServerEvent into a resulted event

Browse Source
This commit is contained in:
Shane Freeder
2026-05-07 11:56:26 +01:00
parent ad8de4361c
commit aa9e02d79c
2 changed files with 74 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java
View File

@@ -262,14 +262,16 @@ public class AuthSessionHandler implements MinecraftSessionHandler {
new PlayerChooseInitialServerEvent(player, initialFromConfig.orElse(null));
return server.getEventManager().fire(event).thenRunAsync(() -> {
Optional<RegisteredServer> toTry = event.getInitialServer();
if (toTry.isEmpty()) {
player.disconnect0(
Component.translatable("velocity.error.no-available-servers", NamedTextColor.RED),
true);
final PlayerChooseInitialServerEvent.Result result = event.getResult();
if (event.getResult() instanceof PlayerChooseInitialServerEvent.Denied(Component reason)) {
player.disconnect0(Objects.requireNonNullElse(reason,
Component.translatable("velocity.error.no-available-servers", NamedTextColor.RED)),
true);
//noinspection UnnecessaryReturnStatement
return;
} else if (result instanceof PlayerChooseInitialServerEvent.Allowed(RegisteredServer initialServer)) {
player.createConnectionRequest(initialServer).fireAndForget();
}
player.createConnectionRequest(toTry.get()).fireAndForget();
}, mcConnection.eventLoop());
}