Merge fix

Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java

@@ -30,13 +30,11 @@ public class SimulatedPlayer extends ComputerPlayer {
     private static final Logger logger = Logger.getLogger(SimulatedPlayer.class);
     private boolean isSimulatedPlayer;
     private transient ConcurrentLinkedQueue<Ability> allActions;
-    private static PassAbility pass = new PassAbility();
     protected int maxDepth;
 
     public SimulatedPlayer(Player originalPlayer, boolean isSimulatedPlayer, int maxDepth) {
         super(originalPlayer.getId());
         this.maxDepth = maxDepth;
-        pass.setControllerId(playerId);
         this.isSimulatedPlayer = isSimulatedPlayer;
         this.matchPlayer = new MatchPlayer(originalPlayer.getMatchPlayer(), this);
     }
@@ -55,6 +53,7 @@ public List<Ability> simulatePriority(Game game) {
         allActions = new ConcurrentLinkedQueue<>();
         Game sim = game.copy();
 
+        ActivatedAbility pass = new PassAbility();
         simulateOptions(sim, pass);
 
         List<Ability> list = new ArrayList<>(allActions);