mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-09-29 23:57:45 +02:00
0c43fe2949
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: c04b005 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.5 1d169e7 Updated Upstream (Paper) EMC Changes: a8914cb8 Remove the ProjectileHitBlockEvent b8f864b5 Updated Paper 42cd3269 Remove FlowerPotPlantEvent and undeprecate FlowerPotRemoveEvent 64b3edf0 Remove the UUID key for setSpawnedEntity 938c6f1b Convert spawn egg entity tag attributes on creature spawn 4cc80284 Disable entityTag conversion since data version isn't accessible in scope 478d83fe Updated Paper 1e409abf Updated Paper Origami Changes: ab42df9 Update Paper Purpur Changes: 7e8bf66 Updated Upstream (Paper & Tuinity) AirplaneLite Changes: 3200f2a Add new webhook for notifications fe01371 Up MC version c585ff5 Updated Upstream (Tuinity)
28 lines
1.5 KiB
Diff
28 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
|
|
Date: Mon, 4 Jan 2021 10:45:49 +0200
|
|
Subject: [PATCH] PaperPR - Fix username connecting with no texture being
|
|
overwritten by usercache
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
|
index 8bda2180576d3c58ad592e6158621160a8c4c5cf..44132e902b653b07b21fd01d13a88870290af439 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
|
@@ -166,9 +166,15 @@ public class CraftPlayerProfile implements PlayerProfile {
|
|
if ((profile.getName() == null || !hasTextures()) && profile.getId() != null) {
|
|
GameProfile profile = userCache.getProfile(this.profile.getId());
|
|
if (profile != null) {
|
|
+ // Yatopia start - fix username connecting with no texture being overwritten by user cache
|
|
+ if (this.profile.getName() == null) {
|
|
// if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
|
|
copyProfileProperties(this.profile, profile);
|
|
this.profile = profile;
|
|
+ } else {
|
|
+ copyProfileProperties(profile, this.profile);
|
|
+ }
|
|
+ // Yatopia end
|
|
}
|
|
}
|
|
return this.profile.isComplete();
|