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
|
2022-08-09 07:18:08 +00:00
|
|
|
index d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551992f128f 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
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -1197,8 +1197,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);
|
|
|
|
}
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -1209,8 +1211,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);
|
|
|
|
}
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -1222,8 +1226,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);
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2022-08-09 07:18:08 +00:00
|
|
|
index fab39e4fc595c022da27e87e27bd168939e54381..e90056341407f58ff6ce2d9b80c8f3f64464e650 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
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -1015,8 +1015,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);
|
|
|
|
|
|
|
|
/**
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -1025,8 +1027,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);
|
|
|
|
|
|
|
|
/**
|
2022-08-09 07:18:08 +00:00
|
|
|
@@ -1036,8 +1040,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
|
2022-07-27 18:52:03 +00:00
|
|
|
index d3d3cfc0cf43f2b1f2d1937ef1a924b51f8cbde5..1d3387716f3e4e11155d79f62a759d8c59db84cd 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
|
2022-07-27 18:52:03 +00:00
|
|
|
@@ -2298,6 +2298,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();
|
|
|
|
|
|
|
|
/**
|