External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix latest cards from master

Browse source
This commit is contained in:
Ingmar Goudt 2019-12-29 23:08:47 +01:00
parent 998c3be2a5
commit ee71495a3f
17 changed files with 0 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/cards/b/BellowingElk.java
View file

@ -76,11 +76,6 @@ class BellowingElkWatcher extends Watcher {
super(WatcherScope.GAME);
}
private BellowingElkWatcher(final BellowingElkWatcher watcher) {
super(watcher);
this.playerMap.putAll(watcher.playerMap);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
@ -102,10 +97,5 @@ class BellowingElkWatcher extends Watcher {
Set<UUID> s = playerMap.getOrDefault(playerId, null);
return s != null && s.stream().anyMatch((UUID id) -> (id != creatureId));
}
@Override
public BellowingElkWatcher copy() {
return new BellowingElkWatcher(this);
}
}
// I'm not THAT loud...

10
Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java
View file

@ -140,11 +140,6 @@ class ChainerNightmareAdeptWatcher extends Watcher {
super(WatcherScope.CARD);
}
ChainerNightmareAdeptWatcher(final ChainerNightmareAdeptWatcher watcher) {
super(watcher);
this.abilityUsed = watcher.abilityUsed;
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) {
@ -155,11 +150,6 @@ class ChainerNightmareAdeptWatcher extends Watcher {
}
}
@Override
public ChainerNightmareAdeptWatcher copy() {
return new ChainerNightmareAdeptWatcher(this);
}
@Override
public void reset() {
super.reset();

12
Mage.Sets/src/mage/cards/d/DeafeningSilence.java
View file

@ -92,13 +92,6 @@ class DeafeningSilenceWatcher extends Watcher {
super(WatcherScope.GAME);
}
private DeafeningSilenceWatcher(final DeafeningSilenceWatcher watcher) {
super(watcher);
for (Map.Entry<UUID, Integer> entry : watcher.spellsCastByPlayerThisTurnNonCreature.entrySet()) {
spellsCastByPlayerThisTurnNonCreature.put(entry.getKey(), entry.getValue());
}
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != GameEvent.EventType.SPELL_CAST) {
@ -125,9 +118,4 @@ class DeafeningSilenceWatcher extends Watcher {
public int spellsCastByPlayerThisTurnNonCreature(UUID playerId) {
return spellsCastByPlayerThisTurnNonCreature.getOrDefault(playerId, 0);
}
@Override
public DeafeningSilenceWatcher copy() {
return new DeafeningSilenceWatcher(this);
}
}

10
Mage.Sets/src/mage/cards/g/GadwickTheWizened.java
View file

@ -109,11 +109,6 @@ class GadwickTheWizenedWatcher extends Watcher {
super(WatcherScope.GAME);
}
private GadwickTheWizenedWatcher(final GadwickTheWizenedWatcher watcher) {
super(watcher);
this.xMap.putAll(watcher.xMap);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != GameEvent.EventType.SPELL_CAST) {
@ -128,11 +123,6 @@ class GadwickTheWizenedWatcher extends Watcher {
), spell.getSpellAbility().getManaCostsToPay().getX());
}
@Override
public GadwickTheWizenedWatcher copy() {
return new GadwickTheWizenedWatcher(this);
}
@Override
public void reset() {
super.reset();

10
Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java
View file

@ -98,11 +98,6 @@ class GerrardWeatherlightHeroWatcher extends Watcher {
super(WatcherScope.GAME);
}
private GerrardWeatherlightHeroWatcher(final GerrardWeatherlightHeroWatcher watcher) {
super(watcher);
this.cards.addAll(watcher.cards);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE
@ -118,11 +113,6 @@ class GerrardWeatherlightHeroWatcher extends Watcher {
return cards.stream().anyMatch(mageObjectReference -> mageObjectReference.refersTo(card, game));
}
@Override
public GerrardWeatherlightHeroWatcher copy() {
return new GerrardWeatherlightHeroWatcher(this);
}
@Override
public void reset() {
super.reset();

10
Mage.Sets/src/mage/cards/i/IdolOfOblivion.java
View file

@ -81,11 +81,6 @@ class IdolOfOblivionWatcher extends Watcher {
super(WatcherScope.GAME);
}
private IdolOfOblivionWatcher(final IdolOfOblivionWatcher watcher) {
super(watcher);
playerIds.addAll(watcher.playerIds);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
@ -102,11 +97,6 @@ class IdolOfOblivionWatcher extends Watcher {
playerIds.clear();
}
@Override
public IdolOfOblivionWatcher copy() {
return new IdolOfOblivionWatcher(this);
}
boolean tokenEntered(UUID playerId) {
return playerIds.contains(playerId);
}

10
Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java
View file

@ -96,12 +96,6 @@ class KadenaSlinkingSorcererWatcher extends Watcher {
castFaceDown = new HashSet<>();
}
private KadenaSlinkingSorcererWatcher(final KadenaSlinkingSorcererWatcher watcher) {
super(watcher);
this.castFaceDown = new HashSet<>();
castFaceDown.addAll(watcher.castFaceDown);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != GameEvent.EventType.SPELL_CAST) {
@ -118,10 +112,6 @@ class KadenaSlinkingSorcererWatcher extends Watcher {
return castFaceDown.contains(playerId);
}
@Override
public KadenaSlinkingSorcererWatcher copy() {
return new KadenaSlinkingSorcererWatcher(this);
}
@Override
public void reset() {

10
Mage.Sets/src/mage/cards/o/OnceUponATime.java
View file

@ -83,16 +83,6 @@ class OnceUponATimeWatcher extends Watcher {
super(WatcherScope.GAME);
}
private OnceUponATimeWatcher(final OnceUponATimeWatcher watcher) {
super(watcher);
this.castSpells.addAll(watcher.castSpells);
}
@Override
public OnceUponATimeWatcher copy() {
return new OnceUponATimeWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (GameEvent.EventType.SPELL_CAST == event.getType()) {

9
Mage.Sets/src/mage/cards/r/RobberOfTheRich.java
View file

@ -216,15 +216,6 @@ class RobberOfTheRichWatcher extends Watcher {
super(WatcherScope.GAME);
}
private RobberOfTheRichWatcher(final RobberOfTheRichWatcher watcher) {
super(watcher);
this.rogueAttackers.addAll(watcher.rogueAttackers);
}
@Override
public RobberOfTheRichWatcher copy() {
return new RobberOfTheRichWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {

10
Mage.Sets/src/mage/cards/s/SaddledRimestag.java
View file

@ -70,11 +70,6 @@ class SaddledRimestagWatcher extends Watcher {
super(WatcherScope.GAME);
}
private SaddledRimestagWatcher(final SaddledRimestagWatcher watcher) {
super(watcher);
this.playerMap.putAll(watcher.playerMap);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
@ -96,9 +91,4 @@ class SaddledRimestagWatcher extends Watcher {
Set<UUID> s = playerMap.getOrDefault(playerId, null);
return s != null && s.stream().anyMatch((UUID id) -> (id != creatureId));
}
@Override
public SaddledRimestagWatcher copy() {
return new SaddledRimestagWatcher(this);
}
}

9
Mage.Sets/src/mage/cards/s/SevinneTheChronoclasm.java
View file

@ -97,11 +97,6 @@ class SevinneTheChronoclasmWatcher extends Watcher {
super(WatcherScope.GAME);
}
private SevinneTheChronoclasmWatcher(final SevinneTheChronoclasmWatcher watcher) {
super(watcher);
this.firstSpellThisTurn.putAll(watcher.firstSpellThisTurn);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != GameEvent.EventType.SPELL_CAST
@ -123,8 +118,4 @@ class SevinneTheChronoclasmWatcher extends Watcher {
return targetId != null && targetId.equals(firstSpellThisTurn.getOrDefault(playerId, null));
}
@Override
public Watcher copy() {
return new SevinneTheChronoclasmWatcher(this);
}
}

10
Mage.Sets/src/mage/cards/s/SilumgarScavenger.java
View file

@ -78,16 +78,6 @@ class SilumgarScavengerExploitedWatcher extends Watcher {
super(WatcherScope.GAME);
}
private SilumgarScavengerExploitedWatcher(final SilumgarScavengerExploitedWatcher watcher) {
super(watcher);
this.exploitedPermanents.putAll(watcher.exploitedPermanents);
}
@Override
public SilumgarScavengerExploitedWatcher copy() {
return new SilumgarScavengerExploitedWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.EXPLOITED_CREATURE) {

10
Mage.Sets/src/mage/cards/v/VeilOfSummer.java
View file

@ -75,16 +75,6 @@ class VeilOfSummerWatcher extends Watcher {
super(WatcherScope.GAME);
}
private VeilOfSummerWatcher(final VeilOfSummerWatcher watcher) {
super(watcher);
this.opponentsCastBlueBlackSpell.addAll(watcher.opponentsCastBlueBlackSpell);
}
@Override
public VeilOfSummerWatcher copy() {
return new VeilOfSummerWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (GameEvent.EventType.SPELL_CAST == event.getType()) {

10
Mage.Sets/src/mage/cards/v/VengefulWarchief.java
View file

@ -88,11 +88,6 @@ class VengefulWarchiefWatcher extends Watcher {
super(WatcherScope.GAME);
}
private VengefulWarchiefWatcher(final VengefulWarchiefWatcher watcher) {
super(watcher);
this.playersLostLife.putAll(watcher.playersLostLife);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.LOST_LIFE) {
@ -102,11 +97,6 @@ class VengefulWarchiefWatcher extends Watcher {
}
}
@Override
public VengefulWarchiefWatcher copy() {
return new VengefulWarchiefWatcher(this);
}
@Override
public void reset() {
super.reset();

9
Mage.Sets/src/mage/cards/z/ZhalfirinDecoy.java
View file

@ -76,11 +76,6 @@ class ZhalfirinDecoyWatcher extends Watcher {
super(WatcherScope.GAME);
}
private ZhalfirinDecoyWatcher(final ZhalfirinDecoyWatcher watcher) {
super(watcher);
this.players.addAll(watcher.players);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
@ -101,8 +96,4 @@ class ZhalfirinDecoyWatcher extends Watcher {
return players.contains(playerId);
}
@Override
public ZhalfirinDecoyWatcher copy() {
return new ZhalfirinDecoyWatcher(this);
}
}

10
Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java
View file

@ -21,11 +21,6 @@ public class CardsDrawnThisTurnWatcher extends Watcher {
super(WatcherScope.GAME);
}
private CardsDrawnThisTurnWatcher(final CardsDrawnThisTurnWatcher watcher) {
super(watcher);
this.cardsDrawnThisTurn.putAll(watcher.cardsDrawnThisTurn);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.DREW_CARD) {
@ -44,9 +39,4 @@ public class CardsDrawnThisTurnWatcher extends Watcher {
cardsDrawnThisTurn.clear();
}
@Override
public CardsDrawnThisTurnWatcher copy() {
return new CardsDrawnThisTurnWatcher(this);
}
}

10
Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java
View file

@ -26,16 +26,6 @@ public class CommanderPlaysCountWatcher extends Watcher {
super(WatcherScope.GAME);
}
public CommanderPlaysCountWatcher(final CommanderPlaysCountWatcher watcher) {
super(watcher);
this.playsCount.putAll(watcher.playsCount);
}
@Override
public CommanderPlaysCountWatcher copy() {
return new CommanderPlaysCountWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != EventType.LAND_PLAYED && event.getType() != EventType.SPELL_CAST) {