From c8a48daed8695120c1da1c6435dc3f4d36fb30b1 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 25 Oct 2014 09:21:56 +0200
Subject: [PATCH] Fixed player names text building for tournament match info.

---
 Mage/src/mage/game/match/MatchImpl.java       | 37 +++----------------
 .../mage/game/tournament/TournamentImpl.java  |  1 -
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/Mage/src/mage/game/match/MatchImpl.java b/Mage/src/mage/game/match/MatchImpl.java
index 96444d9a34f..47bb63bc0df 100644
--- a/Mage/src/mage/game/match/MatchImpl.java
+++ b/Mage/src/mage/game/match/MatchImpl.java
@@ -277,37 +277,12 @@ public abstract class MatchImpl implements Match {
         StringBuilder playersInfo = new StringBuilder();
         int counter = 0;
 
-        Player currentPlayer = null;
-        PlayerList playerList =  game.getPlayerList();
-        if (game.getStartingPlayerId() != null) {
-            playerList.setCurrent(game.getStartingPlayerId());
-            currentPlayer = game.getPlayer(game.getStartingPlayerId());
-        }
-        if (currentPlayer == null) {
-            currentPlayer = playerList.getCurrent(game);
-        }
-        if (currentPlayer != null) {
-            do {
-                if (counter > 0) {
-                    playersInfo.append(" - ");
-                }
-                playersInfo.append(currentPlayer.getName());
-                counter++;
-                currentPlayer = game.getPlayer(playerList.getNext());
-                if (counter > 10) {
-                    logger.error("Can't get no correct player info from game");
-                    logger.debug("- matchId: " + this.getId());
-                    logger.debug("- gameId: " + game.getId());
-                    StringBuilder sb = new StringBuilder();
-                    for (MatchPlayer matchPlayer:this.getPlayers()) {
-                        sb.append(matchPlayer.getName()).append(" - " );
-                    }
-                    logger.debug("- players: " + sb.toString());
-                    break;
-                }
-            } while(!currentPlayer.getId().equals(game.getStartingPlayerId()));
-        } else {
-            playersInfo.append("[got no players]");
+        for (MatchPlayer matchPlayer: getPlayers()) {
+            if (counter > 0) {
+                playersInfo.append(" - ");
+            }
+            playersInfo.append(matchPlayer.getName());
+            counter++;
         }
 
         String state;
diff --git a/Mage/src/mage/game/tournament/TournamentImpl.java b/Mage/src/mage/game/tournament/TournamentImpl.java
index 9650bfe57df..e83ff7c481d 100644
--- a/Mage/src/mage/game/tournament/TournamentImpl.java
+++ b/Mage/src/mage/game/tournament/TournamentImpl.java
@@ -37,7 +37,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
-import mage.cards.Card;
 import mage.cards.ExpansionSet;
 import mage.cards.decks.Deck;
 import mage.constants.TournamentPlayerState;