Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-03 07:47:32 +02:00
Code Issues Projects Releases Wiki Activity

Change user housekeeper to be more lenient towards API usage (#3143)

Browse Source
This commit is contained in:
Luck 2021-08-25 19:30:46 +01:00
parent 93683c3a2f
commit a182768cfa
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
View File

@ -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