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

Added a -s flag to /region teleport, which sends you to the spawn point instead of the teleport point of a region.

Browse Source
This commit is contained in:
TomyLobo 2012-03-12 10:40:03 +01:00
parent b01b2cce9b
commit 88d79a42e6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1055,7 +1055,7 @@ public void migratedb(CommandContext args, CommandSender sender) throws CommandE
"If you wish to use the destination format as your new backend, please update your config and reload WorldGuard."); "If you wish to use the destination format as your new backend, please update your config and reload WorldGuard.");
} }
@Command(aliases = {"teleport", "tp"}, usage = "<id>", @Command(aliases = {"teleport", "tp"}, usage = "<id>", flags = "s",
desc = "Teleports you to the location associated with the region.", min = 1, max = 1) desc = "Teleports you to the location associated with the region.", min = 1, max = 1)
@CommandPermissions({"worldguard.region.teleport"}) @CommandPermissions({"worldguard.region.teleport"})
public void teleport(CommandContext args, CommandSender sender) throws CommandException { public void teleport(CommandContext args, CommandSender sender) throws CommandException {
@ -1081,9 +1081,17 @@ public void teleport(CommandContext args, CommandSender sender) throws CommandEx
plugin.checkPermission(sender, "worldguard.region.teleport." + id.toLowerCase()); plugin.checkPermission(sender, "worldguard.region.teleport." + id.toLowerCase());
} }
final Location teleportLocation = region.getFlag(DefaultFlag.TELE_LOC); final Location teleportLocation;
if (teleportLocation == null) { if (args.hasFlag('s')) {
throw new CommandException("The region has no teleport point associated."); teleportLocation = region.getFlag(DefaultFlag.SPAWN_LOC);
if (teleportLocation == null) {
throw new CommandException("The region has no spawn point associated.");
}
} else {
teleportLocation = region.getFlag(DefaultFlag.TELE_LOC);
if (teleportLocation == null) {
throw new CommandException("The region has no teleport point associated.");
}
} }
player.teleport(BukkitUtil.toLocation(teleportLocation)); player.teleport(BukkitUtil.toLocation(teleportLocation));