Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider arguments to team leave properly. Fixes BUKKIT-3994

Browse Source 
Two checks to argument length were changed to properly consider if the
sender is a player instead of an off-by-one logical error.
This commit is contained in:
Wesley Wolfe 2013-04-05 12:49:59 -05:00
parent e555c4d77e
commit 9f29723444
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java
View File

@ -385,13 +385,13 @@ public class ScoreboardCommand extends VanillaCommand {
sender.sendMessage("Added " + addedPlayers.size() + " player(s) to team " + team.getName() + ": " + stringCollectionToString(addedPlayers)); sender.sendMessage("Added " + addedPlayers.size() + " player(s) to team " + team.getName() + ": " + stringCollectionToString(addedPlayers));
} }
} else if (args[1].equalsIgnoreCase("leave")) { } 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...]"); sender.sendMessage(ChatColor.RED + "/scoreboard teams leave [player...]");
return false; return false;
} }
Set<String> left = new HashSet<String>(); Set<String> left = new HashSet<String>();
Set<String> noTeam = 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); Team team = mainScoreboard.getPlayerTeam((Player) sender);
if (team != null) { if (team != null) {
team.removePlayer((Player) sender); team.removePlayer((Player) sender);