From dd67dfd8d0f544e9aa6de246d7442a2c3bbc6fbf Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 7 May 2026 12:16:02 +0100 Subject: [PATCH] fall back to non-record pattern matching (appease checkstyle) --- .../api/event/player/PlayerChooseInitialServerEvent.java | 4 ++-- .../proxy/connection/client/AuthSessionHandler.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/com/velocitypowered/api/event/player/PlayerChooseInitialServerEvent.java b/api/src/main/java/com/velocitypowered/api/event/player/PlayerChooseInitialServerEvent.java index d1056f3eb..aa3dac014 100644 --- a/api/src/main/java/com/velocitypowered/api/event/player/PlayerChooseInitialServerEvent.java +++ b/api/src/main/java/com/velocitypowered/api/event/player/PlayerChooseInitialServerEvent.java @@ -48,8 +48,8 @@ public class PlayerChooseInitialServerEvent implements ResultedEvent getInitialServer() { - if (result instanceof Allowed(RegisteredServer initialServer)) { - return Optional.ofNullable(initialServer); + if (result instanceof Allowed allowed) { + return Optional.ofNullable(allowed.initialServer()); } return Optional.empty(); } diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java index 37135cddf..5864cfcae 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java @@ -263,14 +263,14 @@ public class AuthSessionHandler implements MinecraftSessionHandler { return server.getEventManager().fire(event).thenRunAsync(() -> { final PlayerChooseInitialServerEvent.Result result = event.getResult(); - if (event.getResult() instanceof PlayerChooseInitialServerEvent.Denied(Component reason)) { - player.disconnect0(Objects.requireNonNullElse(reason, + if (event.getResult() instanceof PlayerChooseInitialServerEvent.Denied denied) { + player.disconnect0(Objects.requireNonNullElse(denied.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(); + } else if (result instanceof PlayerChooseInitialServerEvent.Allowed allowed) { + player.createConnectionRequest(allowed.initialServer()).fireAndForget(); } }, mcConnection.eventLoop()); }