github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-14 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge fix

Browse source
This commit is contained in:
Oleg Agafonov 2021-03-20 18:40:22 +04:00
parent 1cbbcddcc6
commit 8a06be7e28
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/e/Expropriate.java
View file

@ -11,7 +11,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.game.turn.TurnMod; import mage.game.turn.TurnMod;

1
Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java
View file

@ -128,7 +128,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps {
} }
@Test @Test
@Ignore // TODO: fix after merge, see player.isComputer
public void test_TyrantsChoice_AI_UnderControl() { public void test_TyrantsChoice_AI_UnderControl() {
addCard(Zone.HAND, playerA, tyrant); // {1}{B} addCard(Zone.HAND, playerA, tyrant); // {1}{B}
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);

3
Mage/src/main/java/mage/choices/VoteHandler.java
View file

@ -55,8 +55,7 @@ public abstract class VoteHandler<T> {
String stepName = (i > 0 ? "extra step" : "step"); String stepName = (i > 0 ? "extra step" : "step");
String voteInfo = String.format("Vote, %s %d of %d", stepName, stepCurrent, stepTotal); String voteInfo = String.format("Vote, %s %d of %d", stepName, stepCurrent, stepTotal);
T vote; T vote;
if (!decidingPlayer.isHuman() && !decidingPlayer.isTestMode() && this.aiVoteHint != null) { if (decidingPlayer.isComputer() && this.aiVoteHint != null) {
// TODO: add isComputer after PR
// ai choose // ai choose
vote = this.aiVoteHint.makeChoice(this, player, decidingPlayer, source, game); vote = this.aiVoteHint.makeChoice(this, player, decidingPlayer, source, game);
} else { } else {