Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 05:35:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix users being cleaned up too early and then logging back into the server - closes #271

Browse Source
This commit is contained in:
Luck 2017-05-06 18:24:44 +01:00
parent 8326539d40
commit 7dc41e15d3
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/me/lucko/luckperms/common/managers/impl/GenericUserManager.java
View File

@ -142,12 +142,19 @@ public class GenericUserManager extends AbstractManager<UserIdentifier, User> im
@Override @Override
public void scheduleUnload(UUID uuid) { public void scheduleUnload(UUID uuid) {
plugin.getScheduler().doAsyncLater(() -> { plugin.getScheduler().doAsyncLater(() -> {
User user = getIfLoaded(plugin.getUuidCache().getUUID(uuid)); // check once to see if the user can be unloaded.
if (user != null && !plugin.isPlayerOnline(uuid)) { if (getIfLoaded(plugin.getUuidCache().getUUID(uuid)) != null && !plugin.isPlayerOnline(uuid)) {
user.unregisterData();
unload(user); // check again in 40 ticks, we want to be sure the player won't have re-logged before we unload them.
plugin.getScheduler().doAsyncLater(() -> {
User user = getIfLoaded(plugin.getUuidCache().getUUID(uuid));
if (user != null && !plugin.isPlayerOnline(uuid)) {
user.unregisterData();
unload(user);
plugin.getUuidCache().clearCache(uuid);
}
}, 40L);
} }
plugin.getUuidCache().clearCache(uuid);
}, 40L); }, 40L);
} }

5
common/src/main/java/me/lucko/luckperms/common/storage/AbstractStorage.java
View File

@ -104,7 +104,10 @@ public class AbstractStorage implements Storage {
public CompletableFuture<Boolean> loadUser(UUID uuid, String username) { public CompletableFuture<Boolean> loadUser(UUID uuid, String username) {
return makeFuture(() -> { return makeFuture(() -> {
if (backing.loadUser(uuid, username)) { if (backing.loadUser(uuid, username)) {
plugin.getApiProvider().getEventFactory().handleUserLoad(plugin.getUserManager().getIfLoaded(uuid)); User u = plugin.getUserManager().getIfLoaded(uuid);
if (u != null) {
plugin.getApiProvider().getEventFactory().handleUserLoad(u);
}
return true; return true;
} }
return false; return false;