From 8a06be7e286ad6c26055235354c4181743889ea2 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Sat, 20 Mar 2021 18:40:22 +0400
Subject: [PATCH] Merge fix

---
 Mage.Sets/src/mage/cards/e/Expropriate.java                    | 2 +-
 .../src/test/java/org/mage/test/multiplayer/VotingTest.java    | 1 -
 Mage/src/main/java/mage/choices/VoteHandler.java               | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/e/Expropriate.java b/Mage.Sets/src/mage/cards/e/Expropriate.java
index ce5f4c9512..ef0bd37281 100644
--- a/Mage.Sets/src/mage/cards/e/Expropriate.java
+++ b/Mage.Sets/src/mage/cards/e/Expropriate.java
@@ -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;
diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java
index 8fba33ceb0..15f7820207 100644
--- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java
@@ -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);
diff --git a/Mage/src/main/java/mage/choices/VoteHandler.java b/Mage/src/main/java/mage/choices/VoteHandler.java
index 76126510ec..ba561d770f 100644
--- a/Mage/src/main/java/mage/choices/VoteHandler.java
+++ b/Mage/src/main/java/mage/choices/VoteHandler.java
@@ -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 {