Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-13 03:41:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113 from Moo0/limitoverride

Browse Source 
Region limit override permission.
This commit is contained in:
2011-06-26 19:35:40 -07:00
commit e843ff372e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,10 +237,12 @@ public static void claim(CommandContext args, WorldGuardPlugin plugin,
WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld()); WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld()); RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
// Check whether the player has created too many regions if (!plugin.hasPermission(sender, "worldguard.region.unlimited")) {
if (wcfg.maxRegionCountPerPlayer >= 0 // Check whether the player has created too many regions
&& mgr.getRegionCountOfPlayer(localPlayer) >= wcfg.maxRegionCountPerPlayer) { if (wcfg.maxRegionCountPerPlayer >= 0
throw new CommandException("You own too many regions, delete one first to claim a new one."); && mgr.getRegionCountOfPlayer(localPlayer) >= wcfg.maxRegionCountPerPlayer) {
throw new CommandException("You own too many regions, delete one first to claim a new one.");
}
} }
ProtectedRegion existing = mgr.getRegion(id); ProtectedRegion existing = mgr.getRegion(id);
@ -289,11 +291,13 @@ public static void claim(CommandContext args, WorldGuardPlugin plugin,
} }
}*/ }*/
if (region.volume() > wcfg.maxClaimVolume) { if (!plugin.hasPermission(sender, "worldguard.region.unlimited")) {
player.sendMessage(ChatColor.RED + "This region is to large to claim."); if (region.volume() > wcfg.maxClaimVolume) {
player.sendMessage(ChatColor.RED + player.sendMessage(ChatColor.RED + "This region is too large to claim.");
"Max. volume: " + wcfg.maxClaimVolume + ", your volume: " + region.volume()); player.sendMessage(ChatColor.RED +
return; "Max. volume: " + wcfg.maxClaimVolume + ", your volume: " + region.volume());
return;
}
} }
region.getOwners().addPlayer(player.getName()); region.getOwners().addPlayer(player.getName());