2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sun, 18 Mar 2018 12:28:55 -0400
|
|
|
|
Subject: [PATCH] Player.setPlayerProfile API
|
|
|
|
|
|
|
|
This can be useful for changing name or skins after a player has logged in.
|
|
|
|
|
2022-02-12 13:20:33 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2023-07-04 08:22:56 +00:00
|
|
|
index dcd539220e5a2bda41f27101ea4c0ece146e1d0d..f5358612884aae8d0686f3ff98ccee567a746f16 100644
|
2022-02-12 13:20:33 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2023-07-04 08:22:56 +00:00
|
|
|
@@ -1230,8 +1230,10 @@ public final class Bukkit {
|
2022-04-23 14:40:37 +00:00
|
|
|
* @return the new PlayerProfile
|
|
|
|
* @throws IllegalArgumentException if both the unique id is
|
2022-02-12 13:20:33 +00:00
|
|
|
* <code>null</code> and the name is <code>null</code> or blank
|
2022-04-23 14:40:37 +00:00
|
|
|
+ * @deprecated use {@link #createProfile(UUID, String)}
|
2022-02-12 13:20:33 +00:00
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
+ @Deprecated // Paper
|
|
|
|
public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
|
|
|
|
return server.createPlayerProfile(uniqueId, name);
|
|
|
|
}
|
2023-07-04 08:22:56 +00:00
|
|
|
@@ -1242,8 +1244,10 @@ public final class Bukkit {
|
2022-04-23 14:40:37 +00:00
|
|
|
* @param uniqueId the unique id
|
|
|
|
* @return the new PlayerProfile
|
2022-02-12 13:20:33 +00:00
|
|
|
* @throws IllegalArgumentException if the unique id is <code>null</code>
|
2022-04-23 14:40:37 +00:00
|
|
|
+ * @deprecated use {@link #createProfile(UUID)}
|
2022-02-12 13:20:33 +00:00
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
+ @Deprecated // Paper
|
|
|
|
public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
|
|
|
|
return server.createPlayerProfile(uniqueId);
|
|
|
|
}
|
2023-07-04 08:22:56 +00:00
|
|
|
@@ -1255,8 +1259,10 @@ public final class Bukkit {
|
2022-04-23 14:40:37 +00:00
|
|
|
* @return the new PlayerProfile
|
|
|
|
* @throws IllegalArgumentException if the name is <code>null</code> or
|
2022-02-12 13:20:33 +00:00
|
|
|
* blank
|
2022-04-23 14:40:37 +00:00
|
|
|
+ * @deprecated use {@link #createProfile(String)}
|
2022-02-12 13:20:33 +00:00
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
+ @Deprecated // Paper
|
|
|
|
public static PlayerProfile createPlayerProfile(@NotNull String name) {
|
|
|
|
return server.createPlayerProfile(name);
|
|
|
|
}
|
2022-12-22 04:30:21 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
|
2023-08-06 00:21:59 +00:00
|
|
|
index bec480aff819e09220b52175cab0cb6d68ae68c6..12349910297a75c00e64f6ccc7981aeeeb43ecd3 100644
|
2022-12-22 04:30:21 +00:00
|
|
|
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
2023-08-06 00:21:59 +00:00
|
|
|
@@ -59,7 +59,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
|
2022-12-22 04:30:21 +00:00
|
|
|
* @return the player's profile
|
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
- PlayerProfile getPlayerProfile();
|
|
|
|
+ com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile(); // Paper
|
|
|
|
|
|
|
|
/**
|
2023-07-04 08:22:56 +00:00
|
|
|
* Checks if this player has had their profile banned.
|
2022-02-12 13:20:33 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2023-07-04 08:22:56 +00:00
|
|
|
index 016cee903c7179baf711984503d1d0793d40c5c5..064edd612885b2ea4b35001a864503b568c53987 100644
|
2022-02-12 13:20:33 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2023-07-04 08:22:56 +00:00
|
|
|
@@ -1050,8 +1050,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2022-04-23 14:40:37 +00:00
|
|
|
* @return the new PlayerProfile
|
|
|
|
* @throws IllegalArgumentException if both the unique id is
|
2022-02-12 13:20:33 +00:00
|
|
|
* <code>null</code> and the name is <code>null</code> or blank
|
2022-04-23 14:40:37 +00:00
|
|
|
+ * @deprecated use {@link #createProfile(UUID, String)}
|
2022-02-12 13:20:33 +00:00
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
+ @Deprecated // Paper
|
|
|
|
PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
|
|
|
|
|
|
|
|
/**
|
2023-07-04 08:22:56 +00:00
|
|
|
@@ -1060,8 +1062,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2022-04-23 14:40:37 +00:00
|
|
|
* @param uniqueId the unique id
|
|
|
|
* @return the new PlayerProfile
|
2022-02-12 13:20:33 +00:00
|
|
|
* @throws IllegalArgumentException if the unique id is <code>null</code>
|
2022-04-23 14:40:37 +00:00
|
|
|
+ * @deprecated use {@link #createProfile(UUID)}
|
2022-02-12 13:20:33 +00:00
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
+ @Deprecated // Paper
|
|
|
|
PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
|
|
|
|
|
|
|
|
/**
|
2023-07-04 08:22:56 +00:00
|
|
|
@@ -1071,8 +1075,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2022-04-23 14:40:37 +00:00
|
|
|
* @return the new PlayerProfile
|
|
|
|
* @throws IllegalArgumentException if the name is <code>null</code> or
|
2022-02-12 13:20:33 +00:00
|
|
|
* blank
|
2022-04-23 14:40:37 +00:00
|
|
|
+ * @deprecated use {@link #createProfile(String)}
|
2022-02-12 13:20:33 +00:00
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
+ @Deprecated
|
|
|
|
PlayerProfile createPlayerProfile(@NotNull String name);
|
|
|
|
|
|
|
|
/**
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
2023-08-06 00:21:59 +00:00
|
|
|
index 2257a1808d19775607e60c155d9e5508e7825811..af7af85887e9463c561ddb0c47862b27b5de5d43 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
2023-08-06 00:21:59 +00:00
|
|
|
@@ -2676,6 +2676,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2021-06-11 12:02:28 +00:00
|
|
|
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
|
|
|
|
*/
|
|
|
|
boolean hasResourcePack();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets a copy of this players profile
|
|
|
|
+ * @return The players profile object
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
2022-02-12 13:20:33 +00:00
|
|
|
+ com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile();
|
2021-06-11 12:02:28 +00:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Changes the PlayerProfile for this player. This will cause this player
|
|
|
|
+ * to be reregistered to all clients that can currently see this player
|
|
|
|
+ * @param profile The new profile to use
|
|
|
|
+ */
|
2022-02-12 13:20:33 +00:00
|
|
|
+ void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
|
2021-06-11 12:02:28 +00:00
|
|
|
// Paper end
|
|
|
|
|
|
|
|
// Spigot start
|
2022-02-12 13:20:33 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/profile/PlayerProfile.java b/src/main/java/org/bukkit/profile/PlayerProfile.java
|
2022-07-22 18:18:00 +00:00
|
|
|
index fc46add38bf59dc1a04ea566fd230dcd8ae2708c..d36b3e3c7e53840132011add365ca2a26d799064 100644
|
2022-02-12 13:20:33 +00:00
|
|
|
--- a/src/main/java/org/bukkit/profile/PlayerProfile.java
|
|
|
|
+++ b/src/main/java/org/bukkit/profile/PlayerProfile.java
|
|
|
|
@@ -16,7 +16,9 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
* <p>
|
|
|
|
* New profiles can be created via
|
|
|
|
* {@link Server#createPlayerProfile(UUID, String)}.
|
|
|
|
+ * @deprecated see {@link com.destroystokyo.paper.profile.PlayerProfile}
|
|
|
|
*/
|
|
|
|
+@Deprecated // Paper
|
|
|
|
public interface PlayerProfile extends Cloneable, ConfigurationSerializable {
|
|
|
|
|
|
|
|
/**
|
|
|
|
@@ -25,6 +27,7 @@ public interface PlayerProfile extends Cloneable, ConfigurationSerializable {
|
|
|
|
* @return the player's unique id, or <code>null</code> if not available
|
|
|
|
*/
|
|
|
|
@Nullable
|
|
|
|
+ @Deprecated // Paper
|
|
|
|
UUID getUniqueId();
|
|
|
|
|
|
|
|
/**
|