Move to proper attachments

Author: Innectic

Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java

@@ -31,6 +31,8 @@
 import me.innectic.permissify.spigot.events.PlayerJoin;
 import me.innectic.permissify.api.PermissifyAPI;
 import me.innectic.permissify.api.database.handlers.FullHandler;
+import me.innectic.permissify.spigot.events.PlayerLeave;
+import me.innectic.permissify.spigot.utils.AttachmentManager;
 import me.innectic.permissify.spigot.utils.ConfigVerifier;
 import me.innectic.permissify.spigot.utils.DisplayUtil;
 import org.bukkit.Bukkit;
@@ -56,6 +58,8 @@ public class PermissifyMain extends JavaPlugin {
     @Getter private CacheCommand cacheCommand;
     @Getter private ProfileCommand profileCommand;
 
+    @Getter private AttachmentManager attachmentManager;
+
     @Getter @Setter private boolean handleChat = false;
 
     @Override
@@ -81,6 +85,8 @@ public void onEnable() {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        // Create the attachment manager
+        attachmentManager = new AttachmentManager();
         // Register commands
         registerCommands();
         // Register listeners
@@ -134,5 +140,6 @@ private void registerListeners() {
         PluginManager pluginManager = Bukkit.getPluginManager();
 
         pluginManager.registerEvents(new PlayerJoin(), this);
+        pluginManager.registerEvents(new PlayerLeave(), this);
     }
 }

Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/GroupCommand.java

@@ -137,10 +137,10 @@ public String handlePermissionRemove(CommandSender sender, String[] args) {
             return PermissifyConstants.UNABLE_TO_CREATE.replace("<TYPE>", "group").replace("<REASON>", "No database handler.");
 
         if (args.length < 2) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_REMOVE;
-        boolean added = plugin.getPermissifyAPI().getDatabaseHandler().get().removeGroupPermission(args[0], ArgumentUtil.getRemainingArgs(1, args));
+        String[] remaining = ArgumentUtil.getRemainingArgs(1, args);
+        boolean added = plugin.getPermissifyAPI().getDatabaseHandler().get().removeGroupPermission(args[0], remaining);
         if (!added) return PermissifyConstants.UNABLE_TO_ADD.replace("<REASON>", "Permission isn't on group!");
 
-        String[] remaining = ArgumentUtil.getRemainingArgs(1, args);
         Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
             if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent()) return;
             Optional<PermissionGroup> group = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroup(args[0]);

Spigot/src/main/java/me/innectic/permissify/spigot/commands/subcommand/PlayerCommand.java

@@ -36,7 +36,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionAttachment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -96,6 +95,8 @@ public String handleRemovePlayerFromGroup(CommandSender sender, String[] args) {
         // TODO: stuff with the new permissible system that's actually done properly
 //        if (targetPlayer.isOnline()) group.get().getPermissions().forEach(permission ->
 //                targetPlayer.getPlayer().removeAttachment(new PermissionAttachment(plugin, permission.getPermission())));
+        plugin.getAttachmentManager().getAttachment(targetPlayer.getUniqueId(), Optional.of(group.get().getName())).ifPresent(attachment ->
+                group.get().getPermissions().forEach(permission -> attachment.unsetPermission(permission.getPermission())));
         plugin.getPermissifyAPI().getDatabaseHandler().get().updateCache(targetPlayer.getUniqueId());
         return PermissifyConstants.PLAYER_REMOVED_FROM_GROUP
                 .replace("<PLAYER>", targetPlayer.getName()).replace("<GROUP>", group.get().getName());
@@ -199,8 +200,10 @@ public String handleRemovePermission(CommandSender sender, String[] args) {
 
         plugin.getPermissifyAPI().getDatabaseHandler().get().removePermission(targetPlayer.getUniqueId(), args[1]);
         if (targetPlayer.isOnline()) {
-            Optional<PermissionAttachment> attachment = PermissionUtil.findAttachmentByPermission(targetPlayer.getPlayer(), args[1]);
-            attachment.ifPresent(targetPlayer.getPlayer()::removeAttachment);
+            System.out.println("ONRSTEORSNTRSEIOTNRSEIOTNRSEIOTNRSEIOTNRSTORSTIOERNTEIORSNTEIRSTN");
+
+            plugin.getAttachmentManager().getAttachment(targetPlayer.getUniqueId(), Optional.empty()).ifPresent(self ->
+                    self.unsetPermission(args[1]));
         }
 
         plugin.getPermissifyAPI().getDatabaseHandler().get().updateCache(targetPlayer.getUniqueId());

Spigot/src/main/java/me/innectic/permissify/spigot/events/PlayerJoin.java

@@ -32,6 +32,8 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+import java.util.Optional;
+
 /**
  * @author Innectic
  * @since 6/15/2017
@@ -40,14 +42,15 @@ public class PlayerJoin implements Listener {
 
     @EventHandler
     public void onPlayerJoinEvent(PlayerJoinEvent e) {
-        Bukkit.getScheduler().runTaskAsynchronously(PermissifyMain.getInstance(), () -> {
+        PermissifyMain plugin = PermissifyMain.getInstance();
+
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
             Player player = e.getPlayer();
             if (player == null) {
                 System.out.println("Player did not exist on join");
                 return;
             }
-            PermissionUtil.clearPermissions(player);
-            // Set the permissions of the player
+            plugin.getAttachmentManager().setAttachment(player.getUniqueId(), player.addAttachment(plugin), Optional.empty());
             PermissionUtil.applyPermissions(player);
         });
     }

Spigot/src/main/java/me/innectic/permissify/spigot/events/PlayerLeave.java

@@ -0,0 +1,25 @@
+package me.innectic.permissify.spigot.events;
+
+import me.innectic.permissify.spigot.PermissifyMain;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+/**
+ * @author Innectic
+ * @since 07/21/2018
+ */
+public class PlayerLeave implements Listener {
+
+    @EventHandler
+    public void onPlayerQuitEvent(PlayerQuitEvent e) {
+        PermissifyMain plugin = PermissifyMain.getInstance();
+        if (plugin == null) return;
+
+        if (e.getPlayer() == null) return;
+        Player player = e.getPlayer();
+
+        plugin.getAttachmentManager().removeAttachment(player.getUniqueId());
+    }
+}

Spigot/src/main/java/me/innectic/permissify/spigot/utils/AttachmentManager.java

@@ -0,0 +1,31 @@
+package me.innectic.permissify.spigot.utils;
+
+import org.bukkit.permissions.PermissionAttachment;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * @author Innectic
+ * @since 07/21/2018
+ */
+public class AttachmentManager {
+
+    private Map<UUID, Map<String, PermissionAttachment>> attachments = new HashMap<>();
+
+    public Optional<PermissionAttachment> getAttachment(UUID uuid, Optional<String> groupName) {
+        return Optional.ofNullable(attachments.getOrDefault(uuid, new HashMap<>()).getOrDefault(groupName.orElse(""), null));
+    }
+
+    public void setAttachment(UUID uuid, PermissionAttachment attachment, Optional<String> groupName) {
+        Map<String, PermissionAttachment> attachments = new HashMap<>();
+        attachments.put(groupName.orElse(""), attachment);
+        this.attachments.put(uuid, attachments);
+    }
+
+    public void removeAttachment(UUID uuid) {
+        attachments.remove(uuid);
+    }
+}

Spigot/src/main/java/me/innectic/permissify/spigot/utils/PermissionUtil.java

@@ -24,18 +24,13 @@
  */
 package me.innectic.permissify.spigot.utils;
 
-import me.innectic.permissify.api.permission.Permission;
-import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.spigot.PermissifyMain;
 import org.bukkit.block.CommandBlock;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
 
-import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -56,26 +51,28 @@ public static boolean hasPermissionOrSuperAdmin(CommandSender sender, String per
 
     public static void applyPermissions(Player player) {
         player.getEffectivePermissions().clear();
-        PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().ifPresent(handler -> {
+
+        PermissifyMain plugin = PermissifyMain.getInstance();
+        plugin.getPermissifyAPI().getDatabaseHandler().ifPresent(handler -> {
             // Check if the player should be in a default group.
             if (handler.getDefaultGroup().isPresent() && !handler.getDefaultGroup().get().hasPlayer(player.getUniqueId())) {
                 handler.addPlayerToGroup(player.getUniqueId(), handler.getDefaultGroup().get());
                 handler.setPrimaryGroup(handler.getDefaultGroup().get(), player.getUniqueId());
             }
             handler.updateCache(player.getUniqueId());
-            List<Permission> permissions = handler.getPermissions(player.getUniqueId());
-            // Add the permissions to the player
-            handler.getGroups(player.getUniqueId()).stream().map(PermissionGroup::getPermissions).forEach(permissions::addAll);
-            permissions.forEach(permission -> player.addAttachment(PermissifyMain.getInstance(), permission.getPermission(), permission.isGranted()));
-        });
-    }
 
-    public static void clearPermissions(Player player) {
-        player.getEffectivePermissions().stream().filter(Objects::nonNull).map(PermissionAttachmentInfo::getAttachment).filter(Objects::nonNull).forEach(player::removeAttachment);
-        player.recalculatePermissions();
-    }
+            // Add the player's "self" permissions
+            plugin.getAttachmentManager().getAttachment(player.getUniqueId(), Optional.empty()).ifPresent(self ->
+                    handler.getPermissions(player.getUniqueId()).forEach(permission -> self.setPermission(permission.getPermission(), permission.isGranted())));
+
+            // Add the player's group permissions
+            handler.getGroups(player.getUniqueId()).forEach(group -> {
+                PermissionAttachment attachment = plugin.getAttachmentManager().getAttachment(player.getUniqueId(), Optional.of(group.getName())).orElse(player.addAttachment(plugin));
+                attachment.getPermissions().keySet().forEach(attachment::unsetPermission);
 
-    public static Optional<PermissionAttachment> findAttachmentByPermission(Player player, String permission) {
-        return player.getEffectivePermissions().stream().filter(p -> p.getPermission().equalsIgnoreCase(permission)).map(PermissionAttachmentInfo::getAttachment).findFirst();
+                group.getPermissions().forEach(permission -> attachment.setPermission(permission.getPermission(), permission.isGranted()));
+                plugin.getAttachmentManager().setAttachment(player.getUniqueId(), attachment, Optional.of(group.getName()));
+            });
+        });
     }
 }