SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mismatch between teams and player teams.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-01-17 19:59:16 +11:00
parent 043b6a7eb4
commit 06a42b5a28
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
View File

@@ -105,13 +105,14 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
public Team getPlayerTeam(OfflinePlayer player) throws IllegalArgumentException { public Team getPlayerTeam(OfflinePlayer player) throws IllegalArgumentException {
Validate.notNull(player, "OfflinePlayer cannot be null"); Validate.notNull(player, "OfflinePlayer cannot be null");
return getTeam(player.getName()); ScoreboardTeam team = board.getPlayerTeam(player.getName());
return team == null ? null : new CraftTeam(this, team);
} }
public Team getTeam(String teamName) throws IllegalArgumentException { public Team getTeam(String teamName) throws IllegalArgumentException {
Validate.notNull(teamName, "Team name cannot be null"); Validate.notNull(teamName, "Team name cannot be null");
ScoreboardTeam team = board.getPlayerTeam(teamName); ScoreboardTeam team = board.getTeam(teamName);
return team == null ? null : new CraftTeam(this, team); return team == null ? null : new CraftTeam(this, team);
} }