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 #3616 from spjspj/master

Browse source 
Fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyrami…
This commit is contained in:
spjspj 2017-07-09 02:21:20 +10:00 committed by GitHub
commit e408cb84ab
1 changed files with 10 additions and 3 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

@ -139,14 +139,21 @@ class SolemnityEffect2 extends ReplacementEffectImpl {
@Override @Override
public boolean checksEventType(GameEvent event, Game game) { public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == EventType.ADD_COUNTER; return event.getType() == EventType.ADD_COUNTER || event.getType() == EventType.ADD_COUNTERS;
} }
@Override @Override
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());
if (object instanceof Permanent && filter.match((Permanent) object, game)) { Permanent permanent = game.getPermanentEntering(event.getSourceId());
return true; if (object != null && object instanceof Permanent) {
if (filter.match((Permanent) object, game)) {
return true;
}
} else if (permanent != null) {
if (filter.match(permanent, game)) {
return true;
}
} }
return false; return false;
} }