From c3f0c8a7a117cc80b00d3ccc3919332aa6567f89 Mon Sep 17 00:00:00 2001 From: halvors Date: Sat, 16 Jul 2011 22:39:30 +0200 Subject: [PATCH] Oops, missed some changes. --- .../java/com/sk89q/worldguard/bukkit/WorldConfiguration.java | 1 - .../sk89q/worldguard/bukkit/WorldGuardWeatherListener.java | 1 - .../com/sk89q/worldguard/bukkit/commands/RegionCommands.java | 4 +++- 3 files changed, 3 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 bf1db85a..ed333498 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -492,5 +492,4 @@ public boolean isAdjacentChestProtected(Block block, Player player) { public ChestProtection getChestProtection() { return chestProtection; } - } diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java index e2d09c15..6c8b4bf1 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java @@ -147,5 +147,4 @@ public void onLightningStrike(LightningStrikeEvent event) { } } } - } diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java index b0ab8c54..cda41c42 100755 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java @@ -256,6 +256,8 @@ public static void claim(CommandContext args, WorldGuardPlugin plugin, ApplicableRegionSet regions = mgr.getApplicableRegions(region); + + // Check if this region overlaps any other region if (regions.size() > 0) { if (!regions.isOwnerOfAll(localPlayer)) { @@ -264,7 +266,7 @@ public static void claim(CommandContext args, WorldGuardPlugin plugin, } else { if (wcfg.claimOnlyInsideExistingRegions) { throw new CommandException("You may only claim regions inside " + - "existing regions that you or your group own."); + "existing regions that you or your group own."); } }