Clean up

Author: tool4EvEr

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

@@ -738,14 +738,24 @@ private void handleStaticEffect(Card copied, SpellAbility cause) {
                 }
             }
 
-            Integer timestamp = cause.getSVarInt("StaticEffectTimestamp");
-            String name = "Static Effect #" + timestamp;
+            Long timestamp;
+            // check if player ordered it manually
+            if (cause.hasSVar("StaticEffectTimestamp"))  {
+                timestamp = Long.parseLong(cause.getSVar("StaticEffectTimestamp"));
+            } else {
+                // else create default value (or realign)
+                timestamp = game.getNextTimestamp();
+                cause.setSVar("StaticEffectTimestamp", String.valueOf(timestamp));
+            }
+            String name = "Static Effect #" + source.getGameTimestamp();
             // check if this isn't the first card being moved
             Optional<Card> opt = IterableUtil.tryFind(cause.getActivatingPlayer().getZone(ZoneType.Command).getCards(), CardPredicates.nameEquals(name));
 
             Card eff;
             if (opt.isPresent()) {
                 eff = opt.get();
+                // update in case player manually ordered
+                eff.setLayerTimestamp(timestamp);
             } else {
                 // otherwise create effect first
                 eff = SpellAbilityEffect.createEffect(cause, cause.getActivatingPlayer(), name, source.getImageKey(), timestamp);

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

@@ -857,10 +857,9 @@ public static CardCollectionView orderCardsByTheirOwners(Game game, CardCollecti
                     subList.add(c);
                 }
             }
-            if (sa.getActivatingPlayer() == p && sa.hasParam("StaticEffect")) {
-                String name = "Static Effect of " + sa.getHostCard();
+            if (sa != null && sa.getActivatingPlayer() == p && sa.hasParam("StaticEffect")) {
                 // create helper card for ordering
-                eff = new DetachedCardEffect(sa.getHostCard(), name);
+                eff = new DetachedCardEffect(sa.getHostCard(), "Static Effect of " + sa.getHostCard());
                 subList.add(eff);
             }
             CardCollectionView subListView = subList;
@@ -874,8 +873,8 @@ public static CardCollectionView orderCardsByTheirOwners(Game game, CardCollecti
             // add generous buffer to timestamp, to ensure it applies last compared to cards that were ordered to ETB before it
             sa.setSVar("StaticEffectTimestamp", String.valueOf(game.getTimestamp() + idx + 100));
             // effects with this param have the responsibility to realign it when later cards are reached
-            if (idx < completeList.size() - 1) {
-                sa.setSVar("StaticEffectUntilCardID", String.valueOf(completeList.get(idx + 1).getId()));
+            if (idx > 0) {
+                sa.setSVar("StaticEffectUntilCardID", String.valueOf(completeList.get(idx - 1).getId()));
             }
             completeList.remove(eff);
         }

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

@@ -529,14 +529,9 @@ private void changeKnownOriginResolve(final SpellAbility sa) {
             }
         }
 
-        // if the player didn't order the effect above use default
-        if (sa.hasParam("StaticEffect") && !sa.hasSVar("StaticEffectTimestamp")) {
-            sa.setSVar("StaticEffectTimestamp", String.valueOf(game.getNextTimestamp()));
-        }
-
         for (final Card tgtC : tgtCards) {
             if (sa.hasSVar("StaticEffectUntilCardID") && sa.getSVarInt("StaticEffectUntilCardID") == tgtC.getId()) {
-                sa.setSVar("StaticEffectTimestamp", String.valueOf(game.getNextTimestamp()));
+                sa.removeSVar("StaticEffectTimestamp");
             }
 
             final Card gameCard = game.getCardState(tgtC, null);
@@ -661,19 +656,6 @@ private void changeKnownOriginResolve(final SpellAbility sa) {
                     }
                 }
 
-                if (sa.hasAdditionalAbility("AnimateSubAbility")) {
-                    // need LKI before Animate does apply
-                    if (!moveParams.containsKey(AbilityKey.CardLKI)) {
-                        moveParams.put(AbilityKey.CardLKI, CardCopyService.getLKICopy(gameCard));
-                    }
-
-                    final SpellAbility animate = sa.getAdditionalAbility("AnimateSubAbility");
-                    hostCard.addRemembered(gameCard);
-                    AbilityUtils.resolve(animate);
-                    hostCard.removeRemembered(gameCard);
-                    animate.setSVar("unanimateTimestamp", String.valueOf(game.getTimestamp()));
-                }
-
                 // need to be facedown before it hits the battlefield in case of Replacement Effects or Trigger
                 if (sa.hasParam("FaceDown")) {
                     gameCard.turnFaceDown(true);
@@ -1286,16 +1268,6 @@ else if (destination.equals(ZoneType.Battlefield)) {
                     if (sa.hasParam("Tapped")) {
                         c.setTapped(true);
                     }
-                    if (sa.hasAdditionalAbility("AnimateSubAbility")) {
-                        // need LKI before Animate does apply
-                        moveParams.put(AbilityKey.CardLKI, CardCopyService.getLKICopy(c));
-
-                        final SpellAbility animate = sa.getAdditionalAbility("AnimateSubAbility");
-                        source.addRemembered(c);
-                        AbilityUtils.resolve(animate);
-                        source.removeRemembered(c);
-                        animate.setSVar("unanimateTimestamp", String.valueOf(game.getTimestamp()));
-                    }
                     if (sa.hasParam("GainControl")) {
                         final String g = sa.getParam("GainControl");
                         Player newController = g.equals("True") ? sa.getActivatingPlayer() :