summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBlackHole <black-hole@live.com>2013-12-09 02:54:22 +0100
committerTravis Watkins <amaranth@ubuntu.com>2014-04-02 17:28:18 -0500
commit903575ff2ea7ffbfcba9f08eede7698c50d5a88d (patch)
tree9fb18ddd490fe01c8d531a469b100a928b7fe65c /src
parent8d77687e7a069b2934406959b69806ef321f7c5f (diff)
downloadcraftbukkit-903575ff2ea7ffbfcba9f08eede7698c50d5a88d.tar
craftbukkit-903575ff2ea7ffbfcba9f08eede7698c50d5a88d.tar.gz
craftbukkit-903575ff2ea7ffbfcba9f08eede7698c50d5a88d.tar.lz
craftbukkit-903575ff2ea7ffbfcba9f08eede7698c50d5a88d.tar.xz
craftbukkit-903575ff2ea7ffbfcba9f08eede7698c50d5a88d.zip
Add player unique ID to (Async)PlayerPreLoginEvent. Adds BUKKIT-5108
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java5
1 files 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 f48ce534..496b7c98 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());
}