From 7cd24f18f3b277dcdde2c14326ea880a78f3125b Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 5 Nov 2025 12:28:23 +0100 Subject: [PATCH] fancynpcs: Only use minecraft usercache if fflag is enabled --- plugins/fancynpcs/VERSION | 2 +- .../src/main/java/de/oliver/fancynpcs/FancyNpcs.java | 1 + .../de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/fancynpcs/VERSION b/plugins/fancynpcs/VERSION index 5e0b06fa..dafa18e8 100644 --- a/plugins/fancynpcs/VERSION +++ b/plugins/fancynpcs/VERSION @@ -1 +1 @@ -2.8.0.303 \ No newline at end of file +2.8.0.304 \ No newline at end of file diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java index 2ff1b8ef..b0662e44 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java @@ -81,6 +81,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin { public static final FeatureFlag PLAYER_NPCS_FEATURE_FLAG = new FeatureFlag("player-npcs", "Every player can only manage the npcs they have created", false); public static final FeatureFlag USE_NATIVE_THREADS_FEATURE_FLAG = new FeatureFlag("use-native-threads", "Use native threads instead of virtual threads.", false); public static final FeatureFlag ENABLE_DEBUG_MODE_FEATURE_FLAG = new FeatureFlag("enable-debug-mode", "Enable debug mode", false); + public static final FeatureFlag USE_MINECRAFT_USERCACHE_FEATURE_FLAG = new FeatureFlag("use-minecraft-usercache", "Include the content of usercache.json to the username->uuid cache", false); private static FancyNpcs instance; private final ExtendedFancyLogger fancyLogger; diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java index f2ce0c94..f29ee148 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java @@ -55,6 +55,10 @@ public class UUIDFileCache implements UUIDCache { } private void loadMinecraftUsercache() { + if (!FancyNpcs.USE_MINECRAFT_USERCACHE_FEATURE_FLAG.isEnabled()) { + return; + } + if (!usercacheFile.exists()) { FancyNpcs.getInstance().getFancyLogger().debug("Minecraft usercache file does not exist, skipping load."); return;