External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-29 23:12:10 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* 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
Download patch file Download diff file Expand all files Collapse all files

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);
}