From 1dfb4db633e89bc3ce2a54f291cefacba6f106c9 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 20 Feb 2013 11:56:46 +1000 Subject: [PATCH] Fixed the WorldGuard region checking methods, they defaulted to false if WorldGuard wasn't available. --- .../java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java b/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java index f5fc7d6507..7f8baeeedd 100644 --- a/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java +++ b/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java @@ -846,7 +846,8 @@ public boolean canBuild(Player player, Block block) { return !event.isCancelled() || event.canBuild(); } if (!config.obeyWorldguard) return true; - return worldGuardPlugin != null && worldGuardPlugin.canBuild(player, block); + if (worldGuardPlugin == null) return true; + return worldGuardPlugin.canBuild(player, block); } /** @@ -869,7 +870,8 @@ public boolean canUse(Player player, Location loc) { return !event.isCancelled(); } if (!config.obeyWorldguard) return true; - return worldGuardPlugin != null && worldGuardPlugin.getGlobalRegionManager().allows(DefaultFlag.USE, loc, worldGuardPlugin.wrapPlayer(player)); + if (worldGuardPlugin == null) return true; + return worldGuardPlugin.getGlobalRegionManager().allows(DefaultFlag.USE, loc, worldGuardPlugin.wrapPlayer(player)); } /**