Reload permissions on cache purge

Author: Innectic

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

@@ -211,6 +211,7 @@ public void clear(List<UUID> onlinePlayers) {
                 PermissifyAPI.get().ifPresent(api -> api.getDisplayUtil().displayError(ConnectionError.REJECTED, Optional.of(e)));
             }
         } else PermissifyAPI.get().ifPresent(api -> api.getDisplayUtil().displayError(ConnectionError.REJECTED, Optional.empty()));
+        onlinePlayers.forEach(this::getPermissions);
     }
 
     @Override
@@ -313,11 +314,7 @@ public boolean hasPermission(UUID uuid, String permission) {
 
     @Override
     public List<Permission> getPermissions(UUID uuid) {
-        if (cachedPermissions.containsKey(uuid)) {
-            System.out.println("Found cached permissions for " + uuid);
-            return cachedPermissions.get(uuid);
-        }
-        System.out.println("No cache for " + uuid + " found. Getting.");
+        if (cachedPermissions.containsKey(uuid)) return cachedPermissions.get(uuid);
         Optional<Connection> connection = getConnection();
         List<Permission> permissions = new ArrayList<>();
 

Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/CacheCommand.java

@@ -62,6 +62,7 @@ private CommandResponse handleCachePurge(CommandSender sender, String[] args) {
         if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())
             return new CommandResponse(PermissifyConstants.UNABLE_OTHER.replace("<REASON>", "No database handler"), false);
         PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get().clear(Bukkit.getOnlinePlayers().stream().map(Player::getUniqueId).collect(Collectors.toList()));
+        Bukkit.getScheduler().runTaskAsynchronously(PermissifyMain.getInstance(), () -> Bukkit.getOnlinePlayers().forEach(PermissionUtil::applyPermissions));
         return new CommandResponse(PermissifyConstants.CACHE_PURGED, true);
     }
 }

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

@@ -27,6 +27,7 @@
 import me.innectic.permissify.api.permission.Permission;
 import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.spigot.PermissifyMain;
+import me.innectic.permissify.spigot.utils.PermissionUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -47,18 +48,7 @@ public void onPlayerJoinEvent(PlayerJoinEvent e) {
             Player player = e.getPlayer();
             if (player == null) return;
             // Set the permissions of the player
-            PermissifyMain.getInstance().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()));
-            });
+            PermissionUtil.applyPermissions(player);
         });
     }
 }

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

@@ -24,9 +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.entity.Player;
 
+import java.util.List;
+
 /**
  * @author Innectic
  * @since 8/21/2017
@@ -38,4 +42,19 @@ public static boolean hasPermissionOrSuperAdmin(Player player, String permission
                 (PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().map(handler ->
                         handler.isSuperAdmin(player.getUniqueId())).orElse(false));
     }
+
+    public static void applyPermissions(Player player) {
+        PermissifyMain.getInstance().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()));
+        });
+    }
 }