Better permission removal

Author: Innectic

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

@@ -36,6 +36,7 @@
 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;
@@ -196,7 +197,10 @@ public String handleRemovePermission(CommandSender sender, String[] args) {
         }
 
         plugin.getPermissifyAPI().getDatabaseHandler().get().removePermission(targetPlayer.getUniqueId(), args[1]);
-        if (targetPlayer.isOnline()) targetPlayer.getPlayer().addAttachment(plugin, args[1], false);
+        if (targetPlayer.isOnline()) {
+            Optional<PermissionAttachment> attachment = PermissionUtil.findAttachmentByPermission(targetPlayer.getPlayer(), args[1]);
+            attachment.ifPresent(targetPlayer.getPlayer()::removeAttachment);
+        }
 
         plugin.getPermissifyAPI().getDatabaseHandler().get().updateCache(targetPlayer.getUniqueId());
         return PermissifyConstants.PERMISSION_REMOVED_PLAYER

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

@@ -42,7 +42,11 @@ public class PlayerJoin implements Listener {
     public void onPlayerJoinEvent(PlayerJoinEvent e) {
         Bukkit.getScheduler().runTaskAsynchronously(PermissifyMain.getInstance(), () -> {
             Player player = e.getPlayer();
-            if (player == null) return;
+            if (player == null) {
+                System.out.println("Player did not exist on join");
+                return;
+            }
+            PermissionUtil.clearPermissions(player);
             // Set the permissions of the player
             PermissionUtil.applyPermissions(player);
         });

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

@@ -31,8 +31,12 @@
 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;
 
 /**
  * @author Innectic
@@ -65,4 +69,13 @@ public static void applyPermissions(Player player) {
             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();
+    }
+
+    public static Optional<PermissionAttachment> findAttachmentByPermission(Player player, String permission) {
+        return player.getEffectivePermissions().stream().filter(p -> p.getPermission().equalsIgnoreCase(permission)).map(PermissionAttachmentInfo::getAttachment).findFirst();
+    }
 }