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

A few changes in the new region commands.

Browse Source 
- Allow setting flags on the global region (bugfix)
- Don't throw permissions errors when listing available flags (bugfix)
- Info command defaults to global region if no others are present (enhancement)
- A few typo and spacing fixes (enhancement)
This commit is contained in:
wizjany 2013-06-01 17:39:49 -04:00
parent 2d9e95a63e
commit 17a466059e
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,6 +172,7 @@ private ProtectedRegion findExistingRegion(
return region;
}
/**
* Get the region at the player's location, if possible.
*
@ -185,13 +186,39 @@ private ProtectedRegion findExistingRegion(
*/
private ProtectedRegion findRegionStandingIn(
RegionManager regionManager, Player player) throws CommandException {
return findRegionStandingIn(regionManager, player, false);
}
/**
* Get the region at the player's location, if possible.
*
* <p>If the player is standing in several regions, an error will be raised
* and a list of regions will be provided.</p>
*
* <p>If the player is not standing in any regions, the global region will
* returned if allowGlobal is true and it exists.</p>
*
* @param regionManager the region manager
* @param player the player
* @param allowGlobal whether to search for a global region if no others are found
* @return a region
* @throws CommandException thrown if no region was found
*/
private ProtectedRegion findRegionStandingIn(
RegionManager regionManager, Player player, boolean allowGlobal) throws CommandException {
ApplicableRegionSet set = regionManager.getApplicableRegions(
player.getLocation());
if (set.size() == 0) {
if (allowGlobal) {
ProtectedRegion global = findExistingRegion(regionManager, "__global__", true);
player.sendMessage(ChatColor.GRAY + "You're not standing in any " +
"regions. Using the global region for this world instead.");
return global;
}
throw new CommandException(
"You're not standing in a region. Specify an ID if " +
"you want to select a specific region.");
"You're not standing in a region." +
"Specify an ID if you want to select a specific region.");
} else if (set.size() > 1) {
StringBuilder builder = new StringBuilder();
boolean first = true;
@ -228,8 +255,8 @@ private Selection getSelection(Player player) throws CommandException {
if (selection == null) {
throw new CommandException(
"Please select an area first. " +
"Use WorldEdit to make a selection! " +
"(wiki: http://wiki.sk89q.com/wiki/WorldEdit).");
"Use WorldEdit to make a selection! " +
"(wiki: http://wiki.sk89q.com/wiki/WorldEdit).");
}
return selection;
@ -296,7 +323,7 @@ private void reloadChanges(CommandSender sender, RegionManager regionManager)
try {
if (regionManager.getRegions().size() >= 500) {
sender.sendMessage(ChatColor.GRAY +
"Now saving region list to disk... (Taking too long? We're fixing it)");
"Now loading region list from disk... (Taking too long? We're fixing it)");
}
regionManager.load();
} catch (ProtectionDatabaseException e) {
@ -656,7 +683,7 @@ public void info(CommandContext args, CommandSender sender) throws CommandExcept
"the region with /region info -w world_name region_name.");
}
existing = findRegionStandingIn(regionManager, (Player) sender);
existing = findRegionStandingIn(regionManager, (Player) sender, true);
} else { // Get region from the ID
existing = findExistingRegion(regionManager, args.getString(0), true);
}
@ -783,7 +810,7 @@ public void flag(CommandContext args, CommandSender sender) throws CommandExcept
// Lookup the existing region
RegionManager regionManager = plugin.getGlobalRegionManager().get(world);
ProtectedRegion existing = findExistingRegion(regionManager,
args.getString(0), false);
args.getString(0), true);
// Check permissions
if (!permModel.maySetFlag(existing)) {
@ -801,7 +828,7 @@ public void flag(CommandContext args, CommandSender sender) throws CommandExcept
for (Flag<?> flag : DefaultFlag.getFlags()) {
// Can the user set this flag?
if (!permModel.maySetFlag(existing, flag)) {
throw new CommandPermissionsException();
continue;
}
if (list.length() > 0) {