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

Further fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyramid, Crystalline Crawler, Infect combat damage, Undying creatures, Persist creatures, flip planeswalkers, normal planeswalkers, Black Sun's Zenith, Vivid land, Scavenging Ooze)

Browse source
This commit is contained in:
spjspj 2017-07-10 19:53:02 +10:00
parent 836ef7da1c
commit 48320bce9a
1 changed files with 13 additions and 0 deletions
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;
} }
} }