mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-09-19 19:11:39 +02:00
22be9f2d6f
* Updated Upstream and Sidestream(s) (Paper/Purpur/Origami) 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. Paper Changes: 2299159bb Add option to fix items merging through blocks (#5334) d8c20ddc7 Fix PlayerBucketEmptyEvent result itemstack (#5698) ceb3762fb Add PufferFishStateChangeEvent (#5606) cd4defec0 [CI-SKIP] Update version checker to use V2 downloads API (#5728) b9f2a673d Limit item frame cursors on maps (#5730) 81a537c1f Add PlayerKickEvent causes (#5648) b7976b956 Add More Lidded Block API (#5707) Purpur Changes: b88aef3a Fix Paper#4748 - Shulkerbox allow oversized stacks 9fec1bae Updated Upstream (Paper) 2aacc766 Update Toothpick to 1.1.0-SNAPSHOT a08d7470 Configurable anvil cumulative cost (#352) Origami Changes: 3b8adab Fix importing of classes not working if their directory doesn't exist * Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur/Empirecraft/Origami) 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. Paper Changes: 525d0e3d3 fix beacon activate/deactivate events (#5646) e403d6aaf [Auto] Updated Upstream (CraftBukkit) 6bcd8b57c Updated Upstream (CraftBukkit) (#5742) 501cc9448 Reset villager inventory on cancelled pickup event (#5738) 3f72a549b Exit with non-zero exit code when killed by watchdog (#5732) a8d7ad099 Updated Upstream (Bukkit/CraftBukkit) (#5735) Tuinity Changes: e9c8348 Revert entity ticking chunk map for tracker Purpur Changes: 687936be Updated Upstream (Paper) 4c2d7e56 Fix advancement triggers on entity death 49a0fb90 Fix oversized shulker box dupe e92d259e Fix raid captains not giving voluntary exile advancement a97fdc48 Config to broadcast the death message to the affected player (#363) 9bf8e165 Add burn in daylight API for LivingEntity (#331) 96460068 Fix dupe bug caused by SPIGOT-6452 2618c24f Revert "allow disabling offline mode message on an ONLINE MODE proxy" aa79fa5c allow disabling offline mode message on an ONLINE MODE proxy 830141ca Bee can work when raining or at night (#365) ae6ca468 Updated Upstream (Paper) d99cc6e8 [ci-skip] Add better issue templates (#360) Empirecraft Changes: 12009c31 Updated Paper 5305540d Updated Paper 1043bd94 Revert "Call EntityPickupItemEvent for villagers" CB commit 820b9bdf Updated Paper Origami Changes: 64fba4f Fix importing of classes not working if their directory doesn't exist 3b8adab Fix importing of classes not working if their directory doesn't exist * rebuild Patches
138 lines
7.1 KiB
Diff
138 lines
7.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hugo Planque <hookwood01@gmail.com>
|
|
Date: Thu, 21 Jan 2021 17:56:03 +0100
|
|
Subject: [PATCH] New nbt cache
|
|
|
|
The goal of this patch is to reduce I/O operations from the main thread while saving player data and also to avoid too many I/O operations while reading NBT Player file by using a cache (Which start to delete the oldest data when there is too much player compared to the map size)
|
|
|
|
Co-authored-by: ishland <ishlandmc@yeah.net>
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index cda0f9bf15fead921ced0e984dc9cf80ead88286..ed4a8f34c0f48adb9d90e53ac5c9ca584e400a47 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -955,7 +955,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
}
|
|
// Spigot start
|
|
MCUtil.asyncExecutor.shutdown(); // Paper
|
|
+ this.worldNBTStorage.executorService.shutdown(); // Yatopia
|
|
try { MCUtil.asyncExecutor.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS); // Paper
|
|
+ this.worldNBTStorage.executorService.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS); // Yatopia - New async nbt cache
|
|
} catch (java.lang.InterruptedException ignored) {} // Paper
|
|
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
|
|
LOGGER.info("Saving usercache.json");
|
|
diff --git a/src/main/java/net/minecraft/world/level/storage/WorldNBTStorage.java b/src/main/java/net/minecraft/world/level/storage/WorldNBTStorage.java
|
|
index d9c2c7a20953fc3bcdd07d70233ccf6e3748b14b..933b09169b2177f70412722264c0d5f129f3d93f 100644
|
|
--- a/src/main/java/net/minecraft/world/level/storage/WorldNBTStorage.java
|
|
+++ b/src/main/java/net/minecraft/world/level/storage/WorldNBTStorage.java
|
|
@@ -24,6 +24,11 @@ public class WorldNBTStorage {
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
private final File playerDir;
|
|
protected final DataFixer a;
|
|
+ // Yatopia start - NBT Cache system
|
|
+ private final org.yatopiamc.yatopia.server.cache.NBTCache dataCache = new org.yatopiamc.yatopia.server.cache.NBTCache();
|
|
+ public final java.util.concurrent.ExecutorService executorService = java.util.concurrent.Executors.newSingleThreadExecutor(
|
|
+ new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setPriority(Thread.NORM_PRIORITY - 1).build());
|
|
+ // Yatopia end
|
|
|
|
public WorldNBTStorage(Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer) {
|
|
this.a = datafixer;
|
|
@@ -37,11 +42,22 @@ public class WorldNBTStorage {
|
|
NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
|
|
File file = File.createTempFile(entityhuman.getUniqueIDString() + "-", ".dat", this.playerDir);
|
|
|
|
- NBTCompressedStreamTools.a(nbttagcompound, file);
|
|
+ // NBTCompressedStreamTools.a(nbttagcompound, file); // Yatopia
|
|
+ // Yatopia start - NBT Cache system
|
|
+ Runnable task = () -> { try { NBTCompressedStreamTools.a(nbttagcompound, file);
|
|
File file1 = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat");
|
|
File file2 = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat_old");
|
|
|
|
SystemUtils.a(file1, file, file2);
|
|
+ } catch (Exception exception) {
|
|
+ WorldNBTStorage.LOGGER.error("Failed to save player data for {}", entityhuman.getName(), exception); // Paper
|
|
+ }
|
|
+ };
|
|
+ synchronized (this.dataCache){
|
|
+ this.dataCache.put(file, nbttagcompound);
|
|
+ }
|
|
+ this.executorService.execute(task);
|
|
+ // Yatopia end
|
|
} catch (Exception exception) {
|
|
WorldNBTStorage.LOGGER.error("Failed to save player data for {}", entityhuman.getName(), exception); // Paper
|
|
}
|
|
@@ -57,9 +73,18 @@ public class WorldNBTStorage {
|
|
// Spigot Start
|
|
boolean usingWrongFile = false;
|
|
boolean normalFile = file.exists() && file.isFile(); // Akarin - ensures normal file
|
|
- if ( org.bukkit.Bukkit.getOnlineMode() && !normalFile ) // Paper - Check online mode first // Akarin - ensures normal file
|
|
+ // if ( org.bukkit.Bukkit.getOnlineMode() && !normalFile ) // Paper - Check online mode first // Akarin - ensures normal file // Yatopia
|
|
+ // Yatopia start - NBT Cache system
|
|
+ NBTTagCompound playerData;
|
|
+ synchronized (this.dataCache){
|
|
+ playerData = this.dataCache.get(file);
|
|
+ }
|
|
+ if (playerData == null && org.bukkit.Bukkit.getOnlineMode() && !normalFile ) // Paper - Check online mode first // Akarin - ensures normal file
|
|
{
|
|
file = new File( this.playerDir, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
|
|
+ synchronized (this.dataCache){
|
|
+ playerData = this.dataCache.get(file);
|
|
+ }
|
|
if ( file.exists() )
|
|
{
|
|
usingWrongFile = true;
|
|
@@ -67,10 +92,13 @@ public class WorldNBTStorage {
|
|
}
|
|
}
|
|
// Spigot End
|
|
-
|
|
- if (normalFile) { // Akarin - avoid double I/O operation
|
|
+ // if (normalFile) { // Akarin - avoid double I/O operation // Yatopia
|
|
+ if (playerData != null) {
|
|
+ nbttagcompound = playerData;
|
|
+ } else if (normalFile) { // Akarin - avoid double I/O operation
|
|
nbttagcompound = NBTCompressedStreamTools.a(file);
|
|
}
|
|
+ // Yatopia end
|
|
// Spigot Start
|
|
if ( usingWrongFile )
|
|
{
|
|
diff --git a/src/main/java/org/yatopiamc/yatopia/server/cache/NBTCache.java b/src/main/java/org/yatopiamc/yatopia/server/cache/NBTCache.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..d739a71c91b54d156f6e1d8487add372a06d5939
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/yatopiamc/yatopia/server/cache/NBTCache.java
|
|
@@ -0,0 +1,32 @@
|
|
+package org.yatopiamc.yatopia.server.cache;
|
|
+
|
|
+import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap;
|
|
+import net.minecraft.server.MinecraftServer;
|
|
+import net.minecraft.nbt.NBTTagCompound;
|
|
+
|
|
+import java.io.File;
|
|
+
|
|
+public class NBTCache extends Object2ObjectLinkedOpenCustomHashMap<File, NBTTagCompound> {
|
|
+
|
|
+ public NBTCache() {
|
|
+ super(100, 0.75F, new Strategy<File>() {
|
|
+ @Override
|
|
+ public int hashCode(File k) {
|
|
+ return k.hashCode();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean equals(File k, File k1) {
|
|
+ return k.equals(k1);
|
|
+ }
|
|
+ });
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public NBTTagCompound put(File k, NBTTagCompound v) {
|
|
+ if (this.size() > MinecraftServer.getServer().getPlayerCount()) {
|
|
+ this.removeLast();
|
|
+ }
|
|
+ return super.putAndMoveToFirst(k, v);
|
|
+ }
|
|
+}
|