Add caching for roles to avoid reading the files all the time

craftaro · Jul 7, 2024 · 54688b7 · 54688b7
1 parent 8425d99
commit 54688b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/java/com/craftaro/skyblock/island/Island.java b/src/main/java/com/craftaro/skyblock/island/Island.java
@@ -61,6 +61,7 @@ public class Island {
     private final List<IslandLocation> islandLocations = new ArrayList<>();
     private final Map<UUID, IslandCoop> coopPlayers = new HashMap<>();
     private final Set<UUID> whitelistedPlayers = new HashSet<>();
+    private final Map<IslandRole, Set<UUID>> roleCache = new HashMap<>();
 
     private UUID islandUUID;
     private UUID ownerUUID;
@@ -599,6 +600,11 @@ public boolean isAlwaysLoaded() {
     }
 
     public Set<UUID> getRole(IslandRole role) {
+
+        if (roleCache.containsKey(role)) {
+            return new HashSet<>(roleCache.get(role)); // Return a copy to avoid external modification
+        }
+
         Set<UUID> islandRoles = new HashSet<>();
 
         if (role == IslandRole.OWNER) {
@@ -615,6 +621,8 @@ public Set<UUID> getRole(IslandRole role) {
             }
         }
 
+        roleCache.put(role, islandRoles);
+
         return islandRoles;
     }
 
@@ -673,6 +681,9 @@ public boolean setRole(IslandRole role, UUID uuid) {
 
                 getVisit().setMembers(getRole(IslandRole.MEMBER).size() + getRole(IslandRole.OPERATOR).size() + 1);
 
+                //Update role cache
+                roleCache.remove(role);
+
                 return true;
             }
         }
@@ -699,6 +710,9 @@ public boolean removeRole(IslandRole role, UUID uuid) {
 
                 getVisit().setMembers(getRole(IslandRole.MEMBER).size() + getRole(IslandRole.OPERATOR).size() + 1);
 
+                //Update role cache
+                roleCache.remove(role);
+
                 return true;
             }
         }

diff --git a/src/main/java/com/craftaro/skyblock/listeners/InteractListeners.java b/src/main/java/com/craftaro/skyblock/listeners/InteractListeners.java
@@ -170,13 +170,13 @@ public void onPlayerInteract(PlayerInteractEvent event) {
             return;
         }
 
-        Optional<XMaterial> material = block == null ? Optional.empty() : CompatibleMaterial.getMaterial(block.getType());
-
         // Check permissions.
         if (!this.plugin.getPermissionManager().processPermission(event, player, island)) {
             return;
         }
 
+        Optional<XMaterial> material = block == null ? Optional.empty() : CompatibleMaterial.getMaterial(block.getType());
+
         if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
             final Optional<XMaterial> blockType = CompatibleMaterial.getMaterial(event.getClickedBlock().getType());
             final XMaterial heldType;