Fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyramid, Crystalline Crawler, Infect combat damage)
@@ -139,15 +139,22 @@ 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)) {
+ 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;
}
}
