From d2ef3fd7d5123d1793e13e75820b522fb74c9ec0 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 03:40:07 +0000 Subject: [PATCH] misc: Revert ServerResult record --- .../api/velocity/event/ServerResult.java | 17 +++++++++++++++-- .../listener/PluginMessageListener.java | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java index 23e9941..c69f2d2 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java @@ -4,12 +4,25 @@ import com.velocitypowered.api.event.ResultedEvent.Result; import com.velocitypowered.api.proxy.server.RegisteredServer; /**A result that produces a resulting server */ -public record ServerResult(RegisteredServer server) implements Result { +public final class ServerResult implements Result { private static final ServerResult DENIED = new ServerResult(null); + private final RegisteredServer server; + private ServerResult(RegisteredServer server) { + this.server = server; + } + @Override public boolean isAllowed() { - return server != null; + return this.server != null; + } + + /** + * Obtain the resulted server + * @return the resulted server if is allowed, else null + */ + public RegisteredServer getServer() { + return this.server; } /** diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index 6c031e7..6d43f23 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -123,7 +123,7 @@ public class PluginMessageListener { if (!event.getResult().isAllowed()) { return; } - player.createConnectionRequest(event.getResult().server()) + player.createConnectionRequest(event.getResult().getServer()) .connect() .thenAcceptAsync(result -> { if (!result.isSuccessful()) {