Fixed role permissions override each other causing them to not get sa…

…ved correctly (#831, #1301)
BG-Software-LLC · Jul 30, 2022 · 46fd1d3 · 46fd1d3
1 parent 1f32391
commit 46fd1d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/...main/java/com/bgsoftware/superiorskyblock/core/database/bridge/IslandsDatabaseBridge.java b/...main/java/com/bgsoftware/superiorskyblock/core/database/bridge/IslandsDatabaseBridge.java
@@ -149,12 +149,6 @@ public static void saveRolePermission(Island island, PlayerRole playerRole, Isla
         ));
     }
 
-    public static void removeRolePermission(Island island, PlayerRole playerRole) {
-        runOperationIfRunning(island.getDatabaseBridge(), databaseBridge -> databaseBridge.deleteObject("islands_role_permissions",
-                createFilter("island", island, new Pair<>("role", playerRole.getId()))
-        ));
-    }
-
     public static void clearRolePermissions(Island island) {
         runOperationIfRunning(island.getDatabaseBridge(), databaseBridge -> databaseBridge.deleteObject("islands_role_permissions",
                 createFilter("island", island)));

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java b/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java
@@ -1112,16 +1112,14 @@ public void setPermission(PlayerRole playerRole, IslandPrivilege islandPrivilege
         PluginDebugger.debug("Action: Set Permission, Island: " + owner.getName() + ", Role: " + playerRole +
                 ", Permission: " + islandPrivilege.getName());
 
-        PlayerRole oldRole = rolePermissions.put(islandPrivilege, playerRole);
+        rolePermissions.put(islandPrivilege, playerRole);
 
         if (islandPrivilege == IslandPrivileges.FLY) {
             getAllPlayersInside().forEach(this::updateIslandFly);
         } else if (islandPrivilege == IslandPrivileges.VILLAGER_TRADING) {
             getAllPlayersInside().forEach(superiorPlayer -> IslandUtils.updateTradingMenus(this, superiorPlayer));
         }
 
-        if (oldRole != null)
-            IslandsDatabaseBridge.removeRolePermission(this, oldRole);
         IslandsDatabaseBridge.saveRolePermission(this, playerRole, islandPrivilege);
     }