mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
147 lines
6.3 KiB
Diff
147 lines
6.3 KiB
Diff
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.
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7d724160f 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1380,8 +1380,10 @@ public final class Bukkit {
|
|
* @return the new PlayerProfile
|
|
* @throws IllegalArgumentException if both the unique id is
|
|
* <code>null</code> and the name is <code>null</code> or blank
|
|
+ * @deprecated use {@link #createProfile(UUID, String)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(since = "1.18.1") // Paper
|
|
public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
|
|
return server.createPlayerProfile(uniqueId, name);
|
|
}
|
|
@@ -1392,8 +1394,10 @@ public final class Bukkit {
|
|
* @param uniqueId the unique id
|
|
* @return the new PlayerProfile
|
|
* @throws IllegalArgumentException if the unique id is <code>null</code>
|
|
+ * @deprecated use {@link #createProfile(UUID)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(since = "1.18.1") // Paper
|
|
public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
|
|
return server.createPlayerProfile(uniqueId);
|
|
}
|
|
@@ -1405,8 +1409,10 @@ public final class Bukkit {
|
|
* @return the new PlayerProfile
|
|
* @throws IllegalArgumentException if the name is <code>null</code> or
|
|
* blank
|
|
+ * @deprecated use {@link #createProfile(String)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(since = "1.18.1") // Paper
|
|
public static PlayerProfile createPlayerProfile(@NotNull String name) {
|
|
return server.createPlayerProfile(name);
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
|
|
index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46221036bd 100644
|
|
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
|
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
|
@@ -59,7 +59,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
|
|
* @return the player's profile
|
|
*/
|
|
@NotNull
|
|
- PlayerProfile getPlayerProfile();
|
|
+ com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile(); // Paper
|
|
|
|
/**
|
|
* Checks if this player has had their profile banned.
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133b8b624e8 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1167,8 +1167,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
* @return the new PlayerProfile
|
|
* @throws IllegalArgumentException if both the unique id is
|
|
* <code>null</code> and the name is <code>null</code> or blank
|
|
+ * @deprecated use {@link #createProfile(UUID, String)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(since = "1.18.1") // Paper
|
|
PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
|
|
|
|
/**
|
|
@@ -1177,8 +1179,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
* @param uniqueId the unique id
|
|
* @return the new PlayerProfile
|
|
* @throws IllegalArgumentException if the unique id is <code>null</code>
|
|
+ * @deprecated use {@link #createProfile(UUID)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(since = "1.18.1") // Paper
|
|
PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
|
|
|
|
/**
|
|
@@ -1188,8 +1192,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
* @return the new PlayerProfile
|
|
* @throws IllegalArgumentException if the name is <code>null</code> or
|
|
* blank
|
|
+ * @deprecated use {@link #createProfile(String)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(since = "1.18.1") // Paper
|
|
PlayerProfile createPlayerProfile(@NotNull String name);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 0d92eac00ba883d696d45340feb808988be05c16..357e12c91a710751dc5bf3138362c10e5a26db1e 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3154,6 +3154,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
}
|
|
// Paper end
|
|
|
|
+ // Paper start - Player Profile API
|
|
+ /**
|
|
+ * Gets a copy of this players profile
|
|
+ *
|
|
+ * @return The players profile object
|
|
+ */
|
|
+ com.destroystokyo.paper.profile.@NotNull PlayerProfile getPlayerProfile();
|
|
+
|
|
+ /**
|
|
+ * Changes the PlayerProfile for this player. This will cause this player
|
|
+ * to be re-registered to all clients that can currently see this player.
|
|
+ * <p>
|
|
+ * After executing this method, the player {@link java.util.UUID} won't
|
|
+ * be swapped, only their name and profile properties.
|
|
+ *
|
|
+ * @param profile The new profile to use
|
|
+ */
|
|
+ void setPlayerProfile(com.destroystokyo.paper.profile.@NotNull PlayerProfile profile);
|
|
+ // Paper end - Player Profile API
|
|
+
|
|
// Spigot start
|
|
public class Spigot extends Entity.Spigot {
|
|
|
|
diff --git a/src/main/java/org/bukkit/profile/PlayerProfile.java b/src/main/java/org/bukkit/profile/PlayerProfile.java
|
|
index fc46add38bf59dc1a04ea566fd230dcd8ae2708c..f4ab961647826b8717466be0d8c202b12749e9b4 100644
|
|
--- 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(since = "1.18.1") // 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(since = "1.18.1") // Paper
|
|
UUID getUniqueId();
|
|
|
|
/**
|