From 4bb22e0138816b8f15712c32cf4f514889854a83 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Tue, 22 Feb 2011 21:38:17 -0500 Subject: [PATCH] fixed problem with consecutive games in a match --- Mage/src/mage/game/GameImpl.java | 5 ++++- Mage/src/mage/players/PlayerImpl.java | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 5833e957d9..e02ccec4ed 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -325,6 +325,9 @@ public abstract class GameImpl> implements Game, Serializa for (Player player: state.getPlayers().values()) { player.init(this, testMode); } + for (Player player: state.getPlayers().values()) { + player.beginTurn(this); + } fireInformEvent("game has started"); saveState(); @@ -344,7 +347,7 @@ public abstract class GameImpl> implements Game, Serializa else { choosingPlayer = this.getPlayer(choosingPlayerId); } - if (choosingPlayer.chooseTarget(Outcome.Benefit, targetPlayer, null, this)) { + if (choosingPlayer.choose(Outcome.Benefit, targetPlayer, this)) { startingPlayerId = ((List)targetPlayer.getTargets()).get(0); fireInformEvent(state.getPlayer(startingPlayerId).getName() + " will start"); } diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index f1b12a0adb..2138df47df 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -168,7 +168,6 @@ public abstract class PlayerImpl> implements Player, Ser this.left = false; this.passed = false; this.passedTurn = false; - findRange(game); } @Override