Fix lwc.mod perm container access

pop4959 · Sep 24, 2023 · fa8ca3f · fa8ca3f
1 parent fd28db8
commit fa8ca3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx2G
 group=com.griefcraft
-version=2.3.1
+version=2.3.2-dev
 description=Inventory protection & management utilizing SQLite or MySQL as its backend.
 github=https://github.com/pop4959/LWCX
diff --git a/src/main/java/com/griefcraft/listeners/LWCPlayerListener.java b/src/main/java/com/griefcraft/listeners/LWCPlayerListener.java
@@ -888,7 +888,7 @@ public void onInventoryClick(InventoryClickEvent event) {
         // Can they admin it?
         boolean canAdmin = lwc.canAdminProtection(player, protection);
         // Can they access it? (using getAccess instead of canAccessProtection since that is only for opening)
-        boolean canAccess = false;
+        boolean canAccess = lwc.isMod(player);
         if (protection.getAccess(player.getUniqueId().toString(), Permission.Type.PLAYER) == Permission.Access.PLAYER) {
             canAccess = true;
         } else if (protection.getAccess(player.getName(), Permission.Type.PLAYER) == Permission.Access.PLAYER) {
@@ -957,21 +957,23 @@ public void onInventoryDrag(InventoryDragEvent event) {
         // If it's a display chest, check permission.
         if (protection.getType() == Protection.Type.DISPLAY) {
             // Can they admin it? (remove items/etc)
+            boolean canMod = lwc.isMod(player);
             boolean canAdmin = lwc.canAdminProtection(player, protection);
 
             // nope.avi
-            if (!canAdmin) {
+            if (!canMod && !canAdmin) {
                 event.setCancelled(true);
             }
 
         // If it's a supply chest and player drag items on its slot, check permission.
         } else if (protection.getType() == Protection.Type.SUPPLY &&
                 event.getRawSlots().stream().anyMatch(slot -> isRawSlotInTopInventory(event.getView(), slot))) {
             // Can they admin it? (remove items/etc)
+            boolean canMod = lwc.isMod(player);
             boolean canAdmin = lwc.canAdminProtection(player, protection);
 
             // nope.avi
-            if (!canAdmin) {
+            if (!canMod && !canAdmin) {
                 event.setCancelled(true);
             }
         }