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

Merge pull request #3643 from spjspj/master

Browse source 
Further fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunse…
This commit is contained in:
spjspj 2017-07-10 19:53:52 +10:00 committed by GitHub
commit a57118ffa2
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage.Sets/src/mage/cards/s/Solemnity.java
View file

@ -38,6 +38,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
@ -146,6 +147,9 @@ class SolemnityEffect2 extends ReplacementEffectImpl {
public boolean applies(GameEvent event, Ability source, Game game) { public boolean applies(GameEvent event, Ability source, Game game) {
MageObject object = game.getObject(event.getTargetId()); MageObject object = game.getObject(event.getTargetId());
Permanent permanent = game.getPermanentEntering(event.getSourceId()); Permanent permanent = game.getPermanentEntering(event.getSourceId());
Permanent permanent2 = game.getPermanent(event.getTargetId());
Permanent permanent3 = game.getPermanentEntering(event.getTargetId());
if (object != null && object instanceof Permanent) { if (object != null && object instanceof Permanent) {
if (filter.match((Permanent) object, game)) { if (filter.match((Permanent) object, game)) {
return true; return true;
@ -154,7 +158,16 @@ class SolemnityEffect2 extends ReplacementEffectImpl {
if (filter.match(permanent, game)) { if (filter.match(permanent, game)) {
return true; return true;
} }
} else if (permanent2 != null) {
if (filter.match(permanent2, game)) {
return true;
} }
} else if (permanent3 != null) {
if (filter.match(permanent3, game)) {
return true;
}
}
return false; return false;
} }
} }