* Palladia-Mors, the Ruiner - Fixed possible exception.

This commit is contained in:
LevelX2 2018-06-24 02:01:20 +02:00
parent da92cd745e
commit f3d4194add

View file

@ -79,7 +79,7 @@ enum PalladiaMorsTheRuinerCondition implements Condition {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId()); Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId());
PalladiaMorsTheRuinerWatcher watcher = (PalladiaMorsTheRuinerWatcher) game.getState().getWatchers().get(PalladiaMorsTheRuinerWatcher.class.getSimpleName()); PalladiaMorsTheRuinerWatcher watcher = (PalladiaMorsTheRuinerWatcher) game.getState().getWatchers().get(PalladiaMorsTheRuinerWatcher.class.getSimpleName());
return !watcher.getDamagers().contains(new MageObjectReference(permanent, game)); return permanent != null && !watcher.getDamagers().contains(new MageObjectReference(permanent, game));
} }
@Override @Override
@ -91,7 +91,7 @@ enum PalladiaMorsTheRuinerCondition implements Condition {
class PalladiaMorsTheRuinerWatcher extends Watcher { class PalladiaMorsTheRuinerWatcher extends Watcher {
private Set<MageObjectReference> damagers = new HashSet(); private final Set<MageObjectReference> damagers = new HashSet();
public PalladiaMorsTheRuinerWatcher() { public PalladiaMorsTheRuinerWatcher() {
super(PalladiaMorsTheRuinerWatcher.class.getSimpleName(), WatcherScope.GAME); super(PalladiaMorsTheRuinerWatcher.class.getSimpleName(), WatcherScope.GAME);