diff options
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java | 17 | ||||
-rw-r--r-- | src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java index 02b373ce..1d571889 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -1,6 +1,7 @@ package org.bukkit.event.player; import java.net.InetAddress; +import java.util.UUID; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -16,13 +17,20 @@ public class AsyncPlayerPreLoginEvent extends Event { private String message; private final String name; private final InetAddress ipAddress; + private final UUID uniqueId; + @Deprecated public AsyncPlayerPreLoginEvent(final String name, final InetAddress ipAddress) { + this(name, ipAddress, null); + } + + public AsyncPlayerPreLoginEvent(final String name, final InetAddress ipAddress, final UUID uniqueId) { super(true); this.result = Result.ALLOWED; this.message = ""; this.name = name; this.ipAddress = ipAddress; + this.uniqueId = uniqueId; } /** @@ -140,6 +148,15 @@ public class AsyncPlayerPreLoginEvent extends Event { return ipAddress; } + /** + * Gets the player's unique ID. + * + * @return The unique ID + */ + public UUID getUniqueId() { + return uniqueId; + } + @Override public HandlerList getHandlers() { return handlers; diff --git a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java index b86ba5da..e8553f0f 100644 --- a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java @@ -1,6 +1,7 @@ package org.bukkit.event.player; import java.net.InetAddress; +import java.util.UUID; import org.bukkit.Warning; import org.bukkit.event.Event; @@ -21,12 +22,19 @@ public class PlayerPreLoginEvent extends Event { private String message; private final String name; private final InetAddress ipAddress; + private final UUID uniqueId; + @Deprecated public PlayerPreLoginEvent(final String name, final InetAddress ipAddress) { + this(name, ipAddress, null); + } + + public PlayerPreLoginEvent(final String name, final InetAddress ipAddress, final UUID uniqueId) { this.result = Result.ALLOWED; this.message = ""; this.name = name; this.ipAddress = ipAddress; + this.uniqueId = uniqueId; } /** @@ -108,6 +116,15 @@ public class PlayerPreLoginEvent extends Event { return handlers; } + /** + * Gets the player's unique ID. + * + * @return The unique ID + */ + public UUID getUniqueId() { + return uniqueId; + } + public static HandlerList getHandlerList() { return handlers; } |