Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent deadlock in LuckPermsHandler #1350

Browse Source
This commit is contained in:
Gabriele C 2017-10-09 09:02:14 +02:00
parent 7afda20288
commit 45dda0deba
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/fr/xephi/authme/permission/handlers/LuckPermsHandler.java
View File

@ -19,6 +19,9 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -63,7 +66,11 @@ public class LuckPermsHandler implements PermissionHandler {
if (user == null) { if (user == null) {
// user not loaded, we need to load them from the storage. // user not loaded, we need to load them from the storage.
// this is a blocking call. // this is a blocking call.
luckPermsApi.getStorage().loadUser(playerUuid).join(); try {
luckPermsApi.getStorage().loadUser(playerUuid).get(1, TimeUnit.SECONDS);
} catch (InterruptedException | TimeoutException | ExecutionException e) {
e.printStackTrace();
}
// then grab a new instance // then grab a new instance
user = luckPermsApi.getUser(playerUuid); user = luckPermsApi.getUser(playerUuid);