mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 18:31:29 +01:00
142 lines
6.0 KiB
Diff
142 lines
6.0 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 a6a792babe69712594c18f49542feb30ff591810..ec1af46667d8590ea218370249286f86652f3ac4 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1199,8 +1199,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 // Paper
|
|
public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
|
|
return server.createPlayerProfile(uniqueId, name);
|
|
}
|
|
@@ -1211,8 +1213,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 // Paper
|
|
public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
|
|
return server.createPlayerProfile(uniqueId);
|
|
}
|
|
@@ -1224,8 +1228,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 // 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 c5eed3234a8c04bfa9d707685746fc2b40ec8bfc..3ba8ff1a41ac9fd96fd4dec5cbe0f714fef93022 100644
|
|
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
|
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
|
@@ -50,7 +50,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 is banned or not
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index bf1102b4481b8c9b9c4f5ba0c561556b75fea077..8539bac19bf9ba1a66689a9af90e088a03f9c152 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1017,8 +1017,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 // Paper
|
|
PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
|
|
|
|
/**
|
|
@@ -1027,8 +1029,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 // Paper
|
|
PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
|
|
|
|
/**
|
|
@@ -1038,8 +1042,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
|
|
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 a2a207ea9aa7e6a09af75cf8975153b9abc10ec2..c2723b0e34f5d63b4b26ddb3b7c7e8b349a5521e 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2347,6 +2347,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
* 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
|
|
+ com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile();
|
|
+
|
|
+ /**
|
|
+ * 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
|
|
+ */
|
|
+ void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
|
|
// Paper end
|
|
|
|
// Spigot start
|
|
diff --git a/src/main/java/org/bukkit/profile/PlayerProfile.java b/src/main/java/org/bukkit/profile/PlayerProfile.java
|
|
index fc46add38bf59dc1a04ea566fd230dcd8ae2708c..d36b3e3c7e53840132011add365ca2a26d799064 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 // 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();
|
|
|
|
/**
|