Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
4af62f6d1d
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: 2d009e64 Update SnakeYAML javadoc link b4fd213c Switch Player#updateInventory deprecation for internal API annotation CraftBukkit Changes: f3b2b2210 SPIGOT-7376: Exception with getBlockData when hasBlockData is false 725545630 SPIGOT-7375: Fix crash breeding certain entities b9873b0d4 Update Brigadier version with fix 68b320562 SPIGOT-7266: Found typo in CraftBukkit package 98b4d2ff8 SPIGOT-7372, SPIGOT-7373: Signs can't be edited, issues with SignChangeEvent 5f7bd4d78 SPIGOT-7371: Sign does not open edit text on placement b4cf99d24 SPIGOT-7371: Fix editing signs with API a2b6c2744 PR-1200: Implement open sign by side a345bb940 SPIGOT-7368: Downgrade SpecialSource version Spigot Changes: 723951c3 Rebuild patches b655c57d Drop old collision API deprecated since 1.9.4 55b0fed4 Rebuild patches
142 Zeilen
6.0 KiB
Diff
142 Zeilen
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 cbd89729d1ba4866fdb9b72b7f0a4fbd4e161cd2..551948a83965b38bf29aeb8daafc25bde05a5a1c 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1220,8 +1220,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);
|
|
}
|
|
@@ -1232,8 +1234,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);
|
|
}
|
|
@@ -1245,8 +1249,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 5acb0d36a008cf5ad332c867e9303d35235b4028..b1ded556a1ce4e1d3c873ab9d7f799b6edcc5118 100644
|
|
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
|
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
|
@@ -55,7 +55,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 7f6400c58530d4827c197f3d1fbabfa34554010f..e4c85e67713c5ed4b8b1fcc3c4231327e987a460 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1042,8 +1042,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);
|
|
|
|
/**
|
|
@@ -1052,8 +1054,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);
|
|
|
|
/**
|
|
@@ -1063,8 +1067,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 e8ebbba8973e1ea01366b7a6fee71163db7b39b7..1879756c8dc3fa86e2aa2f223eee03b5fe2380eb 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2488,6 +2488,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();
|
|
|
|
/**
|