From 72e5c8662955fc0615d0171c4f1686e4c8cbc895 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 25 Aug 2021 13:56:23 -0700 Subject: [PATCH] add api to get protocol version (for version check in the future) --- .../java/us/ajg0702/queue/api/players/AdaptedPlayer.java | 6 ++++++ .../queue/platforms/bungeecord/players/BungeePlayer.java | 5 +++++ .../queue/platforms/velocity/players/VelocityPlayer.java | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/api/src/main/java/us/ajg0702/queue/api/players/AdaptedPlayer.java b/api/src/main/java/us/ajg0702/queue/api/players/AdaptedPlayer.java index 7e725e4..2f63a0d 100644 --- a/api/src/main/java/us/ajg0702/queue/api/players/AdaptedPlayer.java +++ b/api/src/main/java/us/ajg0702/queue/api/players/AdaptedPlayer.java @@ -66,6 +66,12 @@ public interface AdaptedPlayer extends Handle, Audience { */ void connect(AdaptedServer server); + /** + * Returns the version this player is running. + * @return the version + */ + int getProtocolVersion(); + /** * Gets the player's username * @return the player's username diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java index 50c1b62..8e69d93 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java +++ b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java @@ -124,6 +124,11 @@ public class BungeePlayer implements AdaptedPlayer, Audience { handle.connect(((BungeeServer) server).getHandle()); } + @Override + public int getProtocolVersion() { + return handle.getPendingConnection().getVersion(); + } + @Override public String getName() { return handle.getName(); diff --git a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java index cf77ebb..b430cb9 100644 --- a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java +++ b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java @@ -131,6 +131,11 @@ public class VelocityPlayer implements AdaptedPlayer, Audience { ); } + @Override + public int getProtocolVersion() { + return handle.getProtocolVersion().getProtocol(); + } + @Override public String getName() { return handle.getUsername();