2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 16 May 2016 20:47:41 -0400
|
2022-03-18 04:53:36 +01:00
|
|
|
Subject: [PATCH] Async GameProfileCache saving
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-06-12 07:20:08 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2023-06-07 21:19:26 +02:00
|
|
|
index ac0a6cfb6fb7d9fa696b1e35ebdfb37935b74048..857cc4fcc586f7a8ea5baeeae69da62ebfdac77a 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2023-06-07 21:19:26 +02:00
|
|
|
@@ -954,7 +954,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2021-06-11 14:02:28 +02:00
|
|
|
} catch (java.lang.InterruptedException ignored) {} // Paper
|
|
|
|
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
|
2021-06-12 07:20:08 +02:00
|
|
|
MinecraftServer.LOGGER.info("Saving usercache.json");
|
2021-06-11 14:02:28 +02:00
|
|
|
- this.getProfileCache().save();
|
2021-06-12 07:20:08 +02:00
|
|
|
+ this.getProfileCache().save(false); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
// Spigot end
|
2023-06-07 21:19:26 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
2023-06-07 21:19:26 +02:00
|
|
|
index 6f64d98021e842905cdd6410ec355a6f136ec18f..a9cf8960d487ee71385341285a4b1618007d06dc 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
2022-12-07 19:52:24 +01:00
|
|
|
@@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.convertOldUsers()) {
|
|
|
|
- this.getProfileCache().save();
|
2021-06-12 07:20:08 +02:00
|
|
|
+ this.getProfileCache().save(false); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2022-10-24 21:43:46 +02:00
|
|
|
index d246563021c32127e570809f4d849b6a156f4dc6..225e15d686675e21969c4210fa38fef58d920355 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2022-03-18 04:53:36 +01:00
|
|
|
@@ -127,7 +127,7 @@ public class GameProfileCache {
|
2021-06-12 07:20:08 +02:00
|
|
|
GameProfileCache.GameProfileInfo usercache_usercacheentry = new GameProfileCache.GameProfileInfo(profile, date);
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
this.safeAdd(usercache_usercacheentry);
|
|
|
|
- if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(); // Spigot - skip saving if disabled
|
2021-06-12 07:20:08 +02:00
|
|
|
+ if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(true); // Spigot - skip saving if disabled // Paper - async
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private long getNextOperation() {
|
2021-06-12 07:20:08 +02:00
|
|
|
@@ -160,7 +160,7 @@ public class GameProfileCache {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (flag && !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) { // Spigot - skip saving if disabled
|
|
|
|
- this.save();
|
2021-06-12 07:20:08 +02:00
|
|
|
+ this.save(true); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2021-07-07 08:52:40 +02:00
|
|
|
return optional;
|
2021-11-23 14:22:49 +01:00
|
|
|
@@ -274,7 +274,7 @@ public class GameProfileCache {
|
2021-06-11 14:02:28 +02:00
|
|
|
return arraylist;
|
|
|
|
}
|
|
|
|
|
|
|
|
- public void save() {
|
2021-06-12 07:20:08 +02:00
|
|
|
+ public void save(boolean asyncSave) { // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
JsonArray jsonarray = new JsonArray();
|
2021-06-12 07:20:08 +02:00
|
|
|
DateFormat dateformat = GameProfileCache.createDateFormat();
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-11-23 14:22:49 +01:00
|
|
|
@@ -282,6 +282,7 @@ public class GameProfileCache {
|
2021-06-12 07:20:08 +02:00
|
|
|
jsonarray.add(GameProfileCache.writeGameProfile(usercache_usercacheentry, dateformat));
|
2021-06-11 14:02:28 +02:00
|
|
|
});
|
|
|
|
String s = this.gson.toJson(jsonarray);
|
|
|
|
+ Runnable save = () -> { // Paper
|
|
|
|
|
|
|
|
try {
|
|
|
|
BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
|
2022-03-18 04:53:36 +01:00
|
|
|
@@ -306,6 +307,14 @@ public class GameProfileCache {
|
2021-06-11 14:02:28 +02:00
|
|
|
} catch (IOException ioexception) {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
|
|
+ };
|
|
|
|
+ if (asyncSave) {
|
2022-10-24 21:43:46 +02:00
|
|
|
+ io.papermc.paper.util.MCUtil.scheduleAsyncTask(save);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } else {
|
|
|
|
+ save.run();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2022-03-18 04:53:36 +01:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|