From 9391bf0c5371e69b424c30007450649ab1ca77b8 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 24 Jun 2020 17:21:23 +0200 Subject: [PATCH] Updated Upstream (Tuinity) Upstream has released updates that appears to apply and compile correctly Tuinity Changes: 98e9d5b Updated Upstream (Paper) --- Tuinity | 2 +- .../server/0031-Add-GameProfileLookupEvent.patch | 16 ++++++++-------- .../server/0039-Player-saving-async-FileIO.patch | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Tuinity b/Tuinity index 1aa9097a..98e9d5b1 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 1aa9097abf8864201342aa3f443e2f9a927a41ba +Subproject commit 98e9d5b19201b71db13e2d57846c935b19b10764 diff --git a/patches/server/0031-Add-GameProfileLookupEvent.patch b/patches/server/0031-Add-GameProfileLookupEvent.patch index e9455a58..704d8fd0 100644 --- a/patches/server/0031-Add-GameProfileLookupEvent.patch +++ b/patches/server/0031-Add-GameProfileLookupEvent.patch @@ -1,4 +1,4 @@ -From 105148608ec11fd2604336307c322007246b9640 Mon Sep 17 00:00:00 2001 +From 0317ae3d5823e21bb23b654753463efae5deb2a0 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 22:22:02 +0100 Subject: [PATCH] Add GameProfileLookupEvent @@ -9,7 +9,7 @@ Subject: [PATCH] Add GameProfileLookupEvent 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java -index 676cc44f5..5304cad91 100644 +index 00b7630cc..74ffeab50 100644 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -5,9 +5,13 @@ import com.google.common.base.Charsets; @@ -26,10 +26,10 @@ index 676cc44f5..5304cad91 100644 import org.bukkit.craftbukkit.entity.CraftPlayer; import org.spigotmc.SpigotConfig; -@@ -176,11 +180,19 @@ public class CraftPlayerProfile implements PlayerProfile { - boolean isOnlineMode = server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode); - boolean isCompleteFromCache = this.completeFromCache(true); - if (isOnlineMode && (!isCompleteFromCache || textures && !hasTextures())) { +@@ -183,11 +187,19 @@ public class CraftPlayerProfile implements PlayerProfile { + + boolean isCompleteFromCache = this.completeFromCache(false, onlineMode); + if (onlineMode && (!isCompleteFromCache || textures && !hasTextures())) { - GameProfile result = server.getSessionService().fillProfileProperties(profile, true); - if (result != null) { - copyProfileProperties(result, this.profile, true); @@ -49,10 +49,10 @@ index 676cc44f5..5304cad91 100644 + } + // YAPFA end } - return profile.isComplete() && (!isOnlineMode || !textures || hasTextures()); + return profile.isComplete() && (!onlineMode || !textures || hasTextures()); } diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index d370dbf84..1d3a380b9 100644 +index 93030a7b2..8bd78ef91 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -4,9 +4,14 @@ import com.google.common.collect.Iterables; diff --git a/patches/server/0039-Player-saving-async-FileIO.patch b/patches/server/0039-Player-saving-async-FileIO.patch index fab76412..9e03f06e 100644 --- a/patches/server/0039-Player-saving-async-FileIO.patch +++ b/patches/server/0039-Player-saving-async-FileIO.patch @@ -1,4 +1,4 @@ -From 0dd482a0728db2b40c63b1d62d799a51d45cc11c Mon Sep 17 00:00:00 2001 +From 5c1c7417e29d6e8542938e04f83483c0a5c483ae Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 4 Apr 2020 23:23:04 +0200 Subject: [PATCH] Player saving async FileIO @@ -183,7 +183,7 @@ index c1e8ff6ab..db4f62883 100644 nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft()); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 54f6dfcaa..cbd2486a4 100644 +index 5b634f238..1ae0c15c4 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -17,6 +17,8 @@ import java.util.Optional; @@ -195,7 +195,7 @@ index 54f6dfcaa..cbd2486a4 100644 import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -1209,6 +1211,28 @@ public abstract class PlayerList { +@@ -1210,6 +1212,28 @@ public abstract class PlayerList { if (team != null) scoreboard.removeTeam(team); } // Paper end @@ -224,7 +224,7 @@ index 54f6dfcaa..cbd2486a4 100644 } // Paper end -@@ -1248,13 +1272,13 @@ public abstract class PlayerList { +@@ -1249,13 +1273,13 @@ public abstract class PlayerList { File file = new File(this.server.getWorldServer(DimensionManager.OVERWORLD).getDataManager().getDirectory(), "stats"); File file1 = new File(file, uuid + ".json");