mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-11-29 14:15:43 +01:00
43e33eb332
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: e76c58e Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4 8954b61 Updated Upstream (Paper) Origami Changes: 2cff647 Update Paper Purpur Changes: 4a9c016 [ci-skip] Don't cancel TPSBar task if it wasn't started c32e46e Movement options for armour stands (#140) 9370140 Updated Upstream (Paper) f74bcbd [ci-skip] Update license info in readme 299b43a [ci-skip] Rebuild patches 03365bb Farmland trampling changes (#138) 984a268 Add StructureGenerateEvent (#137) 15d23a1 Add EntityTeleportHinderedEvent (#136) 8795c74 [ci-skip] Update Gradle to 6.8 e9be2a2 [ci-skip] change image link to purpur site d09cf68 [ci-skip] Stop patching symptoms. Patch the root cause dd65bd1 Fix typo 7a6e6ec Updated Upstream (Paper) bf7e290 Hide server-ip from timings be50f97 move timings config to the right place (#130) f1390cd Ignore blocks above Note Blocks (#135) c50344d Resolves #132 Add mobGriefing bypass to everything else bba9cff [ci-skip] Update README.md AirplaneLite Changes: 36cc1d3 Updated Upstream (Tuinity) bc0fef0 Don't spawn lightning on chunk load 15c06b8 Fix other comments 47f98d6 License information 4705af8 Fix comments 432cf4b Optimize random calls in chunk ticking
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();
|