From a182768cfa8217e4c9da701b179641c918a2d182 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Wed, 25 Aug 2021 19:30:46 +0100
Subject: [PATCH] Change user housekeeper to be more lenient towards API usage
 (#3143)

---
 .../api/implementation/ApiUserManager.java      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
index ff1649f69..2be57b78a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
@@ -63,17 +63,20 @@ public class ApiUserManager extends ApiAbstractManager<User, net.luckperms.api.m
         return internal == null ? null : internal.getApiProxy();
     }
 
+    private net.luckperms.api.model.user.User proxyAndRegisterUsage(User internal) {
+        if (internal != null) {
+            this.plugin.getUserManager().getHouseKeeper().registerApiUsage(internal.getUniqueId());
+        }
+        return proxy(internal);
+    }
+
     @Override
     public @NonNull CompletableFuture<net.luckperms.api.model.user.User> loadUser(@NonNull UUID uniqueId, @Nullable String username) {
         Objects.requireNonNull(uniqueId, "uuid");
         ApiUtils.checkUsername(username, this.plugin);
 
-        if (this.plugin.getUserManager().getIfLoaded(uniqueId) == null) {
-            this.plugin.getUserManager().getHouseKeeper().registerApiUsage(uniqueId);
-        }
-
         return this.plugin.getStorage().loadUser(uniqueId, username)
-                .thenApply(this::proxy);
+                .thenApply(this::proxyAndRegisterUsage);
     }
 
     @Override
@@ -154,13 +157,13 @@ public class ApiUserManager extends ApiAbstractManager<User, net.luckperms.api.m
     @Override
     public net.luckperms.api.model.user.User getUser(@NonNull UUID uniqueId) {
         Objects.requireNonNull(uniqueId, "uuid");
-        return proxy(this.handle.getIfLoaded(uniqueId));
+        return proxyAndRegisterUsage(this.handle.getIfLoaded(uniqueId));
     }
 
     @Override
     public net.luckperms.api.model.user.User getUser(@NonNull String username) {
         Objects.requireNonNull(username, "name");
-        return proxy(this.handle.getByUsername(username));
+        return proxyAndRegisterUsage(this.handle.getByUsername(username));
     }
 
     @Override