[refactor] removed generic parameter from Watcher

This commit is contained in:
North 2014-05-31 22:01:32 +03:00
parent 363bdae44c
commit 4af606883e
78 changed files with 80 additions and 80 deletions

View file

@ -114,7 +114,7 @@ class MaelstromNexusTriggeredAbility extends TriggeredAbilityImpl<MaelstromNexus
}
}
class FirstSpellCastThisTurnWatcher extends Watcher<FirstSpellCastThisTurnWatcher> {
class FirstSpellCastThisTurnWatcher extends Watcher {
int spellCount = 0;

View file

@ -96,7 +96,7 @@ class DidNotCastCreatureCondition implements Condition {
}
}
class CastCreatureWatcher extends Watcher<CastCreatureWatcher> {
class CastCreatureWatcher extends Watcher {
public CastCreatureWatcher() {
super("CastCreature", WatcherScope.CARD);

View file

@ -167,7 +167,7 @@ class UnscytheEffect extends OneShotEffect<UnscytheEffect> {
}
}
class EquippedDidDamageWatcher extends Watcher<EquippedDidDamageWatcher> {
class EquippedDidDamageWatcher extends Watcher {
public List<UUID> equippedDamagedTargets = new ArrayList<UUID>();

View file

@ -172,7 +172,7 @@ class CavernOfSoulsManaCondition extends CreatureCastManaCondition {
}
}
class CavernOfSoulsWatcher extends Watcher<CavernOfSoulsWatcher> {
class CavernOfSoulsWatcher extends Watcher {
public List<UUID> spells = new ArrayList<>();

View file

@ -121,7 +121,7 @@ class GoblinCohortEffect extends RestrictionEffect<GoblinCohortEffect> {
}
}
class PlayerCastCreatureWatcher extends Watcher<PlayerCastCreatureWatcher> {
class PlayerCastCreatureWatcher extends Watcher {
Set<UUID> playerIds = new HashSet<>();

View file

@ -134,7 +134,7 @@ class KumanosBlessingEffect extends ReplacementEffectImpl<KumanosBlessingEffect>
}
class DamagedByEnchantedWatcher extends Watcher<DamagedByEnchantedWatcher> {
class DamagedByEnchantedWatcher extends Watcher {
public List<UUID> damagedCreatures = new ArrayList<>();

View file

@ -108,7 +108,7 @@ class HadAnotherCreatureEnterTheBattlefieldCondition implements Condition {
}
}
class CreatureEnteredBattlefieldLastTurnWatcher extends Watcher<CreatureEnteredBattlefieldLastTurnWatcher> {
class CreatureEnteredBattlefieldLastTurnWatcher extends Watcher {
private boolean anotherCreatureEntered = false;

View file

@ -74,7 +74,7 @@ public class SpiritOfTheLabyrinth extends CardImpl<SpiritOfTheLabyrinth> {
}
}
class SpiritOfTheLabyrinthWatcher extends Watcher<SpiritOfTheLabyrinthWatcher> {
class SpiritOfTheLabyrinthWatcher extends Watcher {
public SpiritOfTheLabyrinthWatcher() {
super("DrewCard", WatcherScope.PLAYER);

View file

@ -90,7 +90,7 @@ public class BoseijuWhoSheltersAll extends CardImpl<BoseijuWhoSheltersAll> {
}
}
class BoseijuWhoSheltersAllWatcher extends Watcher<BoseijuWhoSheltersAllWatcher> {
class BoseijuWhoSheltersAllWatcher extends Watcher {
public List<UUID> spells = new ArrayList<>();

View file

@ -75,7 +75,7 @@ public class FloatingDreamZubera extends CardImpl<FloatingDreamZubera> {
}
class ZuberasDiedWatcher extends Watcher<ZuberasDiedWatcher> {
class ZuberasDiedWatcher extends Watcher {
public int zuberasDiedThisTurn = 0;

View file

@ -99,7 +99,7 @@ class SiftThroughSandsCondition implements Condition {
}
}
class SiftThroughSandsWatcher extends Watcher<SiftThroughSandsWatcher> {
class SiftThroughSandsWatcher extends Watcher {
boolean castPeerThroughDepths = false;
boolean castReachThroughMists = false;

View file

@ -99,7 +99,7 @@ public class FellShepherd extends CardImpl<FellShepherd> {
}
}
class FellShepherdWatcher extends Watcher<FellShepherdWatcher> {
class FellShepherdWatcher extends Watcher {
private Set<UUID> creatureIds = new HashSet<UUID>();

View file

@ -172,7 +172,7 @@ class JelevaNephaliasCastEffect extends OneShotEffect<JelevaNephaliasCastEffect>
}
}
class JelevaNephaliasWatcher extends Watcher<JelevaNephaliasWatcher> {
class JelevaNephaliasWatcher extends Watcher {
private Map<Integer, Integer> manaSpendToCast = new HashMap<Integer, Integer>(); // cast

View file

@ -162,7 +162,7 @@ class OpalPalaceManaEffect extends ManaEffect<OpalPalaceManaEffect> {
}
}
class OpalPalaceWatcher extends Watcher<OpalPalaceWatcher> {
class OpalPalaceWatcher extends Watcher {
public List<UUID> commanderId = new ArrayList<UUID>();

View file

@ -78,7 +78,7 @@ public class CurseOfExhaustion extends CardImpl<CurseOfExhaustion> {
}
}
class CurseOfExhaustionWatcher extends Watcher<CurseOfExhaustionWatcher> {
class CurseOfExhaustionWatcher extends Watcher {
public CurseOfExhaustionWatcher() {
super("SpellCast", WatcherScope.PLAYER);

View file

@ -155,7 +155,7 @@ class DungeonGeistsEffect extends ReplacementEffectImpl<DungeonGeistsEffect> {
}
}
class DungeonGeistsWatcher extends Watcher<DungeonGeistsWatcher> {
class DungeonGeistsWatcher extends Watcher {
DungeonGeistsWatcher () {
super("ControlLost", WatcherScope.CARD);

View file

@ -97,7 +97,7 @@ class CastBlueSpellThisTurnCondition implements Condition {
}
}
class DreamThiefWatcher extends Watcher<DreamThiefWatcher> {
class DreamThiefWatcher extends Watcher {
private static final FilterSpell filter = new FilterSpell();
static {

View file

@ -119,7 +119,7 @@ class GroundingPouncerCondition implements Condition {
}
}
class ActivatedAbilityUsedThisTurnWatcher extends Watcher<ActivatedAbilityUsedThisTurnWatcher> {
class ActivatedAbilityUsedThisTurnWatcher extends Watcher {
public Set<UUID> activatedThisTurn = new HashSet<UUID>();

View file

@ -98,7 +98,7 @@ class CastRedSpellThisTurnCondition implements Condition {
}
}
class HotHeadedGiantWatcher extends Watcher<HotHeadedGiantWatcher> {
class HotHeadedGiantWatcher extends Watcher {
private static final FilterSpell filter = new FilterSpell();
static {

View file

@ -104,7 +104,7 @@ class CastBlackSpellThisTurnCondition implements Condition {
}
}
class SoulReapWatcher extends Watcher<SoulReapWatcher> {
class SoulReapWatcher extends Watcher {
private static final FilterSpell filter = new FilterSpell();

View file

@ -135,7 +135,7 @@ class CastGreenSpellThisTurnCondition implements Condition {
}
}
class TalarasBattalionWatcher extends Watcher<TalarasBattalionWatcher> {
class TalarasBattalionWatcher extends Watcher {
private static final FilterSpell filter = new FilterSpell();

View file

@ -161,7 +161,7 @@ class SylvanLibraryEffect extends OneShotEffect<SylvanLibraryEffect> {
}
}
class CardsDrawnThisTurnWatcher extends Watcher<CardsDrawnThisTurnWatcher> {
class CardsDrawnThisTurnWatcher extends Watcher {
private final Set<UUID> cardsDrawnThisTurn = new HashSet<UUID>();

View file

@ -93,7 +93,7 @@ class CastWhiteSpellThisTurnCondition implements Condition {
}
}
class PatriciansScornWatcher extends Watcher<PatriciansScornWatcher> {
class PatriciansScornWatcher extends Watcher {
private static final FilterSpell filter = new FilterSpell();
static {

View file

@ -188,7 +188,7 @@ class AureliasFuryCantCastEffect extends ReplacementEffectImpl<AureliasFuryCantC
}
}
class AureliasFuryDamagedByWatcher extends Watcher<AureliasFuryDamagedByWatcher> {
class AureliasFuryDamagedByWatcher extends Watcher {
public List<UUID> damagedCreatures = new ArrayList<UUID>();
public List<UUID> damagedPlayers = new ArrayList<UUID>();

View file

@ -104,7 +104,7 @@ class IncursionTriggeredAbility extends TriggeredAbilityImpl<IncursionTriggeredA
}
}
class IncursionWatcher extends Watcher<IncursionWatcher> {
class IncursionWatcher extends Watcher {
int spellCount = 0;

View file

@ -126,7 +126,7 @@ class QuickenAsThoughEffect extends AsThoughEffectImpl<QuickenAsThoughEffect> {
}
class QuickenWatcher extends Watcher<QuickenWatcher> {
class QuickenWatcher extends Watcher {
public List<String> activeQuickenSpells = new ArrayList<String>();

View file

@ -97,7 +97,7 @@ public class TinderWall extends CardImpl<TinderWall> {
}
class BlockedByWatcher extends Watcher<BlockedByWatcher> {
class BlockedByWatcher extends Watcher {
public List<UUID> blockedByWatcher = new ArrayList<UUID>();

View file

@ -80,7 +80,7 @@ public class CivilizedScholar extends CardImpl<CivilizedScholar> {
}
}
class HomicidalBruteWatcher extends Watcher<HomicidalBruteWatcher> {
class HomicidalBruteWatcher extends Watcher {
public HomicidalBruteWatcher() {
super("HomicidalBruteAttacked", WatcherScope.CARD);

View file

@ -79,7 +79,7 @@ public class WindbriskHeights extends CardImpl<WindbriskHeights> {
}
}
class WindbriskHeightsWatcher extends Watcher<WindbriskHeightsWatcher> {
class WindbriskHeightsWatcher extends Watcher {
private int numberOfattackers;

View file

@ -78,7 +78,7 @@ public class AngelicArbiter extends CardImpl<AngelicArbiter> {
}
class AngelicArbiterWatcher1 extends Watcher<AngelicArbiterWatcher1> {
class AngelicArbiterWatcher1 extends Watcher {
public AngelicArbiterWatcher1() {
super("OpponentCastSpell", WatcherScope.PLAYER);
@ -103,7 +103,7 @@ class AngelicArbiterWatcher1 extends Watcher<AngelicArbiterWatcher1> {
}
class AngelicArbiterWatcher2 extends Watcher<AngelicArbiterWatcher2> {
class AngelicArbiterWatcher2 extends Watcher {
public AngelicArbiterWatcher2() {
super("OpponentAttacked", WatcherScope.PLAYER);

View file

@ -99,7 +99,7 @@ class FaithsRewardEffect extends OneShotEffect<FaithsRewardEffect> {
}
}
class FaithsRewardWatcher extends Watcher<FaithsRewardWatcher> {
class FaithsRewardWatcher extends Watcher {
ArrayList<UUID> cards = new ArrayList<UUID>();
public FaithsRewardWatcher() {

View file

@ -139,7 +139,7 @@ class SavageSummoningAsThoughEffect extends AsThoughEffectImpl<SavageSummoningAs
}
class SavageSummoningWatcher extends Watcher<SavageSummoningWatcher> {
class SavageSummoningWatcher extends Watcher {
private Set<String> savageSummoningSpells = new HashSet<String>();;
private Map<UUID, Set<String>> spellsCastWithSavageSummoning = new LinkedHashMap<UUID, Set<String>>();

View file

@ -159,7 +159,7 @@ class TidebinderMageEffect extends ReplacementEffectImpl<TidebinderMageEffect> {
}
}
class TidebinderMageWatcher extends Watcher<TidebinderMageWatcher> {
class TidebinderMageWatcher extends Watcher {
TidebinderMageWatcher () {
super("ControlLost", WatcherScope.CARD);

View file

@ -101,7 +101,7 @@ class SecondSunriseEffect extends OneShotEffect<SecondSunriseEffect> {
}
}
class SecondSunriseWatcher extends Watcher<SecondSunriseWatcher> {
class SecondSunriseWatcher extends Watcher {
ArrayList<UUID> cards = new ArrayList<UUID>();
public SecondSunriseWatcher() {

View file

@ -135,7 +135,7 @@ class CathedralMembraneEffect extends OneShotEffect<CathedralMembraneEffect> {
}
}
class CathedralMembraneWatcher extends Watcher<CathedralMembraneWatcher> {
class CathedralMembraneWatcher extends Watcher {
public List<UUID> blockedCreatures = new ArrayList<UUID>();

View file

@ -71,7 +71,7 @@ public class FreshMeat extends CardImpl<FreshMeat> {
}
}
class FreshMeatWatcher extends Watcher<FreshMeatWatcher> {
class FreshMeatWatcher extends Watcher {
private int creaturesCount = 0;

View file

@ -129,7 +129,7 @@ class GainReboundEffect extends ContinuousEffectImpl<GainReboundEffect> {
class AttachedReboundAbility extends ReboundAbility {}
class LeavesBattlefieldWatcher extends Watcher<LeavesBattlefieldWatcher> {
class LeavesBattlefieldWatcher extends Watcher {
public LeavesBattlefieldWatcher() {
super("LeavesBattlefieldWatcher", WatcherScope.CARD);

View file

@ -108,7 +108,7 @@ class VengevineAbility extends TriggeredAbilityImpl<VengevineAbility> {
}
class VengevineWatcher extends Watcher<VengevineWatcher> {
class VengevineWatcher extends Watcher {
int creatureSpellCount = 0;

View file

@ -78,7 +78,7 @@ public class FleshAllergy extends CardImpl<FleshAllergy> {
}
}
class FleshAllergyWatcher extends Watcher<FleshAllergyWatcher> {
class FleshAllergyWatcher extends Watcher {
public int creaturesDiedThisTurn = 0;

View file

@ -116,7 +116,7 @@ class MoltenPsycheEffect extends OneShotEffect<MoltenPsycheEffect> {
}
class MoltenPsycheWatcher extends Watcher<MoltenPsycheWatcher> {
class MoltenPsycheWatcher extends Watcher {
private final Map<UUID, Integer> draws = new HashMap<>();

View file

@ -114,7 +114,7 @@ class SteelHellkiteDestroyEffect extends OneShotEffect {
}
}
class SteelHellkiteWatcher extends Watcher<SteelHellkiteWatcher> {
class SteelHellkiteWatcher extends Watcher {
public List<UUID> damagedPlayers = new ArrayList<UUID>();

View file

@ -73,7 +73,7 @@ public class EtherswornCanonist extends CardImpl<EtherswornCanonist> {
}
}
class EtherswornCanonistWatcher extends Watcher<EtherswornCanonistWatcher> {
class EtherswornCanonistWatcher extends Watcher {
private Map<UUID, Boolean> castNonartifactSpell = new HashMap<UUID, Boolean>();

View file

@ -144,7 +144,7 @@ class ShipbreakerKrakenReplacementEffect extends ReplacementEffectImpl<Shipbreak
}
}
class ShipbreakerKrakenWatcher extends Watcher<ShipbreakerKrakenWatcher> {
class ShipbreakerKrakenWatcher extends Watcher {
ShipbreakerKrakenWatcher () {
super("ControlLost", WatcherScope.CARD);

View file

@ -206,7 +206,7 @@ class TritonTacticsEndOfCombatEffect extends OneShotEffect<TritonTacticsEndOfCom
}
}
class BlockedCreaturesWatcher extends Watcher<BlockedCreaturesWatcher> {
class BlockedCreaturesWatcher extends Watcher {
public BlockedCreaturesWatcher() {
super("BlockedCreatures", WatcherScope.CARD);

View file

@ -79,7 +79,7 @@ public class PermafrostTrap extends CardImpl<PermafrostTrap> {
}
}
class PermafrostTrapWatcher extends Watcher<PermafrostTrapWatcher> {
class PermafrostTrapWatcher extends Watcher {
public PermafrostTrapWatcher() {
super("PermafrostTrapWatcher", WatcherScope.GAME);

View file

@ -83,7 +83,7 @@ public class RefractionTrap extends CardImpl<RefractionTrap> {
}
}
class RefractionTrapWatcher extends Watcher<RefractionTrapWatcher> {
class RefractionTrapWatcher extends Watcher {
public RefractionTrapWatcher() {
super("RefractionTrapWatcher", WatcherScope.GAME);

View file

@ -86,7 +86,7 @@ public class RicochetTrap extends CardImpl<RicochetTrap> {
}
}
class RicochetTrapWatcher extends Watcher<RicochetTrapWatcher> {
class RicochetTrapWatcher extends Watcher {
public RicochetTrapWatcher() {
super("RicochetTrapWatcher", WatcherScope.GAME);

View file

@ -73,7 +73,7 @@ public class ArchiveTrap extends CardImpl<ArchiveTrap> {
}
class ArchiveTrapWatcher extends Watcher<ArchiveTrapWatcher> {
class ArchiveTrapWatcher extends Watcher {
public ArchiveTrapWatcher() {
super("LibrarySearched", WatcherScope.PLAYER);

View file

@ -108,7 +108,7 @@ class ArchmageAscensionTriggeredAbility extends TriggeredAbilityImpl<ArchmageAsc
}
}
class CardsDrawnControllerWatcher extends Watcher<CardsDrawnControllerWatcher> {
class CardsDrawnControllerWatcher extends Watcher {
int cardsDrawn;

View file

@ -76,7 +76,7 @@ public class BalothCageTrap extends CardImpl<BalothCageTrap> {
}
}
class BalothCageTrapWatcher extends Watcher<BalothCageTrapWatcher> {
class BalothCageTrapWatcher extends Watcher {
public BalothCageTrapWatcher() {
super("BalothCageTrapWatcher", WatcherScope.GAME);

View file

@ -78,7 +78,7 @@ public class CobraTrap extends CardImpl<CobraTrap> {
}
}
class CobraTrapWatcher extends Watcher<CobraTrapWatcher> {
class CobraTrapWatcher extends Watcher {
public CobraTrapWatcher() {
super("noncreature permanent destroyed", WatcherScope.PLAYER);

View file

@ -140,7 +140,7 @@ class GomazoaEffect extends OneShotEffect<GomazoaEffect> {
}
}
class BlockedByWatcher extends Watcher<BlockedByWatcher> {
class BlockedByWatcher extends Watcher {
public List<UUID> blockedByWatcher = new ArrayList<>();

View file

@ -75,7 +75,7 @@ public class InfernoTrap extends CardImpl<InfernoTrap> {
}
}
class ControllerDamagedByCreatureWatcher extends Watcher<ControllerDamagedByCreatureWatcher> {
class ControllerDamagedByCreatureWatcher extends Watcher {
int numCreaturesDamagedController;

View file

@ -81,7 +81,7 @@ public class LavaballTrap extends CardImpl<LavaballTrap> {
}
}
class LavaballTrapWatcher extends Watcher<LavaballTrapWatcher> {
class LavaballTrapWatcher extends Watcher {
private Map<UUID, Integer> amountOfLandsPlayedThisTurn = new HashMap<UUID, Integer>();

View file

@ -143,7 +143,7 @@ class MerfolkToken extends Token {
}
}
class CastedSpellsWithSpellTarget extends Watcher<CastedSpellsWithSpellTarget> {
class CastedSpellsWithSpellTarget extends Watcher {
// <SourceId_TargetSpellId, controllerId>
private Map<String, UUID> casted = new HashMap<String, UUID>();

View file

@ -82,7 +82,7 @@ public class MindbreakTrap extends CardImpl<MindbreakTrap> {
}
}
class MindbreakTrapWatcher extends Watcher<MindbreakTrapWatcher> {
class MindbreakTrapWatcher extends Watcher {
private Map<UUID, Integer> counts = new HashMap<UUID, Integer>();

View file

@ -105,7 +105,7 @@ class TargetPlayerCardsInHandCount implements DynamicValue {
}
}
class CardsDrawnOpponentWatcher extends Watcher<CardsDrawnOpponentWatcher> {
class CardsDrawnOpponentWatcher extends Watcher {
int cardsDrawn;

View file

@ -88,7 +88,7 @@ public class SummoningTrap extends CardImpl<SummoningTrap> {
}
}
class SummoningTrapWatcher extends Watcher<SummoningTrapWatcher> {
class SummoningTrapWatcher extends Watcher {
public SummoningTrapWatcher() {
super("CreatureSpellCountered", WatcherScope.PLAYER);

View file

@ -78,7 +78,7 @@ public class WhiplashTrap extends CardImpl<WhiplashTrap> {
}
}
class WhiplashTrapWatcher extends Watcher<WhiplashTrapWatcher> {
class WhiplashTrapWatcher extends Watcher {
private Map<UUID, Integer> amountOfCreaturesPlayedThisTurn = new HashMap<UUID, Integer>();

View file

@ -214,7 +214,7 @@ class MadnessExileEffect extends OneShotEffect<MadnessExileEffect> {
/**
* Whenever phase is changed, this watcher returns all cards exiled by madness to graveyard and informs players about it.
*/
class MadnessCleanUpWatcher extends Watcher<MadnessCleanUpWatcher> {
class MadnessCleanUpWatcher extends Watcher {
public MadnessCleanUpWatcher() {
super("MadnessPlayWasCanceled", WatcherScope.GAME);

View file

@ -40,7 +40,7 @@ import mage.game.events.GameEvent;
*
* @author BetaSteward_at_googlemail.com
*/
public abstract class Watcher<T extends Watcher<T>> implements Serializable {
public abstract class Watcher implements Serializable {
protected UUID controllerId;
protected UUID sourceId;
@ -99,5 +99,5 @@ public abstract class Watcher<T extends Watcher<T>> implements Serializable {
public abstract void watch(GameEvent event, Game game);
public abstract T copy();
public abstract Watcher copy();
}

View file

@ -39,7 +39,7 @@ import java.util.UUID;
/**
* @author magenoxx_at_gmail.com
*/
public class AttackedThisTurnWatcher extends Watcher<AttackedThisTurnWatcher> {
public class AttackedThisTurnWatcher extends Watcher {
public Set<UUID> attackedThisTurnCreatures = new HashSet<UUID>();

View file

@ -39,7 +39,7 @@ import java.util.UUID;
* Must be installed to player for proper Bloodthirst work
* @author Loki
*/
public class BloodthirstWatcher extends Watcher<BloodthirstWatcher> {
public class BloodthirstWatcher extends Watcher {
public BloodthirstWatcher(UUID controllerId) {
super("DamagedOpponents", WatcherScope.PLAYER);
this.controllerId = controllerId;

View file

@ -46,7 +46,7 @@ import mage.watchers.Watcher;
*
*/
public class CardsDrawnDuringDrawStepWatcher extends Watcher<CardsDrawnDuringDrawStepWatcher> {
public class CardsDrawnDuringDrawStepWatcher extends Watcher {
private final Map<UUID, Integer> amountOfCardsDrawnThisTurn = new HashMap<>();

View file

@ -47,7 +47,7 @@ import mage.watchers.Watcher;
*
* @author LevelX2
*/
public class CardsPutIntoGraveyardWatcher extends Watcher<CardsPutIntoGraveyardWatcher> {
public class CardsPutIntoGraveyardWatcher extends Watcher {
private final Map<UUID, Integer> amountOfCardsThisTurn = new HashMap<UUID, Integer>();
private final Set<UUID> cardsPutToGraveyardFromBattlefield = new HashSet<UUID>();

View file

@ -7,7 +7,7 @@ import mage.game.events.GameEvent;
import mage.game.stack.Spell;
import mage.watchers.Watcher;
public class CastFromHandWatcher extends Watcher<CastFromHandWatcher> {
public class CastFromHandWatcher extends Watcher {
public CastFromHandWatcher() {
super("CastFromHand", WatcherScope.CARD);
}

View file

@ -42,7 +42,7 @@ import mage.watchers.Watcher;
*
* @author nantuko, BetaSteward_at_googlemail.com
*/
public class CastSpellLastTurnWatcher extends Watcher<CastSpellLastTurnWatcher> {
public class CastSpellLastTurnWatcher extends Watcher {
private final Map<UUID, Integer> amountOfSpellsCastOnPrevTurn = new HashMap<>();
private final Map<UUID, Integer> amountOfSpellsCastOnCurrentTurn = new HashMap<>();

View file

@ -48,7 +48,7 @@ import mage.watchers.Watcher;
*
* @author Plopman
*/
public class CommanderCombatDamageWatcher extends Watcher<CommanderCombatDamageWatcher> {
public class CommanderCombatDamageWatcher extends Watcher {
public Map<UUID, Integer> damageToPlayer = new HashMap<UUID, Integer>();

View file

@ -41,7 +41,7 @@ import java.util.UUID;
*
* @author BetaSteward_at_googlemail.com
*/
public class DamagedByWatcher extends Watcher<DamagedByWatcher> {
public class DamagedByWatcher extends Watcher {
public List<UUID> damagedCreatures = new ArrayList<>();

View file

@ -11,7 +11,7 @@ import mage.watchers.Watcher;
* @author BetaSteward_at_googlemail.com
* @author Loki
*/
public class LandfallWatcher extends Watcher<LandfallWatcher> {
public class LandfallWatcher extends Watcher {
public LandfallWatcher() {
super("LandPlayed", WatcherScope.PLAYER);

View file

@ -55,7 +55,7 @@ import mage.watchers.Watcher;
*
* @author noxx
*/
public class MiracleWatcher extends Watcher<MiracleWatcher> {
public class MiracleWatcher extends Watcher {
private final Map<UUID, Integer> amountOfCardsDrawnThisTurn = new HashMap<>();

View file

@ -41,7 +41,7 @@ import mage.watchers.Watcher;
*
* @author BetaSteward_at_googlemail.com
*/
public class MorbidWatcher extends Watcher<MorbidWatcher> {
public class MorbidWatcher extends Watcher {
public MorbidWatcher() {
super("Morbid", WatcherScope.GAME);

View file

@ -42,7 +42,7 @@ import mage.watchers.Watcher;
*
* @author LevelX
*/
public class PlayerDamagedBySourceWatcher extends Watcher<PlayerDamagedBySourceWatcher> {
public class PlayerDamagedBySourceWatcher extends Watcher {
private Set<String> damageSourceIds = new HashSet<String>();

View file

@ -45,7 +45,7 @@ import mage.watchers.Watcher;
*
* @author LevelX2
*/
public class PlayerGainedLifeWatcher extends Watcher<PlayerGainedLifeWatcher> {
public class PlayerGainedLifeWatcher extends Watcher {
private Map<UUID, Integer> amountOfLifeGainedThisTurn = new HashMap<UUID, Integer>();

View file

@ -45,7 +45,7 @@ import mage.watchers.Watcher;
*
* @author LevelX2
*/
public class PlayerLostLifeWatcher extends Watcher<PlayerLostLifeWatcher> {
public class PlayerLostLifeWatcher extends Watcher {
private final Map<UUID, Integer> amountOfLifeLostThisTurn = new HashMap<>();

View file

@ -49,7 +49,7 @@ import mage.watchers.Watcher;
*
* @author LevelX
*/
public class ProwlWatcher extends Watcher<ProwlWatcher> {
public class ProwlWatcher extends Watcher {
private Map<UUID, Set<String>> damagingSubtypes = new HashMap<UUID, Set<String>>();
private Set<UUID> allSubtypes = new HashSet<UUID>();

View file

@ -51,7 +51,7 @@ import mage.watchers.Watcher;
*
* @author noxx
*/
public class SoulbondWatcher extends Watcher<SoulbondWatcher> {
public class SoulbondWatcher extends Watcher {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another not paired creature you control");

View file

@ -42,7 +42,7 @@ import java.util.UUID;
*
* @author jeffwadsworth
*/
public class SourceDidDamageWatcher extends Watcher<SourceDidDamageWatcher> {
public class SourceDidDamageWatcher extends Watcher {
public List<UUID> damageSources = new ArrayList<UUID>();