Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Do not copy profile data if profiles are the same (#10259)

Browse Source
This commit is contained in:
Shane Freeder 2024-03-20 21:47:50 +00:00
parent b17ca0b19e
commit 5efed01031
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
patches/server/Basic-PlayerProfile-API.patch
View File

@ -236,7 +236,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't + // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
+ copyProfileProperties(this.profile, profile); + copyProfileProperties(this.profile, profile);
+ this.profile = profile; + this.profile = profile;
+ } else { + } else if (profile != this.profile) {
+ copyProfileProperties(profile, this.profile); + copyProfileProperties(profile, this.profile);
+ } + }
+ } + }
@ -267,6 +267,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ private static void copyProfileProperties(GameProfile source, GameProfile target, boolean clearTarget) { + private static void copyProfileProperties(GameProfile source, GameProfile target, boolean clearTarget) {
+ if (source == target) {
+ throw new IllegalArgumentException("Source and target profiles are the same (" + source + ")");
+ }
+ PropertyMap sourceProperties = source.getProperties(); + PropertyMap sourceProperties = source.getProperties();
+ PropertyMap targetProperties = target.getProperties(); + PropertyMap targetProperties = target.getProperties();
+ if (clearTarget) targetProperties.clear(); + if (clearTarget) targetProperties.clear();