Finish up 1.0.1

Author: Innectic

API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java

@@ -451,10 +451,8 @@ public Tristate deleteGroup(String name) {
         if (!group.isPresent())
             return Tristate.NONE;
 
-        if (defaultGroup.isPresent() && defaultGroup.get().getName().equalsIgnoreCase(name)) {
-            setDefaultGroup(null);
-        }
-        Set<UUID> players = group.get().getPlayers().keySet();
+        if (defaultGroup.isPresent() && defaultGroup.get().getName().equalsIgnoreCase(name)) setDefaultGroup(null);
+        Set<UUID> players = new HashSet<>(group.get().getPlayers().keySet());
         // Delete from the cache
         cachedGroups.remove(name);
         players.forEach(uuid -> this.removePlayerFromGroup(uuid, group.get()));
@@ -519,7 +517,6 @@ public Tristate addPlayerToGroup(UUID uuid, PermissionGroup group) {
     public Tristate removePlayerFromGroup(UUID uuid, PermissionGroup group) {
         if (!group.hasPlayer(uuid)) return Tristate.NONE;
         group.removePlayer(uuid);
-        System.out.println(group.getClass().hashCode() + " - " + cachedGroups.get(group.getName()).getClass().hashCode());
 
         Optional<Connection> connection = getConnection();
         if (!connection.isPresent()) {

Spigot/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.13-pre7-R0.1-SNAPSHOT</version>
+            <version>1.13-R0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>me.innectic</groupId>

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

@@ -206,9 +206,7 @@ public String handleRemovePermission(CommandSender sender, String[] args) {
         }
 
         plugin.getPermissifyAPI().getDatabaseHandler().get().removePermission(targetPlayer.getUniqueId(), args[1]);
-        if (targetPlayer.isOnline())
-            plugin.getAttachmentManager().getAttachment(targetPlayer.getUniqueId(), Optional.empty()).ifPresent(self ->
-                    self.unsetPermission(args[1]));
+        if (targetPlayer.isOnline()) PermissionUtil.applyPermissions(targetPlayer.getPlayer());
 
         plugin.getPermissifyAPI().getDatabaseHandler().get().updateCache(targetPlayer.getUniqueId());
         return PermissifyConstants.PERMISSION_REMOVED_PLAYER

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

@@ -31,6 +31,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionAttachment;
 
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -49,18 +50,25 @@ public static boolean hasPermissionOrSuperAdmin(CommandSender sender, String per
         return sender instanceof CommandBlock || sender instanceof ConsoleCommandSender;
     }
 
+    private static void removeAllPermissions(Player player) {
+        player.getEffectivePermissions().stream().map(info -> {
+            if (info.getAttachment() == null) {
+                // When the attachment is null, this is something coming from default Spigot
+                return null;
+            }
+            return info.getAttachment();
+        }).filter(Objects::nonNull).forEach(PermissionAttachment::remove);
+    }
+
     public static void applyPermissions(Player player) {
         PermissifyMain plugin = PermissifyMain.getInstance();
 
-        System.out.println("FIRST");
-        plugin.getAttachmentManager().getAllAttachmentsForPlayer(player.getUniqueId()).forEach(entry -> entry.getPermissions().keySet().forEach(System.out::println));
-//        plugin.getAttachmentManager().removeAttachment(player.getUniqueId());
+        removeAllPermissions(player);
         plugin.getAttachmentManager().resetAllPermissibles(player.getUniqueId());
+
         plugin.getAttachmentManager().setAttachment(player.getUniqueId(), player.addAttachment(plugin), Optional.empty());
         player.recalculatePermissions();
 
-        plugin.getAttachmentManager().getAllAttachmentsForPlayer(player.getUniqueId()).forEach(attachment -> player.getEffectivePermissions().forEach(info -> attachment.unsetPermission(info.getPermission())));
-
         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())) {
@@ -71,24 +79,15 @@ public static void applyPermissions(Player player) {
 
             // Add the player's "self" permissions
             plugin.getAttachmentManager().getAttachment(player.getUniqueId(), Optional.empty()).ifPresent(self ->
-                    handler.getPermissions(player.getUniqueId()).forEach(permission -> {
-                        System.out.println(permission.getPermission() + " -> " + permission.isGranted());
-                        self.setPermission(permission.getPermission(), permission.isGranted());
-                    }));
+                    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);
+                PermissionAttachment attachment = player.addAttachment(plugin);
 
-                group.getPermissions().forEach(permission -> {
-                    System.out.println(group.getName() + ": " + permission.getPermission() + " -> " + permission.isGranted());
-                    attachment.setPermission(permission.getPermission(), permission.isGranted());
-                });
+                group.getPermissions().forEach(permission -> attachment.setPermission(permission.getPermission(), permission.isGranted()));
                 plugin.getAttachmentManager().setAttachment(player.getUniqueId(), attachment, Optional.of(group.getName()));
             });
         });
-        System.out.println("SECOND");
-        plugin.getAttachmentManager().getAllAttachmentsForPlayer(player.getUniqueId()).forEach(entry -> entry.getPermissions().keySet().forEach(System.out::println));
     }
 }