fixed luckperms loading3

ActualPlayer · Aug 13, 2019 · e8f4855 · e8f4855
1 parent ecf5491
commit e8f4855
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/com/actualplayer/rememberme/RememberMe.java b/src/main/java/com/actualplayer/rememberme/RememberMe.java
@@ -63,9 +63,11 @@ public void onLoginEvent(LoginEvent loginEvent) {
         if (!loginEvent.getPlayer().hasPermission("rememberme.notransfer")) {
             handler.getLastServerName(loginEvent.getPlayer().getUniqueId()).thenAcceptAsync(lastServerName -> {
                 if (lastServerName != null) {
-                    getServer().getServer(lastServerName).ifPresent(lastServer -> loginEvent.getPlayer().createConnectionRequest(lastServer).connectWithIndication());
+                    getServer().getServer(lastServerName).ifPresent(lastServer -> {
+                        loginEvent.getPlayer().createConnectionRequest(lastServer).connectWithIndication();
+                    });
                 }
-            });
+            }).join();
         }
     }
 

diff --git a/src/main/java/com/actualplayer/rememberme/handlers/LuckPermsHandler.java b/src/main/java/com/actualplayer/rememberme/handlers/LuckPermsHandler.java
@@ -6,6 +6,8 @@
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.User;
 import me.lucko.luckperms.api.caching.MetaData;
+import me.lucko.luckperms.api.context.ContextManager;
+import me.lucko.luckperms.api.context.ImmutableContextSet;
 import me.lucko.luckperms.api.manager.UserManager;
 
 import java.util.Optional;
@@ -26,12 +28,11 @@ public CompletableFuture<String> getLastServerName(UUID uuid) {
         CompletableFuture<User> userFuture = userManager.loadUser(uuid);
         return userFuture.thenApply(user -> {
             if (user != null) {
-                Optional<Contexts> contextsOpt = api.getContextManager().lookupApplicableContexts(user);
+                ContextManager cm = api.getContextManager();
+                Contexts contexts = cm.lookupApplicableContexts(user).orElse(cm.getStaticContexts());
 
-                if (contextsOpt.isPresent()) {
-                    MetaData metaData = user.getCachedData().getMetaData(contextsOpt.get());
-                    return metaData.getMeta().getOrDefault("last-server", null);
-                }
+                MetaData metaData = user.getCachedData().getMetaData(contexts);
+                return metaData.getMeta().getOrDefault("last-server", null);
             }
 
             return null;