OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add more fields to AsyncPreLoginEvent

Browse source 
Co-authored-by: Connor Linfoot <connorlinfoot@me.com>
Co-authored-by: MCMDEV <john-m.1@gmx.de>
This commit is contained in:
Aikar 2018-03-18 11:43:30 -04:00
parent 4198da1e99
commit bb5e4dd0eb
1 changed files with 64 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
View file

@ -22,9 +22,10 @@ public class AsyncPlayerPreLoginEvent extends Event {
private static final HandlerList handlers = new HandlerList();
private Result result;
private net.kyori.adventure.text.Component message; // Paper
private final String name;
private final InetAddress ipAddress;
private final UUID uniqueId;
private com.destroystokyo.paper.profile.PlayerProfile profile; // Paper
private final InetAddress rawAddress; // Paper
private final String hostname; // Paper
private final boolean transferred;
@Deprecated(since = "1.7.5")
@ -38,12 +39,30 @@ public class AsyncPlayerPreLoginEvent extends Event {
}
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) {
// Paper start
this(name, ipAddress, uniqueId, transferred, org.bukkit.Bukkit.createProfile(uniqueId, name));
}
@Deprecated(forRemoval = true)
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
this(name, ipAddress, ipAddress, uniqueId, transferred, profile);
}
@Deprecated(forRemoval = true)
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
this(name, ipAddress, rawAddress, uniqueId, transferred, profile, "");
}
@org.jetbrains.annotations.ApiStatus.Internal
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile, @NotNull String hostname) {
// Paper end
super(true);
this.result = Result.ALLOWED;
this.message = net.kyori.adventure.text.Component.empty(); // Paper
this.name = name;
this.profile = profile;
this.ipAddress = ipAddress;
this.uniqueId = uniqueId;
this.rawAddress = rawAddress; // Paper
this.hostname = hostname; // Paper
this.transferred = transferred;
}
@ -207,7 +226,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
*/
@NotNull
public String getName() {
return name;
return profile.getName(); // Paper
}
/**
@ -227,9 +246,48 @@ public class AsyncPlayerPreLoginEvent extends Event {
*/
@NotNull
public UUID getUniqueId() {
return uniqueId;
return profile.getId(); // Paper
}
// Paper start
/**
* Gets the PlayerProfile of the player logging in
* @return The Profile
*/
@NotNull
public com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile() {
return profile;
}
/**
* Changes the PlayerProfile the player will login as
* @param profile The profile to use
*/
public void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
this.profile = profile;
}
/**
* Gets the raw address of the player logging in
* @return The address
*/
@NotNull
public InetAddress getRawAddress() {
return rawAddress;
}
/**
* Gets the hostname that the player used to connect to the server, or
* blank if unknown
*
* @return The hostname
*/
@NotNull
public String getHostname() {
return hostname;
}
// Paper end
/**
* Gets if this connection has been transferred from another server.
*