From 2d24f067f3b2bc50f06b2dffd5016ebd5f19a922 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sun, 1 Oct 2023 22:50:28 -0400 Subject: [PATCH] cleanup some superfluous overrides (#11243) --- .../src/mage/cards/h/HiddenPredators.java | 25 -------- .../src/mage/cards/l/LurkingJackals.java | 25 -------- Mage.Sets/src/mage/cards/o/OpalAvenger.java | 25 -------- .../src/mage/cards/s/SynodCenturion.java | 60 +++++++++---------- .../src/mage/cards/v/VeiledCrocodile.java | 25 -------- .../mage/abilities/StateTriggeredAbility.java | 2 +- 6 files changed, 29 insertions(+), 133 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/HiddenPredators.java b/Mage.Sets/src/mage/cards/h/HiddenPredators.java index cb7f2f9c7d0..330f9892bab 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenPredators.java +++ b/Mage.Sets/src/mage/cards/h/HiddenPredators.java @@ -73,31 +73,6 @@ class HiddenPredatorsStateTriggeredAbility extends StateTriggeredAbility { return false; } - @Override - public boolean canTrigger(Game game) { - //20100716 - 603.8 - return !Boolean.TRUE.equals(game.getState().getValue(getSourceId().toString() + "triggered")); - } - - @Override - public void trigger(Game game, UUID controllerId, GameEvent triggeringEvent) { - //20100716 - 603.8 - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.TRUE); - super.trigger(game, controllerId, triggeringEvent); - } - - @Override - public boolean resolve(Game game) { - //20100716 - 603.8 - boolean result = super.resolve(game); - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - return result; - } - - @Override - public void counter(Game game) { - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - } } class HiddenPredatorsToken extends TokenImpl { diff --git a/Mage.Sets/src/mage/cards/l/LurkingJackals.java b/Mage.Sets/src/mage/cards/l/LurkingJackals.java index d21f0b5866c..a841e261389 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingJackals.java +++ b/Mage.Sets/src/mage/cards/l/LurkingJackals.java @@ -74,31 +74,6 @@ class LurkingJackalsStateTriggeredAbility extends StateTriggeredAbility { return false; } - @Override - public boolean canTrigger(Game game) { - //20100716 - 603.8 - return !Boolean.TRUE.equals(game.getState().getValue(getSourceId().toString() + "triggered")); - } - - @Override - public void trigger(Game game, UUID controllerId, GameEvent triggeringEvent) { - //20100716 - 603.8 - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.TRUE); - super.trigger(game, controllerId, triggeringEvent); - } - - @Override - public boolean resolve(Game game) { - //20100716 - 603.8 - boolean result = super.resolve(game); - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - return result; - } - - @Override - public void counter(Game game) { - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - } } class LurkingJackalsToken extends TokenImpl { diff --git a/Mage.Sets/src/mage/cards/o/OpalAvenger.java b/Mage.Sets/src/mage/cards/o/OpalAvenger.java index 3c92aa8fede..4979139b49b 100644 --- a/Mage.Sets/src/mage/cards/o/OpalAvenger.java +++ b/Mage.Sets/src/mage/cards/o/OpalAvenger.java @@ -70,31 +70,6 @@ class OpalAvengerStateTriggeredAbility extends StateTriggeredAbility { return false; } - @Override - public boolean canTrigger(Game game) { - //20100716 - 603.8 - return !Boolean.TRUE.equals(game.getState().getValue(getSourceId().toString() + "triggered")); - } - - @Override - public void trigger(Game game, UUID controllerId, GameEvent triggeringEvent) { - //20100716 - 603.8 - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.TRUE); - super.trigger(game, controllerId, triggeringEvent); - } - - @Override - public boolean resolve(Game game) { - //20100716 - 603.8 - boolean result = super.resolve(game); - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - return result; - } - - @Override - public void counter(Game game) { - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - } } class OpalAvengerToken extends TokenImpl { diff --git a/Mage.Sets/src/mage/cards/s/SynodCenturion.java b/Mage.Sets/src/mage/cards/s/SynodCenturion.java index e49ec910a74..9fabfd9f72c 100644 --- a/Mage.Sets/src/mage/cards/s/SynodCenturion.java +++ b/Mage.Sets/src/mage/cards/s/SynodCenturion.java @@ -1,4 +1,3 @@ - package mage.cards.s; import java.util.UUID; @@ -40,35 +39,32 @@ public final class SynodCenturion extends CardImpl { return new SynodCenturion(this); } - class SynodCenturionStateTriggeredAbility extends StateTriggeredAbility { - - public SynodCenturionStateTriggeredAbility() { - super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); - } - - private SynodCenturionStateTriggeredAbility(final SynodCenturionStateTriggeredAbility ability) { - super(ability); - } - - @Override - public SynodCenturionStateTriggeredAbility copy() { - return new SynodCenturionStateTriggeredAbility(this); - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - for (Permanent perm : game.getBattlefield().getAllActivePermanents(controllerId)) { - if (!perm.getId().equals(this.getSourceId()) && perm.isArtifact(game)) { - return false; - } - } - return true; - } - - @Override - public String getRule() { - return "When you control no other artifacts, sacrifice {this}."; - } - - } +} + +class SynodCenturionStateTriggeredAbility extends StateTriggeredAbility { + + SynodCenturionStateTriggeredAbility() { + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); + setTriggerPhrase("When you control no other artifacts, "); + } + + private SynodCenturionStateTriggeredAbility(final SynodCenturionStateTriggeredAbility ability) { + super(ability); + } + + @Override + public SynodCenturionStateTriggeredAbility copy() { + return new SynodCenturionStateTriggeredAbility(this); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + for (Permanent perm : game.getBattlefield().getAllActivePermanents(controllerId)) { + if (!perm.getId().equals(this.getSourceId()) && perm.isArtifact(game)) { + return false; + } + } + return true; + } + } diff --git a/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java b/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java index 4027007844f..1672b591c39 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java +++ b/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java @@ -75,31 +75,6 @@ class VeiledCrocodileStateTriggeredAbility extends StateTriggeredAbility { return false; } - @Override - public boolean canTrigger(Game game) { - //20100716 - 603.8 - return !Boolean.TRUE.equals(game.getState().getValue(getSourceId().toString() + "triggered")); - } - - @Override - public void trigger(Game game, UUID controllerId, GameEvent triggeringEvent) { - //20100716 - 603.8 - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.TRUE); - super.trigger(game, controllerId, triggeringEvent); - } - - @Override - public boolean resolve(Game game) { - //20100716 - 603.8 - boolean result = super.resolve(game); - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - return result; - } - - @Override - public void counter(Game game) { - game.getState().setValue(this.getSourceId().toString() + "triggered", Boolean.FALSE); - } } class VeilCrocodileToken extends TokenImpl { diff --git a/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java b/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java index d3e9f83ea14..282f93e9e5e 100644 --- a/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java @@ -21,7 +21,7 @@ import java.util.UUID; */ public abstract class StateTriggeredAbility extends TriggeredAbilityImpl { - public StateTriggeredAbility(Zone zone, Effect effect) { + protected StateTriggeredAbility(Zone zone, Effect effect) { super(zone, effect); }