Skip to content

Commit

Permalink
Fixed: cannot remove a team with offline players in it (#68).
Browse files Browse the repository at this point in the history
  • Loading branch information
AmauryCarrade committed Jan 4, 2015
1 parent 34888d1 commit 16337c7
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/main/java/me/azenet/UHPlugin/UHTeam.java
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,8 @@ public void removePlayer(OfflinePlayer player, boolean silent) {
* @param player
*/
private void unregisterPlayer(OfflinePlayer player) {
if(player == null) return;

plugin.getScoreboardManager().getScoreboard().getTeam(this.internalName).removePlayer(player);
plugin.getTeamManager().colorizePlayer(player);
}
Expand All @@ -283,9 +285,12 @@ private void unregisterPlayer(OfflinePlayer player) {
public void deleteTeam() {
// We removes the players from the team (scoreboard team too)
for(UUID id : players) {
Player player = plugin.getServer().getPlayer(id);
OfflinePlayer player = plugin.getServer().getOfflinePlayer(id);

if(player != null && player.isOnline()) {
((Player) player).sendMessage(plugin.getI18n().t("team.removeplayer.removed", getDisplayName()));
}

player.sendMessage(plugin.getI18n().t("team.removeplayer.removed", getDisplayName()));
unregisterPlayer(player);
}

Expand Down

0 comments on commit 16337c7

Please sign in to comment.