diff --git a/patches/server/0010-Player-saving-async-FileIO.patch b/patches/server/0010-Player-saving-async-FileIO.patch index 27173637..460410f8 100644 --- a/patches/server/0010-Player-saving-async-FileIO.patch +++ b/patches/server/0010-Player-saving-async-FileIO.patch @@ -4,43 +4,6 @@ Date: Fri, 31 Jul 2020 22:39:45 -0500 Subject: [PATCH] Player-saving-async-FileIO -diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index cf539c98073b475eb5b769c8cc11d48a7e6d58f1..20b97d1e68132a9f1b62dece5c26da80e67347b7 100644 ---- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -@@ -50,6 +50,7 @@ public class AdvancementDataPlayer { - @Nullable - private Advancement l; - private boolean m = true; -+ public static java.util.concurrent.ExecutorService saveThread = java.util.concurrent.Executors.newSingleThreadExecutor(); // Yatopia - - // Paper start - fix advancement data player leakage - final Map> criterionData = Maps.newIdentityHashMap(); -@@ -228,6 +229,15 @@ public class AdvancementDataPlayer { - - jsonelement.getAsJsonObject().addProperty("DataVersion", SharedConstants.getGameVersion().getWorldVersion()); - -+ // Yatopia start - replace whole logic -+ saveThread.execute(() -> { -+ try (OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(f), Charsets.UTF_8.newEncoder())) { -+ AdvancementDataPlayer.b.toJson(jsonelement, writer); -+ } catch (Throwable e) { -+ AdvancementDataPlayer.LOGGER.error("Couldn't save player advancements to {}", this.f, e); -+ } -+ }); -+ /* - try { - FileOutputStream fileoutputstream = new FileOutputStream(this.f); - Throwable throwable = null; -@@ -275,7 +285,7 @@ public class AdvancementDataPlayer { - } catch (IOException ioexception) { - AdvancementDataPlayer.LOGGER.error("Couldn't save player advancements to {}", this.f, ioexception); - } -- -+ */ // Yatopia end - } - - public boolean grantCriteria(Advancement advancement, String s) { diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index ce4ebc96c01f3dacf4e4d0569d86f52140440d43..a52c0391b171c8a57de75f87c534ce1e0e78c44a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java @@ -77,10 +40,10 @@ index ce4ebc96c01f3dacf4e4d0569d86f52140440d43..a52c0391b171c8a57de75f87c534ce1e 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 5760b40bdbee417f5bb5210f1271241ff8f36350..090692feb9d3606786b52590d4da1c55962aa719 100644 +index 5760b40bdbee417f5bb5210f1271241ff8f36350..437698cf4fee266c87eebb8b5f05509b587913e7 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -1286,6 +1286,28 @@ public abstract class PlayerList { +@@ -1286,6 +1286,18 @@ public abstract class PlayerList { if (team != null) scoreboard.removeTeam(team); } // Paper end @@ -92,16 +55,6 @@ index 5760b40bdbee417f5bb5210f1271241ff8f36350..090692feb9d3606786b52590d4da1c55 + if (!done) { + LOGGER.error("Players did not save completely!"); + } -+ ServerStatisticManager.saveThread.shutdown(); -+ done = ServerStatisticManager.saveThread.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS); -+ if (!done) { -+ LOGGER.error("Stats did not save completely!"); -+ } -+ AdvancementDataPlayer.saveThread.shutdown(); -+ done = AdvancementDataPlayer.saveThread.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS); -+ if (!done) { -+ LOGGER.error("Advancements did not save completely!"); -+ } + } catch (InterruptedException e) { + e.printStackTrace(); + } @@ -109,7 +62,7 @@ index 5760b40bdbee417f5bb5210f1271241ff8f36350..090692feb9d3606786b52590d4da1c55 } // Paper end -@@ -1323,13 +1345,13 @@ public abstract class PlayerList { +@@ -1323,13 +1335,13 @@ public abstract class PlayerList { File file = this.server.a(SavedFile.STATS).toFile(); File file1 = new File(file, uuid + ".json"); @@ -125,59 +78,6 @@ index 5760b40bdbee417f5bb5210f1271241ff8f36350..090692feb9d3606786b52590d4da1c55 serverstatisticmanager = new ServerStatisticManager(this.server, file1); // this.o.put(uuid, serverstatisticmanager); // CraftBukkit -diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java -index 3c3b87e37cbf69c223da007e8b7eb646ec83691e..ef20b3e43eb9598e79ee3ded40f50ae0cc100872 100644 ---- a/src/main/java/net/minecraft/server/ServerStatisticManager.java -+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java -@@ -30,6 +30,7 @@ public class ServerStatisticManager extends StatisticManager { - private final File d; - private final Set> e = Sets.newHashSet(); - private int f = -300; -+ public static java.util.concurrent.ExecutorService saveThread = java.util.concurrent.Executors.newSingleThreadExecutor(); // Yatopia - - public ServerStatisticManager(MinecraftServer minecraftserver, File file) { - this.c = minecraftserver; -@@ -41,6 +42,7 @@ public class ServerStatisticManager extends StatisticManager { - this.a.put( wrapper, entry.getValue().intValue() ); - } - // Spigot end -+ saveThread.execute(() -> { // Yatopia - if (file.isFile()) { - try { - this.a(minecraftserver.getDataFixer(), org.apache.commons.io.FileUtils.readFileToString(file)); -@@ -50,17 +52,20 @@ public class ServerStatisticManager extends StatisticManager { - ServerStatisticManager.LOGGER.error("Couldn't parse statistics file {}", file, jsonparseexception); - } - } -- -+ }); // Yatopia - } - - public void save() { - if ( org.spigotmc.SpigotConfig.disableStatSaving ) return; // Spigot -+ // Yatopia start -+ String str = this.b(); -+ saveThread.execute(() -> { - try { -- org.apache.commons.io.FileUtils.writeStringToFile(this.d, this.b()); -+ org.apache.commons.io.FileUtils.writeStringToFile(this.d, str); - } catch (IOException ioexception) { - ServerStatisticManager.LOGGER.error("Couldn't save stats", ioexception); - } -- -+ }); // Yatopia end - } - - @Override -@@ -111,7 +116,7 @@ public class ServerStatisticManager extends StatisticManager { - - if (nbttagcompound2.hasKeyOfType(s2, 99)) { - SystemUtils.a(this.a(statisticwrapper, s2), (statistic) -> { -- this.a.put(statistic, nbttagcompound2.getInt(s2)); -+ this.a.put(statistic, nbttagcompound2.getInt(s2) + this.a.getOrDefault(statistic, 0)); // Yatopia - }, () -> { - ServerStatisticManager.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2); - }); diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java index a959672f5857b987001252c3fd7ace9e83e07c9b..d8969f7f5244548452e5d12325e6fa735ecd3a00 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java diff --git a/patches/server/0043-Stop-wasting-resources-on-JsonList-get.patch b/patches/server/0043-Stop-wasting-resources-on-JsonList-get.patch index 7fbe5a2f..9942aa8b 100644 --- a/patches/server/0043-Stop-wasting-resources-on-JsonList-get.patch +++ b/patches/server/0043-Stop-wasting-resources-on-JsonList-get.patch @@ -56,7 +56,7 @@ index 3fb72d6ee587d66a9b7e1dec27fc4f64b82ab4df..596815d70e69fd645bec5b6e8c1ebc7b Throwable throwable = null; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 090692feb9d3606786b52590d4da1c55962aa719..35d718da4d384f581eff9a5938a41ad2095800e4 100644 +index 437698cf4fee266c87eebb8b5f05509b587913e7..01d95a9946a6db0f03e4e1e1eaa66d162ae4c6e8 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -637,6 +637,7 @@ public abstract class PlayerList { diff --git a/patches/server/0047-Respect-PlayerKickEvent-leaveMessage.patch b/patches/server/0047-Respect-PlayerKickEvent-leaveMessage.patch index 1dd8e047..e83b6476 100644 --- a/patches/server/0047-Respect-PlayerKickEvent-leaveMessage.patch +++ b/patches/server/0047-Respect-PlayerKickEvent-leaveMessage.patch @@ -39,7 +39,7 @@ index cb4f173774b46793bc3744cb3242edd9272df463..4fac720564b8687fae59c0f2e4898a48 this.minecraftServer.getPlayerList().sendMessage(CraftChatMessage.fromString(quitMessage)); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 35d718da4d384f581eff9a5938a41ad2095800e4..9442937faa85d99a4c72c76d7fc3a3abfef7ba34 100644 +index 01d95a9946a6db0f03e4e1e1eaa66d162ae4c6e8..3df9a91c0474df8a2884f4a4ae7d016bd31600e9 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -500,6 +500,11 @@ public abstract class PlayerList { diff --git a/patches/server/0056-Respect-rotation-when-respawning.patch b/patches/server/0056-Respect-rotation-when-respawning.patch index e1db3db7..b69bf876 100644 --- a/patches/server/0056-Respect-rotation-when-respawning.patch +++ b/patches/server/0056-Respect-rotation-when-respawning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Respect rotation when respawning diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9442937faa85d99a4c72c76d7fc3a3abfef7ba34..51762750985062eab337fea3a8eff1d5097ff2d4 100644 +index 3df9a91c0474df8a2884f4a4ae7d016bd31600e9..171aa373e1ecd30211ec04810441c8f9cc1039f7 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -815,7 +815,7 @@ public abstract class PlayerList {