2019-05-14 10:00:00 +10:00
|
|
|
From adc4ae5fd6b3e5f8dd755f649a3535b547166c60 Mon Sep 17 00:00:00 2001
|
2014-05-22 09:01:33 -04:00
|
|
|
From: drXor <mcyoungsota@gmail.com>
|
|
|
|
Date: Fri, 23 May 2014 18:05:10 -0400
|
|
|
|
Subject: [PATCH] Configurable save-on-stop-only for UserCache
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2019-05-14 10:00:00 +10:00
|
|
|
index c339888ba..e4d0995f2 100644
|
2014-05-22 09:01:33 -04:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2019-05-12 11:18:39 +10:00
|
|
|
@@ -715,6 +715,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2018-12-13 11:00:00 +11:00
|
|
|
this.snooper.e();
|
2014-05-22 09:01:33 -04:00
|
|
|
}
|
2016-03-01 08:33:06 +11:00
|
|
|
|
|
|
|
+ // Spigot start
|
|
|
|
+ if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
|
|
|
|
+ LOGGER.info("Saving usercache.json");
|
2018-07-15 10:00:00 +10:00
|
|
|
+ this.getUserCache().c();
|
2016-03-01 08:33:06 +11:00
|
|
|
+ }
|
|
|
|
+ // Spigot end
|
2014-05-22 09:01:33 -04:00
|
|
|
}
|
|
|
|
|
2016-03-01 08:33:06 +11:00
|
|
|
public String getServerIp() {
|
2014-05-22 09:01:33 -04:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
|
2019-04-25 12:00:00 +10:00
|
|
|
index 52b9ddeae..7e18291f2 100644
|
2014-05-22 09:01:33 -04:00
|
|
|
--- a/src/main/java/net/minecraft/server/UserCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/UserCache.java
|
2018-12-26 08:00:00 +11:00
|
|
|
@@ -131,7 +131,7 @@ public class UserCache {
|
2016-03-01 08:33:06 +11:00
|
|
|
this.d.put(gameprofile.getName().toLowerCase(Locale.ROOT), usercache_usercacheentry);
|
|
|
|
this.e.put(uuid, usercache_usercacheentry);
|
|
|
|
this.f.addFirst(gameprofile);
|
2015-07-23 21:43:27 +01:00
|
|
|
- this.c();
|
|
|
|
+ if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.c(); // Spigot - skip saving if disabled
|
|
|
|
}
|
|
|
|
|
2016-05-10 21:48:25 +10:00
|
|
|
@Nullable
|
2018-12-26 08:00:00 +11:00
|
|
|
@@ -160,7 +160,7 @@ public class UserCache {
|
2014-05-22 09:01:33 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- this.c();
|
|
|
|
+ if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.c(); // Spigot - skip saving if disabled
|
2015-02-28 11:36:22 +00:00
|
|
|
return usercache_usercacheentry == null ? null : usercache_usercacheentry.a();
|
2014-05-22 09:01:33 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
2019-04-30 21:46:22 +10:00
|
|
|
index 1b5a7e3e3..75322a677 100644
|
2014-05-22 09:01:33 -04:00
|
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
2018-12-28 10:22:10 +11:00
|
|
|
@@ -325,4 +325,10 @@ public class SpigotConfig
|
2014-05-22 09:01:33 -04:00
|
|
|
{
|
|
|
|
userCacheCap = getInt( "settings.user-cache-size", 1000 );
|
|
|
|
}
|
2016-11-17 12:41:12 +11:00
|
|
|
+
|
2014-05-22 09:01:33 -04:00
|
|
|
+ public static boolean saveUserCacheOnStopOnly;
|
|
|
|
+ private static void saveUserCacheOnStopOnly()
|
|
|
|
+ {
|
|
|
|
+ saveUserCacheOnStopOnly = getBoolean( "settings.save-user-cache-on-stop-only", false );
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
--
|
2019-04-23 09:33:25 +10:00
|
|
|
2.20.1
|
2014-05-22 09:01:33 -04:00
|
|
|
|