Per-world permissions

bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java

@@ -151,7 +151,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
 
     @Override
     public String getPlayerStatus(UUID uuid) {
-        return getServer().getPlayer(uuid) != null ? "&aOnline" : "&cOffline";
+        return getServer().getPlayer(getUuidCache().getExternalUUID(uuid)) != null ? "&aOnline" : "&cOffline";
     }
 
     @Override

bukkit/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java

@@ -1,6 +1,6 @@
 package me.lucko.luckperms.listeners;
 
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
 import me.lucko.luckperms.LPBukkitPlugin;
 import me.lucko.luckperms.commands.Util;
 import me.lucko.luckperms.constants.Message;
@@ -10,38 +10,15 @@ import me.lucko.luckperms.utils.UuidCache;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.*;
 
 import java.util.UUID;
 
-@RequiredArgsConstructor
+@AllArgsConstructor
 public class PlayerListener implements Listener {
     private static final String KICK_MESSAGE = Util.color(Message.PREFIX + "User data could not be loaded. Please contact an administrator.");
     private final LPBukkitPlugin plugin;
 
-    /*
-    cache: username --> uuid
-        returns mojang if not in offline mode
-
-
-    if server in offline mode:
-        go to datastore, look for uuid, add to cache.
-
-    *** player prelogin, load or create, using CACHE uuid
-
-
-
-    *** player login, we get their username and check if it's there
-
-    *** player join, save uuid data and refresh
-
-    *** player quit, unload
-
-     */
-
     @EventHandler
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent e) {
         if (!plugin.getDatastore().isAcceptingLogins()) {
@@ -54,22 +31,24 @@ public class PlayerListener implements Listener {
         if (!cache.isOnlineMode()) {
             UUID uuid = plugin.getDatastore().getUUID(e.getName());
             if (uuid != null) {
-                cache.addToCache(e.getName(), uuid);
+                cache.addToCache(e.getUniqueId(), uuid);
             } else {
-                cache.addToCache(e.getName(), e.getUniqueId());
+                // No previous data for this player
+                cache.addToCache(e.getUniqueId(), e.getUniqueId());
                 plugin.getDatastore().saveUUIDData(e.getName(), e.getUniqueId(), b -> {});
             }
         } else {
+            // Online mode, no cache needed. This is just for name -> uuid lookup.
             plugin.getDatastore().saveUUIDData(e.getName(), e.getUniqueId(), b -> {});
         }
 
-        plugin.getDatastore().loadOrCreateUser(cache.getUUID(e.getName(), e.getUniqueId()), e.getName());
+        plugin.getDatastore().loadOrCreateUser(cache.getUUID(e.getUniqueId()), e.getName());
     }
 
     @EventHandler
     public void onPlayerLogin(PlayerLoginEvent e) {
         final Player player = e.getPlayer();
-        final User user = plugin.getUserManager().getUser(plugin.getUuidCache().getUUID(e.getPlayer().getName(), e.getPlayer().getUniqueId()));
+        final User user = plugin.getUserManager().getUser(plugin.getUuidCache().getUUID(e.getPlayer().getUniqueId()));
 
         if (user == null) {
             e.disallow(PlayerLoginEvent.Result.KICK_OTHER, KICK_MESSAGE);
@@ -87,10 +66,7 @@ public class PlayerListener implements Listener {
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) {
         // Refresh permissions again
-        final User user = plugin.getUserManager().getUser(plugin.getUuidCache().getUUID(e.getPlayer().getName(), e.getPlayer().getUniqueId()));
-        if (user != null) {
-            user.refreshPermissions();
-        }
+        refreshPlayer(e.getPlayer());
     }
 
     @EventHandler
@@ -99,10 +75,22 @@ public class PlayerListener implements Listener {
         final UuidCache cache = plugin.getUuidCache();
 
         // Unload the user from memory when they disconnect;
-        cache.clearCache(player.getName());
+        cache.clearCache(player.getUniqueId());
 
-        final User user = plugin.getUserManager().getUser(cache.getUUID(player.getName(), player.getUniqueId()));
+        final User user = plugin.getUserManager().getUser(cache.getUUID(player.getUniqueId()));
         plugin.getUserManager().unloadUser(user);
     }
 
+    @EventHandler
+    public void onPlayerChangedWorld(PlayerChangedWorldEvent e) {
+        refreshPlayer(e.getPlayer());
+    }
+
+    private void refreshPlayer(Player p) {
+        final User user = plugin.getUserManager().getUser(plugin.getUuidCache().getUUID(p.getUniqueId()));
+        if (user != null) {
+            user.refreshPermissions();
+        }
+    }
+
 }

bukkit/src/main/java/me/lucko/luckperms/users/BukkitUser.java

@@ -30,7 +30,7 @@ public class BukkitUser extends User {
     @Override
     public void refreshPermissions() {
         plugin.doSync(() -> {
-            final Player player = plugin.getServer().getPlayer(getUuid());
+            final Player player = plugin.getServer().getPlayer(plugin.getUuidCache().getExternalUUID(getUuid()));
             if (player == null) return;
 
             if (attachment == null) {
@@ -42,7 +42,7 @@ public class BukkitUser extends User {
             attachment.getPermissions().keySet().forEach(p -> attachment.setPermission(p, false));
 
             // Re-add all defined permissions for the user
-            Map<String, Boolean> local = getLocalPermissions(getPlugin().getConfiguration().getServer(), null);
+            Map<String, Boolean> local = getLocalPermissions(getPlugin().getConfiguration().getServer(), player.getWorld().getName(), null);
             local.entrySet().forEach(e -> attachment.setPermission(e.getKey(), e.getValue()));
         });
     }

bukkit/src/main/java/me/lucko/luckperms/users/BukkitUserManager.java

@@ -23,7 +23,7 @@ public class BukkitUserManager extends UserManager {
                 BukkitUser u = (BukkitUser) user;
 
                 if (u.getAttachment() != null) {
-                    Player player = plugin.getServer().getPlayer(u.getUuid());
+                    Player player = plugin.getServer().getPlayer(plugin.getUuidCache().getExternalUUID(u.getUuid()));
 
                     if (player != null) {
                         player.removeAttachment(u.getAttachment());
@@ -38,7 +38,7 @@ public class BukkitUserManager extends UserManager {
 
     @Override
     public void cleanupUser(User user) {
-        if (plugin.getServer().getPlayer(user.getUuid()) == null) {
+        if (plugin.getServer().getPlayer(plugin.getUuidCache().getExternalUUID(user.getUuid())) == null) {
             unloadUser(user);
         }
     }
@@ -58,7 +58,7 @@ public class BukkitUserManager extends UserManager {
         // Sometimes called async, so we need to get the players on the Bukkit thread.
         plugin.doSync(() -> {
             Set<UUID> players = plugin.getServer().getOnlinePlayers().stream()
-                    .map(p -> plugin.getUuidCache().getUUID(p.getName(), p.getUniqueId()))
+                    .map(p -> plugin.getUuidCache().getUUID(p.getUniqueId()))
                     .collect(Collectors.toSet());
             plugin.doAsync(() -> players.forEach(u -> plugin.getDatastore().loadUser(u)));
         });