19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
56 lines
2 KiB
Diff
56 lines
2 KiB
Diff
From b51a0a33ce75b69848531c0a50332d0c0aeec4ab Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 1525704..28c91cd 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -459,7 +459,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
|
if (this.m.d()) {
|
|
this.m.e();
|
|
}
|
|
-
|
|
+ // Spigot start
|
|
+ if( org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly )
|
|
+ {
|
|
+ LOGGER.info("Saving usercache.json");
|
|
+ this.Z.c();
|
|
+ }
|
|
+ //Spigot end
|
|
}
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
|
|
index 3eeaf09..03abfbd 100644
|
|
--- a/src/main/java/net/minecraft/server/UserCache.java
|
|
+++ b/src/main/java/net/minecraft/server/UserCache.java
|
|
@@ -120,7 +120,7 @@ public class UserCache {
|
|
}
|
|
}
|
|
|
|
- this.c();
|
|
+ if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.c(); // Spigot - skip saving if disabled
|
|
return usercacheentry == null ? null : usercacheentry.a();
|
|
}
|
|
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index d416087..78dcb39 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -321,4 +321,10 @@ public class SpigotConfig
|
|
{
|
|
userCacheCap = getInt( "settings.user-cache-size", 1000 );
|
|
}
|
|
+
|
|
+ public static boolean saveUserCacheOnStopOnly;
|
|
+ private static void saveUserCacheOnStopOnly()
|
|
+ {
|
|
+ saveUserCacheOnStopOnly = getBoolean( "settings.save-user-cache-on-stop-only", false );
|
|
+ }
|
|
}
|
|
--
|
|
2.1.0
|
|
|