From 903575ff2ea7ffbfcba9f08eede7698c50d5a88d Mon Sep 17 00:00:00 2001 From: BlackHole Date: Mon, 9 Dec 2013 02:54:22 +0100 Subject: [PATCH] Add player unique ID to (Async)PlayerPreLoginEvent. Adds BUKKIT-5108 --- .../java/net/minecraft/server/ThreadPlayerLookupUUID.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java index f48ce534b8..496b7c98ea 100644 --- a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java +++ b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java @@ -33,13 +33,14 @@ class ThreadPlayerLookupUUID extends Thread { String playerName = LoginListener.d(this.a).getName(); java.net.InetAddress address = ((java.net.InetSocketAddress) a.networkManager.getSocketAddress()).getAddress(); + java.util.UUID uniqueId = UtilUUID.b(LoginListener.d(this.a).getId()); final org.bukkit.craftbukkit.CraftServer server = LoginListener.b(this.a).server; - AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address); + AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId); server.getPluginManager().callEvent(asyncEvent); if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { - final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address); + final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); if (asyncEvent.getResult() != PlayerPreLoginEvent.Result.ALLOWED) { event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage()); }