From 5bc189fbb7e8ca19984544af78a083024404fb2a Mon Sep 17 00:00:00 2001 From: BlackHole Date: Mon, 8 May 2017 21:55:02 +0200 Subject: [PATCH] Use player name casing from LoginResult --- .../main/java/net/md_5/bungee/connection/InitialHandler.java | 4 +++- .../src/main/java/net/md_5/bungee/connection/LoginResult.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java index b30e913c..68aa3f85 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -92,6 +92,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection private boolean onlineMode = BungeeCord.getInstance().config.isOnlineMode(); @Getter private InetSocketAddress virtualHost; + private String name; @Getter private UUID uniqueId; @Getter @@ -419,6 +420,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection if ( obj != null && obj.getId() != null ) { loginProfile = obj; + name = obj.getName(); uniqueId = Util.getUUID( obj.getId() ); finish(); return; @@ -560,7 +562,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String getName() { - return ( loginRequest == null ) ? null : loginRequest.getData(); + return (name != null ) ? name : ( loginRequest == null ) ? null : loginRequest.getData(); } @Override diff --git a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java b/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java index 9311ef77..d2ba8a4f 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java @@ -9,6 +9,7 @@ public class LoginResult { private String id; + private String name; private Property[] properties; @Data