mirror of
https://github.com/correl/mage.git
synced 2024-11-14 19:19:32 +00:00
Merge fix
This commit is contained in:
parent
1cbbcddcc6
commit
8a06be7e28
3 changed files with 2 additions and 4 deletions
|
@ -11,7 +11,7 @@ import mage.constants.CardType;
|
|||
import mage.constants.Duration;
|
||||
import mage.constants.Outcome;
|
||||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.predicate.card.OwnerIdPredicate;
|
||||
import mage.filter.predicate.permanent.ControllerIdPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.game.turn.TurnMod;
|
||||
|
|
|
@ -128,7 +128,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps {
|
|||
}
|
||||
|
||||
@Test
|
||||
@Ignore // TODO: fix after merge, see player.isComputer
|
||||
public void test_TyrantsChoice_AI_UnderControl() {
|
||||
addCard(Zone.HAND, playerA, tyrant); // {1}{B}
|
||||
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
|
||||
|
|
|
@ -55,8 +55,7 @@ public abstract class VoteHandler<T> {
|
|||
String stepName = (i > 0 ? "extra step" : "step");
|
||||
String voteInfo = String.format("Vote, %s %d of %d", stepName, stepCurrent, stepTotal);
|
||||
T vote;
|
||||
if (!decidingPlayer.isHuman() && !decidingPlayer.isTestMode() && this.aiVoteHint != null) {
|
||||
// TODO: add isComputer after PR
|
||||
if (decidingPlayer.isComputer() && this.aiVoteHint != null) {
|
||||
// ai choose
|
||||
vote = this.aiVoteHint.makeChoice(this, player, decidingPlayer, source, game);
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue