diff --git a/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java b/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java index 799a7362f7c..33d1ce9744a 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/RevoltCondition.java @@ -45,7 +45,7 @@ public class RevoltCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - RevoltWatcher watcher = (RevoltWatcher) game.getState().getWatchers().get("Revolt"); + RevoltWatcher watcher = (RevoltWatcher) game.getState().getWatchers().get(RevoltWatcher.class.getName()); return watcher != null && watcher.revoltActive(source.getControllerId()); } diff --git a/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java b/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java index 549e3e5bc92..63f9d33717f 100644 --- a/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java @@ -25,7 +25,6 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.watchers.common; import java.util.HashSet; @@ -49,11 +48,12 @@ public class RevoltWatcher extends Watcher { private final Set revoltActivePlayerIds = new HashSet<>(0); public RevoltWatcher() { - super("Revolt", WatcherScope.GAME); + super(RevoltWatcher.class.getName(), WatcherScope.GAME); } public RevoltWatcher(final RevoltWatcher watcher) { super(watcher); + this.revoltActivePlayerIds.addAll(watcher.revoltActivePlayerIds); } @Override @@ -78,8 +78,6 @@ public class RevoltWatcher extends Watcher { revoltActivePlayerIds.clear(); } - - @Override public RevoltWatcher copy() { return new RevoltWatcher(this);