From a02fe633e2fd933f6d6a63b9cb9f202e7e75bdbd Mon Sep 17 00:00:00 2001 From: Redecouverte Date: Sat, 26 Feb 2011 12:49:14 +0100 Subject: [PATCH] fixed spawn/teleport flags --- plugin.yml | 20 ++++++++++++++++++- .../bukkit/WorldGuardPlayerListener.java | 2 +- .../bukkit/commands/CommandHandler.java | 3 +-- .../bukkit/commands/CommandRegionInfo.java | 7 ++++++- .../bukkit/commands/CommandTpRegion.java | 4 ++-- .../worldguard/bukkit/commands/FlagInfo.java | 2 -- .../bukkit/commands/RegionCommandHandler.java | 11 +++------- 7 files changed, 32 insertions(+), 17 deletions(-) diff --git a/plugin.yml b/plugin.yml index 9aa02bc7..0e176b4f 100644 --- a/plugin.yml +++ b/plugin.yml @@ -24,7 +24,25 @@ commands: region: description: Adjust protected regions usage: / ... - aliases: rg, regions, rd, rc, rsp, rf, rdel, ri, rao, rro, rl, rp + aliases: [rg, regions] + rd: + description: Alias for /region define + usage: same as /region define + rc: + description: Alias for /region claim + usage: same as /region claim + rf: + description: Alias for /region flag + usage: same as /region flag + ri: + description: Alias for /region info + usage: same as /region info + rlist: + description: Alias for /region list + usage: same as /region list + rp: + description: Alias for /region priority + usage: same as /region priority locate: description: Set your compass towards a person usage: / diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index 12976309..d64d4836 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -258,7 +258,7 @@ public void onPlayerRespawn(PlayerRespawnEvent event) { Location spawn = regions.getLocationAreaFlag("spawn", player.getServer(), true, null); if (spawn != null) { - String spawnconfig = regions.getAreaFlag("spawn", "settings", true, null); + String spawnconfig = regions.getAreaFlag("spawn", "allow", true, null); if (spawnconfig != null) { BukkitPlayer localPlayer = BukkitPlayer.wrapPlayer(cfg, player); if (spawnconfig.equals("owner")) { diff --git a/src/com/sk89q/worldguard/bukkit/commands/CommandHandler.java b/src/com/sk89q/worldguard/bukkit/commands/CommandHandler.java index 25842edc..6d4ee6da 100644 --- a/src/com/sk89q/worldguard/bukkit/commands/CommandHandler.java +++ b/src/com/sk89q/worldguard/bukkit/commands/CommandHandler.java @@ -55,7 +55,7 @@ public CommandHandler(WorldGuardPlugin wg) this.commandMap.put("rc", regionHandler); this.commandMap.put("rf", regionHandler); this.commandMap.put("ri", regionHandler); - this.commandMap.put("rl", regionHandler); + this.commandMap.put("rlist", regionHandler); this.commandMap.put("rp", regionHandler); this.commandMap.put("reloadwg", new CommandReloadWG()); this.commandMap.put("slay", new CommandSlay()); @@ -72,7 +72,6 @@ public CommandHandler(WorldGuardPlugin wg) public boolean handleCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { try { - String cmdName = cmd.getName().toLowerCase(); WgCommand wgcmd = commandMap.get(cmdName); if (wgcmd == null) { diff --git a/src/com/sk89q/worldguard/bukkit/commands/CommandRegionInfo.java b/src/com/sk89q/worldguard/bukkit/commands/CommandRegionInfo.java index 5d992fc9..293910b2 100644 --- a/src/com/sk89q/worldguard/bukkit/commands/CommandRegionInfo.java +++ b/src/com/sk89q/worldguard/bukkit/commands/CommandRegionInfo.java @@ -27,6 +27,8 @@ import com.sk89q.worldguard.protection.regionmanager.RegionManager; import com.sk89q.worldguard.protection.regions.AreaFlags; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -75,6 +77,8 @@ public boolean handle(CommandSender sender, String senderName, String command, S sender.sendMessage(ChatColor.BLUE + "Priority: " + region.getPriority()); StringBuilder s = new StringBuilder(); + List displayLocations = new ArrayList(); + for (FlagInfo nfo : FlagInfo.getFlagInfoList()) { if (s.length() > 0) { s.append(", "); @@ -86,13 +90,14 @@ public boolean handle(CommandSender sender, String senderName, String command, S } String value; - if (nfo.type == FlagValueType.LOCATION) { + if (nfo.type == FlagValueType.LOCATION && !displayLocations.contains(nfo.flagName)) { value = flags.getFlag(nfo.flagName, "x"); if (value != null) { s.append(fullName + ": set"); } else { s.append(fullName + ": -"); } + displayLocations.add(nfo.flagName); } else if ((nfo.subName != null && nfo.subName.equals("*"))) { StringBuilder ret = new StringBuilder(); for (Map.Entry entry : flags.getFlagData(nfo.flagName).entrySet()) { diff --git a/src/com/sk89q/worldguard/bukkit/commands/CommandTpRegion.java b/src/com/sk89q/worldguard/bukkit/commands/CommandTpRegion.java index 2efa5c07..b4b30ca9 100644 --- a/src/com/sk89q/worldguard/bukkit/commands/CommandTpRegion.java +++ b/src/com/sk89q/worldguard/bukkit/commands/CommandTpRegion.java @@ -44,9 +44,9 @@ public boolean handle(CommandSender sender, String senderName, String command, S String flagright = "all"; if (spawn) { - flagright = region.getFlags().getFlag("spawn", "settings"); + flagright = region.getFlags().getFlag("spawn", "allow"); } else { - flagright = region.getFlags().getFlag("teleport", "settings"); + flagright = region.getFlags().getFlag("teleport", "allow"); } LocalPlayer lPlayer = BukkitPlayer.wrapPlayer(cfg, player); diff --git a/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java b/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java index 5769ce97..a9690726 100644 --- a/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java +++ b/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java @@ -61,11 +61,9 @@ public static enum FlagValueType { STRING, BOOLEAN, INT, FLOAT, DOUBLE, STATE, L flagList.add(new FlagInfo("spawn", "set", FlagValueType.LOCATION, "spawn", "")); flagList.add(new FlagInfo("spawn", "delete", FlagValueType.LOCATION, "spawn", "")); flagList.add(new FlagInfo("spawn", "allow", FlagValueType.STRING, "spawn", "allow")); - flagList.add(new FlagInfo("spawn", "deny", FlagValueType.STRING, "spawn", "deny")); flagList.add(new FlagInfo("teleport", "set", FlagValueType.LOCATION, "teleport", "")); flagList.add(new FlagInfo("teleport", "delete", FlagValueType.LOCATION, "teleport", "")); flagList.add(new FlagInfo("teleport", "allow", FlagValueType.STRING, "teleport", "allow")); - flagList.add(new FlagInfo("teleport", "deny", FlagValueType.STRING, "teleport", "deny")); } public static FlagInfo getFlagInfo(String name, String subName) { diff --git a/src/com/sk89q/worldguard/bukkit/commands/RegionCommandHandler.java b/src/com/sk89q/worldguard/bukkit/commands/RegionCommandHandler.java index 608859f0..8c88b7d0 100644 --- a/src/com/sk89q/worldguard/bukkit/commands/RegionCommandHandler.java +++ b/src/com/sk89q/worldguard/bukkit/commands/RegionCommandHandler.java @@ -67,7 +67,7 @@ public RegionCommandHandler() { this.aliasMap.put("rc", "claim"); this.aliasMap.put("rf", "flag"); this.aliasMap.put("ri", "info"); - this.aliasMap.put("rl", "list"); + this.aliasMap.put("rlist", "list"); this.aliasMap.put("rp", "priority"); } @@ -104,6 +104,8 @@ public boolean handle(CommandSender sender, String senderName, String command, S } } + System.out.println(subCommand); + Server server = cfg.getWorldGuardPlugin().getServer(); if (server.getWorld(worldName) == null) { sender.sendMessage("Invalid world specified."); @@ -135,11 +137,4 @@ public boolean handle(CommandSender sender, String senderName, String command, S return true; } - private String getCommandFromAlias(String alias) { - if (alias.equals("rf")) { - return "flag"; - } - - return ""; - } }