SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Fix CraftPlayerProfile#setId regression (#9822)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
SplotyCode 2023-10-12 03:20:25 +02:00 committet von GitHub
Ursprung 2f5bb7e306
Commit f613437019
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 12 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

17
patches/server/0141-Basic-PlayerProfile-API.patch
Datei anzeigen

@ -17,10 +17,10 @@ public org.bukkit.craftbukkit.profile.CraftPlayerProfile setProperty(Ljava/lang/
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..b7da8606e24b216b39020130fd2c42c7cd387a3a index 0000000000000000000000000000000000000000..daa157eaa021d039f9a092bea0b78f7c1f746e3b
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
@@ -0,0 +1,402 @@ @@ -0,0 +1,409 @@
+package com.destroystokyo.paper.profile; +package com.destroystokyo.paper.profile;
+ +
+import com.mojang.authlib.yggdrasil.ProfileResult; +import com.mojang.authlib.yggdrasil.ProfileResult;
@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..b7da8606e24b216b39020130fd2c42c7
+ } + }
+ +
+ public CraftPlayerProfile(UUID id, String name) { + public CraftPlayerProfile(UUID id, String name) {
+ this.profile = new GameProfile(id != null ? id : Util.NIL_UUID, name != null ? name : ""); + this.profile = createAuthLibProfile(id, name);
+ } + }
+ +
+ public CraftPlayerProfile(GameProfile profile) { + public CraftPlayerProfile(GameProfile profile) {
@ -111,7 +111,7 @@ index 0000000000000000000000000000000000000000..b7da8606e24b216b39020130fd2c42c7
+ public UUID setId(@Nullable UUID uuid) { + public UUID setId(@Nullable UUID uuid) {
+ final GameProfile previousProfile = this.profile; + final GameProfile previousProfile = this.profile;
+ final UUID previousId = this.getId(); + final UUID previousId = this.getId();
+ this.profile = new GameProfile(previousProfile.getId(), previousProfile.getName()); + this.profile = createAuthLibProfile(uuid, previousProfile.getName());
+ copyProfileProperties(previousProfile, this.profile); + copyProfileProperties(previousProfile, this.profile);
+ return previousId; + return previousId;
+ } + }
@ -131,7 +131,7 @@ index 0000000000000000000000000000000000000000..b7da8606e24b216b39020130fd2c42c7
+ @Deprecated(forRemoval = true) + @Deprecated(forRemoval = true)
+ public String setName(@Nullable String name) { + public String setName(@Nullable String name) {
+ GameProfile prev = this.profile; + GameProfile prev = this.profile;
+ this.profile = new GameProfile(prev.getId(), name != null ? name : ""); + this.profile = createAuthLibProfile(prev.getId(), name);
+ copyProfileProperties(prev, this.profile); + copyProfileProperties(prev, this.profile);
+ return prev.getName(); + return prev.getName();
+ } + }
@ -281,6 +281,13 @@ index 0000000000000000000000000000000000000000..b7da8606e24b216b39020130fd2c42c7
+ } + }
+ } + }
+ +
+ private static GameProfile createAuthLibProfile(UUID uniqueId, String name) {
+ return new GameProfile(
+ uniqueId != null ? uniqueId : Util.NIL_UUID,
+ name != null ? name : ""
+ );
+ }
+
+ private static ProfileProperty toBukkit(Property property) { + private static ProfileProperty toBukkit(Property property) {
+ return new ProfileProperty(property.name(), property.value(), property.signature()); + return new ProfileProperty(property.name(), property.value(), property.signature());
+ } + }