Update to latest LWC changes (will work with older LWC builds too)

Brokkonaut · Nov 24, 2018 · d5b7de6 · d5b7de6
1 parent 10ce119
commit d5b7de6
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/LightweightChestProtection.java b/src/main/java/com/Acrobot/ChestShop/Plugins/LightweightChestProtection.java
@@ -61,8 +61,15 @@ public void onProtectionCheck(ProtectionCheckEvent event) {
             return;
         }
 
-        if (protection.getType() == Protection.Type.DONATION ? !lwc.canAdminProtection(player, protection) : !lwc.canAccessProtection(player, protection)) {
-            event.setResult(Event.Result.DENY);
+        try {
+            if (!lwc.canAccessProtectionContents(player, protection)) {
+                event.setResult(Event.Result.DENY);
+            }
+        } catch (NoSuchMethodError e) {
+            // use old method as fallback
+            if (protection.getType() == Protection.Type.DONATION ? !lwc.canAdminProtection(player, protection) : !lwc.canAccessProtection(player, protection)) {
+                event.setResult(Event.Result.DENY);
+            }
         }
     }
 
@@ -79,13 +86,7 @@ public void onBlockProtect(ProtectBlockEvent event) {
             return;
         }
 
-        int x = block.getX();
-        int y = block.getY();
-        int z = block.getZ();
-
-        String worldName = block.getWorld().getName();
-
-        Protection existingProtection = lwc.getPhysicalDatabase().loadProtection(worldName, x, y, z);
+        Protection existingProtection = lwc.findProtection(block);
 
         if (existingProtection != null) {
             event.setProtected(true);
@@ -99,6 +100,10 @@ public void onBlockProtect(ProtectBlockEvent event) {
             return;
         }
 
+        int x = block.getX();
+        int y = block.getY();
+        int z = block.getZ();
+        String worldName = block.getWorld().getName();
         Protection protection = lwc.getPhysicalDatabase().registerProtection(block.getType(), Protection.Type.PRIVATE, worldName, player.getUniqueId().toString(), "", x, y, z);
 
         if (protection != null) {