mirror of
https://github.com/correl/mage.git
synced 2025-01-12 19:25:44 +00:00
watcher null fix for Kess Dissident Mage, issue #5563
This commit is contained in:
parent
942882bb90
commit
90bf7bd18c
1 changed files with 3 additions and 3 deletions
|
@ -162,7 +162,7 @@ class KessDissidentMageWatcher extends Watcher {
|
||||||
super(KessDissidentMageWatcher.class, WatcherScope.GAME);
|
super(KessDissidentMageWatcher.class, WatcherScope.GAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
KessDissidentMageWatcher(final KessDissidentMageWatcher watcher) {
|
private KessDissidentMageWatcher(final KessDissidentMageWatcher watcher) {
|
||||||
super(watcher);
|
super(watcher);
|
||||||
this.allowingObjects.addAll(watcher.allowingObjects);
|
this.allowingObjects.addAll(watcher.allowingObjects);
|
||||||
this.castSpells.putAll(watcher.castSpells);
|
this.castSpells.putAll(watcher.castSpells);
|
||||||
|
@ -175,8 +175,8 @@ class KessDissidentMageWatcher extends Watcher {
|
||||||
Spell spell = (Spell) game.getObject(event.getTargetId());
|
Spell spell = (Spell) game.getObject(event.getTargetId());
|
||||||
if (event.getAdditionalReference() != null
|
if (event.getAdditionalReference() != null
|
||||||
&& event.getAdditionalReference().getSourceId() != null
|
&& event.getAdditionalReference().getSourceId() != null
|
||||||
&& spell.isInstant()
|
&& (spell.isInstant()
|
||||||
|| spell.isSorcery()) {
|
|| spell.isSorcery())) {
|
||||||
allowingObjects.add(event.getAdditionalReference());
|
allowingObjects.add(event.getAdditionalReference());
|
||||||
castSpells.put(new MageObjectReference(spell.getSourceId(), game),
|
castSpells.put(new MageObjectReference(spell.getSourceId(), game),
|
||||||
event.getAdditionalReference().getSourceId());
|
event.getAdditionalReference().getSourceId());
|
||||||
|
|
Loading…
Reference in a new issue