+ * Amount of damage received by a player this turn */ public class AmountOfDamageAPlayerReceivedThisTurnWatcher extends Watcher { @@ -48,6 +47,7 @@ public class AmountOfDamageAPlayerReceivedThisTurnWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfDamageReceivedThisTurn.clear(); } diff --git a/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java index 60cc296e91f..4e26b9aeb24 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java @@ -1,22 +1,20 @@ - - package mage.watchers.common; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - import mage.constants.PhaseStep; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; + /** * @author LevelX2 - * - * Counts cards drawn during draw step + *
+ * Counts cards drawn during draw step */ public class CardsDrawnDuringDrawStepWatcher extends Watcher { @@ -54,6 +52,7 @@ public class CardsDrawnDuringDrawStepWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfCardsDrawnThisTurn.clear(); } diff --git a/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java index 7f30b3b5ca4..7189709f78d 100644 --- a/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java @@ -1,4 +1,3 @@ - package mage.watchers.common; import mage.MageObjectReference; @@ -49,6 +48,7 @@ public class CastSpellLastTurnWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfSpellsCastOnPrevTurn.clear(); amountOfSpellsCastOnPrevTurn.putAll(amountOfSpellsCastOnCurrentTurn); amountOfSpellsCastOnCurrentTurn.clear(); diff --git a/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java index f99ca683b4d..0b6167c1013 100644 --- a/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java @@ -1,4 +1,3 @@ - package mage.watchers.common; import mage.constants.WatcherScope; @@ -6,8 +5,10 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import java.util.Map.Entry; +import java.util.UUID; /** * @author nantuko, BetaSteward_at_googlemail.com (spjspj) @@ -46,6 +47,7 @@ public class CastSpellYourLastTurnWatcher extends Watcher { @Override public void reset() { + super.reset(); if (amountOfSpellsCastOnPrevTurn != null && lastActivePlayer != null && amountOfSpellsCastOnPrevTurn.get(lastActivePlayer) != null) { diff --git a/Mage/src/main/java/mage/watchers/common/ChooseBlockersRedundancyWatcher.java b/Mage/src/main/java/mage/watchers/common/ChooseBlockersRedundancyWatcher.java index 4d8fceaef50..b6e04c91f90 100644 --- a/Mage/src/main/java/mage/watchers/common/ChooseBlockersRedundancyWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/ChooseBlockersRedundancyWatcher.java @@ -1,4 +1,3 @@ - package mage.watchers.common; import mage.constants.WatcherScope; @@ -7,7 +6,6 @@ import mage.game.events.GameEvent; import mage.watchers.Watcher; /** - * * @author L_J */ @@ -28,6 +26,7 @@ public class ChooseBlockersRedundancyWatcher extends Watcher { // workaround for @Override public void reset() { + super.reset(); copyCount = 0; copyCountApply = 0; } @@ -44,7 +43,7 @@ public class ChooseBlockersRedundancyWatcher extends Watcher { // workaround for public void increment() { copyCount++; copyCountApply = copyCount; - } + } public void decrement() { if (copyCountApply > 0) { diff --git a/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java b/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java index 6ebaee8ee60..39c111cd112 100644 --- a/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java @@ -1,19 +1,19 @@ - package mage.watchers.common; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; + /** * @author jeffwadsworth - * - * Return the last player that was attacked by specified creature this turn + *
+ * Return the last player that was attacked by specified creature this turn */ public class CreatureAttackedWhichPlayerWatcher extends Watcher { @@ -48,6 +48,7 @@ public class CreatureAttackedWhichPlayerWatcher extends Watcher { @Override public void reset() { + super.reset(); getPlayerAttackedThisTurnByCreature.clear(); } diff --git a/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java b/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java index cf30c774900..c58764c006f 100644 --- a/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java @@ -1,15 +1,15 @@ - package mage.watchers.common; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * @author LevelX2 */ @@ -45,6 +45,7 @@ public class CreaturesDiedWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfCreaturesThatDiedByController.clear(); amountOfCreaturesThatDiedByOwner.clear(); } diff --git a/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java b/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java index a0c6c70725a..0e3c2638cd9 100644 --- a/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java @@ -1,10 +1,5 @@ - package mage.watchers.common; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - import mage.abilities.costs.Cost; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.constants.SubType; @@ -15,8 +10,11 @@ import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** - * * @author LevelX2 */ public class DragonOnTheBattlefieldWhileSpellWasCastWatcher extends Watcher { @@ -53,7 +51,7 @@ public class DragonOnTheBattlefieldWhileSpellWasCastWatcher extends Watcher { if (!revealedOrOnBattlefield) { revealedOrOnBattlefield = game.getBattlefield().countAll(filter, spell.getControllerId(), game) > 0; } - if (revealedOrOnBattlefield){ + if (revealedOrOnBattlefield) { castWithDragonOnTheBattlefield.add(spell.getId()); } @@ -63,6 +61,7 @@ public class DragonOnTheBattlefieldWhileSpellWasCastWatcher extends Watcher { @Override public void reset() { + super.reset(); castWithDragonOnTheBattlefield.clear(); } diff --git a/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java b/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java index ce1827b8c38..240d87aa66d 100644 --- a/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java @@ -1,14 +1,15 @@ package mage.watchers.common; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * @author BetaSteward_at_googlemail.com * @author Loki @@ -48,9 +49,9 @@ public class LandfallWatcher extends Watcher { @Override public void reset() { + super.reset(); playerPlayedLand.clear(); landEnteredBattlefield.clear(); - super.reset(); } public boolean landPlayed(UUID playerId) { diff --git a/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java b/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java index 325b958d594..fe0b93fb87b 100644 --- a/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java @@ -1,11 +1,5 @@ - package mage.watchers.common; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.keyword.MiracleAbility; import mage.cards.Card; @@ -18,6 +12,11 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; + /** * Counts amount of cards drawn this turn by players. Asks players about Miracle * ability to be activated if it the first card drawn this turn. @@ -80,6 +79,7 @@ public class MiracleWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfCardsDrawnThisTurn.clear(); } diff --git a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java index 2c52ef3ed81..ef61b18a8f4 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java @@ -14,7 +14,6 @@ import mage.watchers.Watcher; import java.util.*; /** - * * @author LevelX2 (spjspj) */ public class PermanentsEnteredBattlefieldYourLastTurnWatcher extends Watcher { @@ -62,6 +61,7 @@ public class PermanentsEnteredBattlefieldYourLastTurnWatcher extends Watcher { @Override public void reset() { + super.reset(); if (enteringBattlefieldLastTurn != null && lastActivePlayer != null && enteringBattlefieldLastTurn.get(lastActivePlayer) != null) { diff --git a/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java b/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java index 21ab1cc6a1f..3bd32a1a883 100644 --- a/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java @@ -1,14 +1,14 @@ - package mage.watchers.common; +import mage.constants.WatcherScope; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.watchers.Watcher; + import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import mage.constants.WatcherScope; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.watchers.Watcher; /* * Counts the number of times the planar die has been rolled per player per turn @@ -40,7 +40,7 @@ public class PlanarRollWatcher extends Watcher { if (amount == null) { amount = 1; } else { - amount ++; + amount++; } numberTimesPlanarDieRolled.put(playerId, amount); } @@ -53,6 +53,7 @@ public class PlanarRollWatcher extends Watcher { @Override public void reset() { + super.reset(); numberTimesPlanarDieRolled.clear(); } diff --git a/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java index bc6769e219e..c17eb95da6c 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java @@ -1,14 +1,15 @@ package mage.watchers.common; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * @author jeffwadsworth */ @@ -47,9 +48,9 @@ public class PlayLandWatcher extends Watcher { @Override public void reset() { + super.reset(); playerPlayedLand.clear(); landPlayed.clear(); - super.reset(); } public boolean landPlayed(UUID playerId) { diff --git a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java index d6a28c4d396..de6d9b6ebc4 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java @@ -1,9 +1,7 @@ - package mage.watchers.common; import mage.constants.WatcherScope; import mage.game.Game; -import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; @@ -72,6 +70,7 @@ public class PlayerLostLifeNonCombatWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfLifeLostLastTurn.clear(); amountOfLifeLostLastTurn.putAll(amountOfLifeLostThisTurn); amountOfLifeLostThisTurn.clear(); diff --git a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java index b90a4e44578..83576742abd 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java @@ -1,16 +1,16 @@ - package mage.watchers.common; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; + /* * Counts amount of life lost current or last turn by players. * This watcher is automatically started in gameImpl.init for each game @@ -70,6 +70,7 @@ public class PlayerLostLifeWatcher extends Watcher { @Override public void reset() { + super.reset(); amountOfLifeLostLastTurn.clear(); amountOfLifeLostLastTurn.putAll(amountOfLifeLostThisTurn); amountOfLifeLostThisTurn.clear(); diff --git a/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java b/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java index 65084d84cd8..69522a27c77 100644 --- a/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java @@ -1,9 +1,5 @@ - package mage.watchers.common; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.constants.WatcherScope; import mage.constants.Zone; import mage.game.Game; @@ -13,8 +9,11 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public class RevoltWatcher extends Watcher { @@ -49,6 +48,7 @@ public class RevoltWatcher extends Watcher { @Override public void reset() { + super.reset(); revoltActivePlayerIds.clear(); }