SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix username connecting with no texture being overwritten by usercache (#4970)

Browse Source
This commit is contained in:
Camotoy
2021-03-01 16:06:05 -05:00
parent 7bb59f4a28
commit 4299111876
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LICENSE.md
View File

@ -46,4 +46,5 @@ ysl3000 <yannicklamprecht@live.de>
Nassim Jahnke <nassim@njahnke.dev> Nassim Jahnke <nassim@njahnke.dev>
Machine_Maker <machine@machinemaker.me> Machine_Maker <machine@machinemaker.me>
Ivan Pekov <ivan@mrivanplays.com> Ivan Pekov <ivan@mrivanplays.com>
Camotoy <20743703+Camotoy@users.noreply.github.com>
``` ```

10
Spigot-Server-Patches/Basic-PlayerProfile-API.patch
View File

@ -179,9 +179,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if ((profile.getName() == null || !hasTextures()) && profile.getId() != null) { + if ((profile.getName() == null || !hasTextures()) && profile.getId() != null) {
+ GameProfile profile = userCache.getProfile(this.profile.getId()); + GameProfile profile = userCache.getProfile(this.profile.getId());
+ if (profile != null) { + if (profile != null) {
+ // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't + if (this.profile.getName() == null) {
+ copyProfileProperties(this.profile, profile); + // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
+ this.profile = profile; + copyProfileProperties(this.profile, profile);
+ this.profile = profile;
+ } else {
+ copyProfileProperties(profile, this.profile);
+ }
+ } + }
+ } + }
+ return this.profile.isComplete(); + return this.profile.isComplete();