Paper/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch

118 lines
4.5 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 11:43:30 -0400
Subject: [PATCH] Add more fields to AsyncPreLoginEvent
2021-06-11 14:02:28 +02:00
Co-authored-by: Connor Linfoot <connorlinfoot@me.com>
Co-authored-by: MCMDEV <john-m.1@gmx.de>
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
2024-04-23 19:02:08 +02:00
index 004f1fd55c143e6c21be74d0a6b9ee8b2e12cc59..ae02788536d0c6736aba4ccf812844df4f9789f1 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
2024-04-23 19:02:08 +02:00
@@ -22,9 +22,10 @@ public class AsyncPlayerPreLoginEvent extends Event {
2021-06-11 14:02:28 +02:00
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;
2024-04-23 19:02:08 +02:00
+ private com.destroystokyo.paper.profile.PlayerProfile profile; // Paper
+ private final InetAddress rawAddress; // Paper
+ private final String hostname; // Paper
2024-04-23 19:02:08 +02:00
private final boolean transferred;
2021-06-11 14:02:28 +02:00
@Deprecated
2024-04-23 19:02:08 +02:00
@@ -38,12 +39,30 @@ public class AsyncPlayerPreLoginEvent extends Event {
2021-06-11 14:02:28 +02:00
}
2024-04-23 19:02:08 +02:00
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) {
2021-06-11 14:02:28 +02:00
+ // Paper start
2024-04-23 19:02:08 +02:00
+ this(name, ipAddress, uniqueId, transferred, org.bukkit.Bukkit.createProfile(uniqueId, name));
2021-06-11 14:02:28 +02:00
+ }
+
+ @Deprecated(forRemoval = true)
2024-04-23 19:02:08 +02:00
+ 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);
2021-06-11 14:02:28 +02:00
+ }
+
+ @Deprecated(forRemoval = true)
2024-04-23 19:02:08 +02:00
+ 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, "");
2021-06-11 14:02:28 +02:00
+ }
+
2024-04-23 19:02:08 +02:00
+ @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
2021-06-11 14:02:28 +02:00
super(true);
this.result = Result.ALLOWED;
this.message = net.kyori.adventure.text.Component.empty(); // Paper
- this.name = name;
+ this.profile = profile;
2021-06-11 14:02:28 +02:00
this.ipAddress = ipAddress;
- this.uniqueId = uniqueId;
2024-04-23 19:02:08 +02:00
+ this.rawAddress = rawAddress; // Paper
+ this.hostname = hostname; // Paper
this.transferred = transferred;
2021-06-11 14:02:28 +02:00
}
2024-04-23 19:02:08 +02:00
@@ -207,7 +226,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
2021-06-11 14:02:28 +02:00
*/
@NotNull
public String getName() {
- return name;
+ return profile.getName(); // Paper
}
/**
2024-04-23 19:02:08 +02:00
@@ -227,9 +246,48 @@ public class AsyncPlayerPreLoginEvent extends Event {
2021-06-11 14:02:28 +02:00
*/
@NotNull
public UUID getUniqueId() {
- return uniqueId;
+ return profile.getId(); // Paper
2024-02-01 10:15:57 +01:00
+ }
+
+ // Paper start
+ /**
+ * Gets the PlayerProfile of the player logging in
+ * @return The Profile
+ */
+ @NotNull
2024-04-23 19:02:08 +02:00
+ public com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile() {
+ return profile;
+ }
+
+ /**
+ * Changes the PlayerProfile the player will login as
+ * @param profile The profile to use
+ */
2024-04-23 19:02:08 +02:00
+ 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;
2024-02-01 10:15:57 +01:00
}
+ /**
+ * 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
+
2024-04-23 19:02:08 +02:00
/**
* Gets if this connection has been transferred from another server.
*