Fix startup deadlock

This commit is contained in:
Luck
2017-09-13 21:24:35 +01:00
Unverified
parent 2412edaa3a
commit 67602b8d85
5 changed files with 18 additions and 5 deletions
@@ -38,7 +38,7 @@ public class UpdateTaskBuffer extends BufferedRequest<Void> {
@Override
protected Void perform() {
new UpdateTask(plugin).run();
new UpdateTask(plugin, false).run();
return null;
}
}
@@ -31,10 +31,17 @@ import me.lucko.luckperms.api.event.cause.CreationCause;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import java.util.concurrent.CompletableFuture;
@AllArgsConstructor
public class UpdateTask implements Runnable {
private final LuckPermsPlugin plugin;
/**
* If this task is being called before the server has fully started
*/
private final boolean initialUpdate;
/**
* Called ASYNC
*/
@@ -55,7 +62,10 @@ public class UpdateTask implements Runnable {
plugin.getStorage().loadAllTracks().join();
// Refresh all online users.
plugin.getUserManager().updateAllUsers().join();
CompletableFuture<Void> userUpdateFut = plugin.getUserManager().updateAllUsers();
if (!initialUpdate) {
userUpdateFut.join();
}
plugin.onPostUpdate();