summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2013-04-05 12:49:59 -0500
committerWesley Wolfe <weswolf@aol.com>2013-04-05 12:49:59 -0500
commit9f297234448931d5b9e028e9b4efc1091871db29 (patch)
tree4150bf6c0076282cae324be1cf3e947009686836 /src/main/java/org
parente555c4d77ed60cdd23079a35dd4a158f9afcdeca (diff)
downloadbukkit-9f297234448931d5b9e028e9b4efc1091871db29.tar
bukkit-9f297234448931d5b9e028e9b4efc1091871db29.tar.gz
bukkit-9f297234448931d5b9e028e9b4efc1091871db29.tar.lz
bukkit-9f297234448931d5b9e028e9b4efc1091871db29.tar.xz
bukkit-9f297234448931d5b9e028e9b4efc1091871db29.zip
Consider arguments to team leave properly. Fixes BUKKIT-3994
Two checks to argument length were changed to properly consider if the sender is a player instead of an off-by-one logical error.
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java b/src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java
index 64816b62..0b2755a2 100644
--- a/src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java
@@ -385,13 +385,13 @@ public class ScoreboardCommand extends VanillaCommand {
sender.sendMessage("Added " + addedPlayers.size() + " player(s) to team " + team.getName() + ": " + stringCollectionToString(addedPlayers));
}
} else if (args[1].equalsIgnoreCase("leave")) {
- if ((sender instanceof Player) ? args.length < 2 : args.length < 3) {
+ if (!(sender instanceof Player) && args.length < 3) {
sender.sendMessage(ChatColor.RED + "/scoreboard teams leave [player...]");
return false;
}
Set<String> left = new HashSet<String>();
Set<String> noTeam = new HashSet<String>();
- if ((sender instanceof Player) && args.length == 3) {
+ if ((sender instanceof Player) && args.length == 2) {
Team team = mainScoreboard.getPlayerTeam((Player) sender);
if (team != null) {
team.removePlayer((Player) sender);