update

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

@@ -6,12 +6,12 @@ import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardLists;
-import forge.game.event.GameEventCombatChanged;
 import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.PlayerZoneBattlefield;
 import forge.game.zone.ZoneType;
+import forge.game.event.GameEventCombatChanged;
 import forge.util.Localizer;
 import java.util.Arrays;
 
@@ -47,12 +47,19 @@ public class MeldEffect extends SpellAbilityEffect {
         }
 
         for (Card c : exiled) {
+        boolean attacking = sa.hasParam("Attacking");
             if (c.isToken() || c.getCloneOrigin() != null) {
                 // Neither of these things
                 return;
             } else if (!c.isInZone(ZoneType.Exile)) {
                 return;
             }
+            if (sa.hasParam("EntersTapped")) {
+                c.setTapped(true);
+            }
+            if (sa.hasParam("Attacking")) {
+            	attacking = true;
+            }
         }
 
         primary.changeToState(CardStateName.Meld);
@@ -62,9 +69,5 @@ public class MeldEffect extends SpellAbilityEffect {
         game.getAction().changeZone(primary.getZone(), bf, primary, 0, sa);
         bf.addToMelded(secondary);
         
-        	
-        if (sa.hasParam("Enters Tapped")) {
-            primary.setTapped(true);
-        }
     }
 }

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

@@ -18,6 +18,7 @@
 package forge.game.ability.effects;
 
 import java.util.Arrays;
+
 import java.util.List;
 
 import forge.util.Lang;