Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-21 14:51:23 +01:00
Code Issues Projects Releases Wiki Activity

Disallowed overwriting regions without specifying redefine.

Browse Source
This commit is contained in:
Wizjany 2011-08-20 02:17:39 -04:00
parent b5b92f91dc
commit e0066e6173
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java
View File

@ -84,8 +84,13 @@ public static void define(CommandContext args, WorldGuardPlugin plugin,
throw new CommandException("Select a region with WorldEdit first.");
}
ProtectedRegion region;
RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
if (mgr.hasRegion(id)) {
throw new CommandException("That region is already defined. Use redefine instead.");
}
ProtectedRegion region;
// Detect the type of region from WorldEdit
if (sel instanceof Polygonal2DSelection) {
Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
@ -106,7 +111,6 @@ public static void define(CommandContext args, WorldGuardPlugin plugin,
region.setOwners(RegionUtil.parseDomainString(args.getSlice(1), 1));
}
RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
mgr.addRegion(region);
try {
@ -223,8 +227,14 @@ public static void claim(CommandContext args, WorldGuardPlugin plugin,
throw new CommandException("Select a region with WorldEdit first.");
}
ProtectedRegion region;
RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
if (mgr.hasRegion(id)) {
throw new CommandException("That region already exists. Please choose a different name.");
}
ProtectedRegion region;
// Detect the type of region from WorldEdit
if (sel instanceof Polygonal2DSelection) {
Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
@ -246,7 +256,6 @@ public static void claim(CommandContext args, WorldGuardPlugin plugin,
}
WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
if (!plugin.hasPermission(sender, "worldguard.region.unlimited")) {
// Check whether the player has created too many regions
@ -267,8 +276,6 @@ 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)) {