Timestamp checks (#7)

Author: tool4ever

forge-ai/src/main/java/forge/ai/ability/UntapAi.java

@@ -319,15 +319,14 @@ private boolean untapTargetList(final Card source, final TargetRestrictions tgt,
 
     @Override
     public Card chooseSingleCard(Player ai, SpellAbility sa, Iterable<Card> list, boolean isOptional, Player targetedPlayer, Map<String, Object> params) {
-        CardCollection pref = CardLists.filterControlledBy(list, ai.getYourTeam());
-        if (pref.isEmpty()) {
-            if (isOptional) {
-                return null;
-            }
-        } else {
-            list = pref;
+        CardCollection filteredList = CardLists.filterControlledBy(list, ai.getYourTeam());
+        if (!filteredList.isEmpty()) {
+            return ComputerUtilCard.getBestAI(filteredList);
+        }
+        if (isOptional) {
+            return null;
         }
-        return ComputerUtilCard.getBestAI(list);
+        return ComputerUtilCard.getWorstAI(list);
     }
 
     private static Card detectPriorityUntapTargets(final List<Card> untapList) {

forge-game/src/main/java/forge/game/GameAction.java

@@ -18,6 +18,7 @@
 package forge.game;
 
 import com.google.common.collect.*;
+
 import forge.GameCommand;
 import forge.StaticData;
 import forge.card.CardStateName;
@@ -481,6 +482,7 @@ private Card changeZone(final Zone zoneFrom, Zone zoneTo, final Card c, Integer
             }
 
             if (zoneFrom.is(ZoneType.Stack) && toBattlefield) {
+
                 // 400.7a Effects from static abilities that give a permanent spell on the stack an ability
                 // that allows it to be cast for an alternative cost continue to apply to the permanent that spell becomes.
                 if (c.getCastSA() != null && !c.getCastSA().isIntrinsic() && c.getCastSA().getKeyword() != null) {
@@ -1544,6 +1546,7 @@ private boolean stateBasedAction_Role(Card c, CardCollection removeList) {
             if (rolesByPlayer.size() <= 1) {
                 continue;
             }
+
             rolesByPlayer.sort(CardPredicates.compareByGameTimestamp());
             removeList.addAll(rolesByPlayer.subList(0, rolesByPlayer.size() - 1));
             checkAgain = true;

forge-game/src/main/java/forge/game/GameActionUtil.java

@@ -725,6 +725,7 @@ public static SpellAbility addExtraKeywordCost(final SpellAbility sa) {
     public static Card createETBCountersEffect(Card sourceCard, Card c, Player controller, String counter, String amount) {
         final Game game = sourceCard.getGame();
         final Card eff = new Card(game.nextCardId(), game);
+
         eff.setGameTimestamp(game.getNextTimestamp());
         eff.setName(sourceCard + "'s Effect");
         eff.setOwner(controller);

forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java

@@ -29,6 +29,9 @@ protected String getStackDescription(SpellAbility sa) {
     @Override
     public void resolve(SpellAbility sa) {
         final Game game = sa.getActivatingPlayer().getGame();
+        if (game.getCombat() == null) {
+            return;
+        }
         List<Card> blocked = Lists.newArrayList();
         for (final Card c : getTargetCards(sa)) {
             game.getCombat().setBlocked(c, true);

forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java

@@ -537,7 +537,6 @@ private void changeKnownOriginResolve(final SpellAbility sa) {
             if (gameCard == null || !tgtC.equalsWithGameTimestamp(gameCard) || gameCard.isPhasedOut()) {
                 continue;
             }
-
             if (sa.hasParam("RememberLKI")) {
                 hostCard.addRemembered(CardCopyService.getLKICopy(gameCard));
             }

forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java

@@ -19,6 +19,7 @@
 import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
@@ -60,7 +61,7 @@ public void resolve(SpellAbility sa) {
         final Game game = activator.getGame();
         CardCollection allChosen = new CardCollection();
 
-        final List<Player> tgtPlayers = getDefinedPlayersOrTargeted(sa);
+        final PlayerCollection tgtPlayers = getDefinedPlayersOrTargeted(sa);
 
         List<ZoneType> choiceZone = Lists.newArrayList(ZoneType.Battlefield);
         if (sa.hasParam("ChoiceZone")) {
@@ -71,7 +72,7 @@ public void resolve(SpellAbility sa) {
             choices = CardLists.getValidCards(choices, sa.getParam("Choices"), activator, host, sa);
         }
         if (sa.hasParam("TargetControls")) {
-            choices = CardLists.filterControlledBy(choices, tgtPlayers.get(0));
+            choices = CardLists.filterControlledBy(choices, tgtPlayers);
         }
         if (sa.hasParam("DefinedCards")) {
             choices = AbilityUtils.getDefinedCards(host, sa.getParam("DefinedCards"), sa);

forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java

@@ -47,6 +47,7 @@ public void resolve(SpellAbility sa) {
             }
         }
 
+
         for (Player p : getTargetPlayers(sa)) {
             if (!p.isInGame()) {
                 p = getNewChooser(sa, sa.getActivatingPlayer(), p);

forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java

@@ -20,7 +20,7 @@ protected String getStackDescription(SpellAbility sa) {
 
         sb.append(Lang.joinHomogenous(getTargetPlayers(sa)));
 
-        sb.append("chooses a player.");
+        sb.append(" chooses a player.");
 
         return sb.toString();
     }

forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java

@@ -1,6 +1,5 @@
 package forge.game.ability.effects;
 
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -152,7 +151,7 @@ public void resolve(SpellAbility sa) {
                 }
             }
         } else {
-            throw new InvalidParameterException(sa.getHostCard() + "'s ability resulted in no types to choose from");
+            throw new RuntimeException(sa.getHostCard() + "'s ability resulted in no types to choose from");
         }
     }
 

forge-game/src/main/java/forge/game/ability/effects/ConniveEffect.java

@@ -51,6 +51,7 @@ public void resolve(SpellAbility sa) {
             return;
         }
 
+
         List<Player> controllers = new ArrayList<>();
         for (Card c : toConnive) {
             final Player controller = c.getController();