github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Protection - Fixed that protection from spells is also checked for determining if a spell can be cast due to have a valid target available.

Browse source
This commit is contained in:
LevelX2 2015-09-02 08:32:57 +02:00
parent aa0021b43c
commit 2c4d23bbb4
2 changed files with 78 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
Mage.Tests/src/test/java/org/mage/test/cards/protection/ProtectionTest.java Normal file
View file

@ -0,0 +1,63 @@
/*
* 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 org.mage.test.cards.protection;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class ProtectionTest extends CardTestPlayerBase {
@Test
public void testProtectionFromColoredSpells() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
// Delve
// Destroy target creature.
addCard(Zone.HAND, playerA, "Murderous Cut"); // {4}{B}
// Emrakul, the Aeons Torn can't be countered.
// When you cast Emrakul, take an extra turn after this one.
// Flying, protection from colored spells, annihilator 6
// When Emrakul is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
addCard(Zone.BATTLEFIELD, playerB, "Emrakul, the Aeons Torn");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Murderous Cut", "Emrakul, the Aeons Torn");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertPermanentCount(playerB, "Emrakul, the Aeons Torn", 1);
assertHandCount(playerA, "Murderous Cut", 1);
}
}

21
Mage/src/mage/abilities/keyword/ProtectionAbility.java
View file

@ -31,6 +31,7 @@ import java.util.UUID;
import mage.MageObject;
import mage.abilities.StaticAbility;
import mage.cards.Card;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.filter.Filter;
import mage.filter.FilterCard;
@ -40,6 +41,7 @@ import mage.filter.FilterSpell;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.game.stack.StackObject;
/**
*
@ -83,18 +85,25 @@ public class ProtectionAbility extends StaticAbility {
}
return true;
}
if (filter instanceof FilterSpell) {
if (source instanceof Spell) {
return !filter.match(source, game);
}
return true;
}
if (filter instanceof FilterCard) {
if (source instanceof Card) {
return !filter.match(source, game);
}
return true;
}
if (filter instanceof FilterSpell) {
if (source instanceof Spell) {
return !filter.match(source, game);
}
// Problem here is that for the check if a player can play a Spell, the source
// object is still a card and not a spell yet. So retunr only if the source object can't be a spell
// otherwise the following FilterObject check will be appied
if (source instanceof StackObject
|| (!source.getCardType().contains(CardType.INSTANT) && !source.getCardType().contains(CardType.SORCERY))) {
return true;
}
}
if (filter instanceof FilterObject) {
return !filter.match(source, game);
}