mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-26 09:42:06 -07:00
881d616533
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ed0ec489 SPIGOT-7965: Unknown TransformReason for Hoglins 9db03457 SPIGOT-7964: Fix typo in Deprecation annotation d14119af PR-1082: Add "since" to Deprecation annotations e8a318d4 PR-1067: Add method to get Advancement requirements CraftBukkit Changes: 40dd796db SPIGOT-7971: NotSerializableException on serialize CraftUseCooldownComponent fa85c5e0a SPIGOT-7968: ProjectileHitEvent not trigerred when arrow hits entity b75b792ec SPIGOT-7970: World#getMaxHeight() returning incorrect value 2b9a094bb SPIGOT-7965: Unknown TransformReason for Hoglins fd3f5a380 SPIGOT-7966: Some trees do not generate with #generateTree f2822317c PR-1515: Add a Class reader and Class node argument provider 07abf6852 PR-1514: Add a test case for ClassTraverser a7577cb24 Fix Inventory#addItem not respecting max stack size 066a74e74 PR-1490: Add method to get Advancement requirements 4a1df30e4 PR-1512: Test Art class based on specific values instead of the implementation, to better catch implementation changes 53254c56f PR-1503: Simplify CAS loop to getAndSet e9447dc5e Make BlockDataMeta#setBlockData hide unspecified states dd08a7120 SPIGOT-7960: Fix inconsistency between natural item drop coordinates e9e8ed753 SPIGOT-7960: Improve natural item drop methods Spigot Changes: 60c9969b Rebuild patches
118 lines
4.5 KiB
Diff
118 lines
4.5 KiB
Diff
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
|
|
|
|
Co-authored-by: Connor Linfoot <connorlinfoot@me.com>
|
|
Co-authored-by: MCMDEV <john-m.1@gmx.de>
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
@@ -0,0 +0,0 @@ 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")
|
|
@@ -0,0 +0,0 @@ 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;
|
|
}
|
|
|
|
@@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
*/
|
|
@NotNull
|
|
public String getName() {
|
|
- return name;
|
|
+ return profile.getName(); // Paper
|
|
}
|
|
|
|
/**
|
|
@@ -0,0 +0,0 @@ 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.
|
|
*
|