merge latest trunk

This commit is contained in:
myk
2013-03-12 10:12:09 +00:00
4 changed files with 19 additions and 1 deletions

View File

@@ -104,7 +104,7 @@ public class EffectEffect extends SpellAbilityEffect {
// nuked
eff.addController(controller);
eff.setOwner(controller);
eff.setImageFilename(hostCard.getImageFilename());
eff.setImageFilename(sa.hasParam("Image") ? sa.getParam("Image") : hostCard.getImageFilename());
eff.setColor(hostCard.getColor());
eff.setImmutable(true);
eff.setEffectSource(hostCard);