diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/mage/remote/SessionImpl.java index c7d29158c08..0f9d2b796ed 100644 --- a/Mage.Common/src/mage/remote/SessionImpl.java +++ b/Mage.Common/src/mage/remote/SessionImpl.java @@ -34,7 +34,6 @@ import java.net.MalformedURLException; import java.net.PasswordAuthentication; import java.net.SocketException; import java.net.SocketTimeoutException; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; @@ -43,7 +42,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.swing.SwingUtilities; import mage.MageException; import mage.cards.decks.DeckCardLists; import mage.cards.decks.InvalidDeckException; diff --git a/Mage/src/mage/game/match/MatchImpl.java b/Mage/src/mage/game/match/MatchImpl.java index 72eb0ebddd3..abe81cd6708 100644 --- a/Mage/src/mage/game/match/MatchImpl.java +++ b/Mage/src/mage/game/match/MatchImpl.java @@ -277,9 +277,15 @@ public abstract class MatchImpl implements Match { StringBuilder playersInfo = new StringBuilder(); int counter = 0; + Player currentPlayer = null; PlayerList playerList = game.getPlayerList(); - playerList.setCurrent(game.getStartingPlayerId()); - Player currentPlayer = game.getPlayer(game.getStartingPlayerId()); + if (game.getStartingPlayerId() != null) { + playerList.setCurrent(game.getStartingPlayerId()); + currentPlayer = game.getPlayer(game.getStartingPlayerId()); + } + if (currentPlayer == null) { + currentPlayer = playerList.getCurrent(game); + } do { if (counter > 0) { playersInfo.append(" - "); diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt index 7217b0ef810..a0387056286 100644 --- a/Utils/release/getting_implemented_cards.txt +++ b/Utils/release/getting_implemented_cards.txt @@ -51,13 +51,14 @@ since 1.3.0-2014-08-19 git log edd1563c12422f69c10bc76d310e0a84421ab4a2..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt since 1.3.0-2014-08-30 git log fbc2a7258face1e908f3f08da1c2fec4ec0f86fe..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt - since 1.3.0-2014-09-13 git log 632f711fe237defe43111f9b7236fda1da74bfc0..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt - since 1.3.0-2014-09-26 git log b76102b0cdb911c7217fc2f510b4de86651f91d2..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +since 1.3.0-2014-10-05 +git log 8121849a185b913ef2de59fff2f3d9a6c9b3a613..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt + 3. Copy added_cards.txt to trunk\Utils folder 4. Run script: