Add Player#getGameProfile() to make tab list plugins easier to make.

Rivallix · Mar 29, 2019 · 564cb99 · 564cb99
1 parent 118574e
commit 564cb99
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/api/src/main/java/com/velocitypowered/api/proxy/Player.java b/api/src/main/java/com/velocitypowered/api/proxy/Player.java
@@ -106,6 +106,11 @@ default void sendMessage(Component component) {
    */
   void setGameProfileProperties(List<GameProfile.Property> properties);
 
+  /**
+   * Returns the player's game profile.
+   */
+  GameProfile getGameProfile();
+
   /**
    * Sets the tab list header and footer for the player.
    *

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java
@@ -72,7 +72,7 @@ public boolean handle(LoginPluginMessage packet) {
       response.setId(packet.getId());
       response.setData(createForwardingData(configuration.getForwardingSecret(),
           serverConn.getPlayer().getRemoteAddress().getHostString(),
-          serverConn.getPlayer().getProfile()));
+          serverConn.getPlayer().getGameProfile()));
       mc.write(response);
       informationForwarded = true;
     } else {

diff --git a/.../src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java b/.../src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java
@@ -126,9 +126,9 @@ private String createLegacyForwardingAddress() {
         .append('\0')
         .append(proxyPlayer.getRemoteAddress().getHostString())
         .append('\0')
-        .append(proxyPlayer.getProfile().getUndashedId())
+        .append(proxyPlayer.getGameProfile().getUndashedId())
         .append('\0');
-    GSON.toJson(proxyPlayer.getProfile().getProperties(), data);
+    GSON.toJson(proxyPlayer.getGameProfile().getProperties(), data);
     return data.toString();
   }
 
@@ -192,8 +192,8 @@ public void disconnect() {
 
   @Override
   public String toString() {
-    return "[server connection] " + proxyPlayer.getProfile().getName() + " -> " + registeredServer
-        .getServerInfo().getName();
+    return "[server connection] " + proxyPlayer.getGameProfile().getName() + " -> "
+        + registeredServer.getServerInfo().getName();
   }
 
   @Override

diff --git a/...y/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/...y/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
@@ -109,8 +109,7 @@ public boolean handle(Chat packet) {
           return false;
         }
       } catch (Exception e) {
-        logger
-            .info("Exception occurred while running command for {}", player.getProfile().getName(),
+        logger.info("Exception occurred while running command for {}", player.getUsername(),
                 e);
         player.sendMessage(
             TextComponent.of("An error occurred while running this command.", TextColor.RED));

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -114,7 +114,8 @@ public Optional<ServerConnection> getCurrentServer() {
     return Optional.ofNullable(connectedServer);
   }
 
-  public GameProfile getProfile() {
+  @Override
+  public GameProfile getGameProfile() {
     return profile;
   }