Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-07-08 18:43:14 +02:00
commit abb4576313
1 changed files with 10 additions and 3 deletions
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
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
public boolean applies(GameEvent event, Ability source, Game game) {
MageObject object = game.getObject(event.getTargetId());
if (object instanceof Permanent && filter.match((Permanent) object, game)) {
return true;
Permanent permanent = game.getPermanentEntering(event.getSourceId());
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;
}