From 9850358e296ffbe27e24692aa2bafe73801e7425 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 10 Apr 2019 03:05:07 +0800
Subject: [PATCH] Check and use default repo for user cache

---
 .../java/io/akarin/server/core/AkarinGlobalConfig.java | 10 +++++-----
 .../java/net/minecraft/server/AkarinUserCache.java     |  3 ++-
 src/main/java/net/minecraft/server/UserCache.java      |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/api/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java b/api/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
index 01b3509db..c959e0cfd 100644
--- a/api/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
+++ b/api/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
@@ -171,11 +171,6 @@ public class AkarinGlobalConfig {
         lazyThreadAssertion = getBoolean("core.lazy-thread-assertion", lazyThreadAssertion);
     }
     
-    public static int userCacheExpireDays = 30;
-    private static void userCacheExpireDays() {
-        userCacheExpireDays = getSeconds(getString("core.user-cache-expire-time", "30d"));
-    }
-    
     public static double blockbreakAnimationVisibleDistance = 1024;
     private static void blockbreakAnimationVisibleDistance() {
         double def = 32.00;
@@ -214,4 +209,9 @@ public class AkarinGlobalConfig {
     private static void improvedMobSpawnMechanics() {
         improvedMobSpawnMechanics = getBoolean("core.improved-mob-spawn-mechanics.enable", improvedMobSpawnMechanics);
     }
+    
+    public static int userCacheExpireDays = 30;
+    private static void enableModernUserCaches() {
+        userCacheExpireDays = getSeconds(getString("core.user-cache-expire-time", "30d"));
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/AkarinUserCache.java b/src/main/java/net/minecraft/server/AkarinUserCache.java
index 91d3d0152..53008f775 100644
--- a/src/main/java/net/minecraft/server/AkarinUserCache.java
+++ b/src/main/java/net/minecraft/server/AkarinUserCache.java
@@ -141,7 +141,8 @@ public class AkarinUserCache {
                 save();
         };
         
-        return lookup(profileHandler, username, cachedCallbackHandler, async);
+        GameProfileRepository repository = MinecraftServer.getServer().getUserCache().gameProfileRepository();
+        return lookup(repository != null ? repository : profileHandler, username, cachedCallbackHandler, async);
     }
     
     public GameProfile acquire(String username) {
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
index 47a79e100..02de6eb1c 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -46,7 +46,7 @@ public class UserCache {
     private final Map<String, UserCache.UserCacheEntry> d = Maps.newHashMap();private final Map<String, UserCache.UserCacheEntry> nameCache = d; // Paper - OBFHELPER
     private final Map<UUID, UserCache.UserCacheEntry> e = Maps.newHashMap();
     private final Deque<GameProfile> f = new java.util.concurrent.LinkedBlockingDeque<GameProfile>(); // CraftBukkit
-    private final GameProfileRepository g;
+    private GameProfileRepository g; public GameProfileRepository gameProfileRepository() { return this.g; } // Akarin - removed final
     protected final Gson b; protected Gson gson() { return this.b; } // Akarin - OBFHELPER
     private final File h; File file() { return this.h; } // Akarin - OBFHELPER
     private static final ParameterizedType i = new ParameterizedType() {
@@ -65,7 +65,7 @@ public class UserCache {
     static final ParameterizedType PARAMETERIZED_TYPE = i; // Akarin - OBFHELPER
 
     public UserCache(GameProfileRepository gameprofilerepository, File file) {
-        this.g = gameprofilerepository;
+        //this.g = gameprofilerepository; // Akarin
         this.h = file;
         GsonBuilder gsonbuilder = new GsonBuilder();