From b2cd3d31fd5e9be0262d1f4e45d591615104cdb2 Mon Sep 17 00:00:00 2001 From: Wizjany Date: Fri, 10 Jun 2011 16:00:14 -0400 Subject: [PATCH] Standardizing override permission nodes (with backwards compatibility) --- .../com/sk89q/worldguard/bukkit/WorldConfiguration.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java index cd4fe0c1..9a2fa0df 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -336,7 +336,8 @@ public boolean isChestProtected(Block block, Player player) { if (!signChestProtection) { return false; } - if (plugin.hasPermission(player, "worldguard.chest-protection.override")) { + if (plugin.hasPermission(player, "worldguard.chest-protection.override") + || plugin.hasPermission(player, "worldguard.override.chest-protection")) { return false; } return chestProtection.isProtected(block, player); @@ -353,7 +354,8 @@ public boolean isChestProtectedPlacement(Block block, Player player) { if (!signChestProtection) { return false; } - if (plugin.hasPermission(player, "worldguard.chest-protection.override")) { + if (plugin.hasPermission(player, "worldguard.chest-protection.override") + || plugin.hasPermission(player, "worldguard.override.chest-protection")) { return false; } return chestProtection.isProtectedPlacement(block, player); @@ -363,7 +365,8 @@ public boolean isAdjacentChestProtected(Block block, Player player) { if (!signChestProtection) { return false; } - if (plugin.hasPermission(player, "worldguard.chest-protection.override")) { + if (plugin.hasPermission(player, "worldguard.chest-protection.override") + || plugin.hasPermission(player, "worldguard.override.chest-protection")) { return false; } return chestProtection.isAdjacentChestProtected(block, player);