Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-30 07:37:31 +02:00
Code Issues Projects Releases Wiki Activity

Made /region info show the region you're in if you don't specify an id explicitly.

Browse Source
This commit is contained in:
TomyLobo 2012-03-11 16:07:13 +01:00
parent c9fdff169f
commit 83f943965f
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@
import com.sk89q.worldedit.bukkit.selections.Polygonal2DSelection; import com.sk89q.worldedit.bukkit.selections.Polygonal2DSelection;
import com.sk89q.worldedit.bukkit.selections.Selection; import com.sk89q.worldedit.bukkit.selections.Selection;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.bukkit.BukkitUtil;
import com.sk89q.worldguard.bukkit.WorldConfiguration; import com.sk89q.worldguard.bukkit.WorldConfiguration;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.domains.DefaultDomain; import com.sk89q.worldguard.domains.DefaultDomain;
@ -383,28 +384,49 @@ public void select(CommandContext args, CommandSender sender) throws CommandExce
} }
} }
@Command(aliases = {"info", "i"}, usage = "[world] <id>", @Command(aliases = {"info", "i"}, usage = "[world] [id]",
desc = "Get information about a region", min = 1, max = 2) desc = "Get information about a region", min = 0, max = 2)
public void info(CommandContext args, CommandSender sender) throws CommandException { public void info(CommandContext args, CommandSender sender) throws CommandException {
Player player = null; final Player player;
LocalPlayer localPlayer = null; final LocalPlayer localPlayer;
World world; final World world;
String id; final String id;
// Get different values based on provided arguments // Get different values based on provided arguments
if (args.argsLength() == 1) { switch (args.argsLength()) {
case 0:
player = plugin.checkPlayer(sender);
localPlayer = plugin.wrapPlayer(player);
world = player.getWorld();
Vector pt = BukkitUtil.toVector(player.getLocation());
RegionManager mgr = plugin.getGlobalRegionManager().get(world);
ApplicableRegionSet set = mgr.getApplicableRegions(pt);
if (set.size() == 0) {
throw new CommandException("No region ID specified and no region found at current location!");
}
id = set.iterator().next().getId();
break;
case 1:
player = plugin.checkPlayer(sender); player = plugin.checkPlayer(sender);
localPlayer = plugin.wrapPlayer(player); localPlayer = plugin.wrapPlayer(player);
world = player.getWorld(); world = player.getWorld();
id = args.getString(0).toLowerCase(); id = args.getString(0).toLowerCase();
} else { break;
default:
player = null;
localPlayer = null;
world = plugin.matchWorld(sender, args.getString(0)); world = plugin.matchWorld(sender, args.getString(0));
id = args.getString(1).toLowerCase(); id = args.getString(1).toLowerCase();
break;
} }
RegionManager mgr = plugin.getGlobalRegionManager().get(world); RegionManager mgr = plugin.getGlobalRegionManager().get(world);
if (!mgr.hasRegion(id)) { if (!mgr.hasRegion(id)) {
if (!ProtectedRegion.isValidId(id)) { if (!ProtectedRegion.isValidId(id)) {
throw new CommandException("Invalid region ID specified!"); throw new CommandException("Invalid region ID specified!");