* Reworked Order of the Stars protection handling.

Mage.Sets/src/mage/sets/guildpact/OrderOfTheStars.java

@@ -29,23 +29,16 @@ package mage.sets.guildpact;
 
 import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.AsEntersBattlefieldAbility;
-import mage.abilities.effects.ContinuousEffect;
-import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.ChooseColorEffect;
+import mage.abilities.effects.keyword.ProtectionChosenColorSourceEffect;
 import mage.abilities.keyword.DefenderAbility;
-import mage.abilities.keyword.ProtectionAbility;
 import mage.cards.CardImpl;
-import mage.choices.ChoiceColor;
 import mage.constants.CardType;
-import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
-import mage.filter.FilterCard;
-import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.Game;
-import mage.players.Player;
+import mage.constants.Zone;
 
 /**
  *
@@ -63,10 +56,12 @@ public class OrderOfTheStars extends CardImpl {
 
         // Defender
         this.addAbility(DefenderAbility.getInstance());
-        
+
         // As Order of the Stars enters the battlefield, choose a color.
+        this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit)));
+
         // Order of the Stars has protection from the chosen color.
-        this.addAbility(new AsEntersBattlefieldAbility(new OrderOfTheStarsEffect()));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorSourceEffect()));
     }
 
     public OrderOfTheStars(final OrderOfTheStars card) {
@@ -78,36 +73,3 @@ public class OrderOfTheStars extends CardImpl {
         return new OrderOfTheStars(this);
     }
 }
-
-class OrderOfTheStarsEffect extends OneShotEffect {
-    
-    public OrderOfTheStarsEffect() {
-        super(Outcome.Protect);
-        this.staticText = "{this} gains protection from the color of your choice";
-    }
-    
-    public OrderOfTheStarsEffect(final OrderOfTheStarsEffect effect) {
-        super(effect);
-    }
-    
-    @Override
-    public OrderOfTheStarsEffect copy() {
-        return new OrderOfTheStarsEffect(this);
-    }
-    
-    @Override
-    public boolean apply(Game game, Ability source) {
-        ChoiceColor choice = new ChoiceColor();
-        choice.setMessage("Choose color to get protection from");
-        Player controller = game.getPlayer(source.getControllerId());
-        if (controller != null && controller.choose(outcome, choice, game)) {
-            FilterCard protectionFilter = new FilterCard();
-            protectionFilter.add(new ColorPredicate(choice.getColor()));
-            protectionFilter.setMessage(choice.getChoice().toLowerCase());
-            ContinuousEffect effect = new GainAbilitySourceEffect(new ProtectionAbility(protectionFilter), Duration.WhileOnBattlefield);
-            game.addEffect(effect, source);
-            return true;
-        }
-        return false;
-    }
-}

Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromColorTest.java

@@ -38,4 +38,47 @@ public class ProtectionFromColorTest extends CardTestPlayerBase {
         // One should have been destroyed by Royal Assassin
         assertPermanentCount(playerB, "Runeclaw Bear", 0);
     }
+
+    @Test
+    public void testProtectionChosenColor() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains");
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp");
+        // Defender
+        // As Order of the Stars enters the battlefield, choose a color.
+        // Order of the Stars has protection from the chosen color.
+        addCard(Zone.HAND, playerA, "Order of the Stars"); // 0/1  {W}
+        // Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost.
+        addCard(Zone.HAND, playerA, "Reanimate"); // {B}
+
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Mountain", 4);
+        // Seismic Shudder deals 1 damage to each creature without flying.
+        addCard(Zone.HAND, playerB, "Seismic Shudder", 2); // {1}{R}
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Order of the Stars");
+        setChoice(playerA, "White");
+
+        attack(2, playerB, "Silvercoat Lion");
+        block(2, playerA, "Order of the Stars", "Silvercoat Lion");
+
+        castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Seismic Shudder");
+
+        castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Reanimate", "Order of the Stars");
+        setChoice(playerA, "Red");
+
+        castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerB, "Seismic Shudder");
+
+        setStopAt(3, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerB, "Seismic Shudder", 2);
+        assertGraveyardCount(playerA, "Reanimate", 1);
+        assertPermanentCount(playerA, "Order of the Stars", 1);
+        assertPermanentCount(playerB, "Silvercoat Lion", 1);
+
+        assertLife(playerA, 19);
+        assertLife(playerB, 20);
+
+    }
+
 }

Mage/src/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java

@@ -0,0 +1,90 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.abilities.effects.keyword;
+
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.keyword.ProtectionAbility;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.SubLayer;
+import mage.filter.FilterObject;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ProtectionChosenColorSourceEffect extends ContinuousEffectImpl {
+
+    protected ObjectColor chosenColor;
+    protected ProtectionAbility protectionAbility;
+
+    public ProtectionChosenColorSourceEffect() {
+        super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+        staticText = "{source} has protection from the chosen color";
+    }
+
+    public ProtectionChosenColorSourceEffect(final ProtectionChosenColorSourceEffect effect) {
+        super(effect);
+        if (effect.chosenColor != null) {
+            this.chosenColor = effect.chosenColor.copy();
+        }
+        if (effect.protectionAbility != null) {
+            this.protectionAbility = effect.protectionAbility.copy();
+        }
+    }
+
+    @Override
+    public ProtectionChosenColorSourceEffect copy() {
+        return new ProtectionChosenColorSourceEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (permanent != null) {
+            ObjectColor color = (ObjectColor) game.getState().getValue(permanent.getId() + "_color");
+            if (color != null && (protectionAbility == null || !color.equals(chosenColor))) {
+                chosenColor = color;
+                FilterObject protectionFilter = new FilterObject(chosenColor.getDescription());
+                protectionFilter.add(new ColorPredicate(chosenColor));
+                protectionAbility = new ProtectionAbility(protectionFilter);
+            }
+            if (protectionAbility != null) {
+                permanent.addAbility(protectionAbility, source.getSourceId(), game);
+                return true;
+            }
+        }
+        return false;
+    }
+}