cleanup some superfluous overrides (#11243)

This commit is contained in:
xenohedron 2023-10-01 22:50:28 -04:00 committed by GitHub
parent bfbdf6b103
commit 2d24f067f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 133 deletions

View file

@ -73,31 +73,6 @@ class HiddenPredatorsStateTriggeredAbility extends StateTriggeredAbility {
return false; 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 { class HiddenPredatorsToken extends TokenImpl {

View file

@ -74,31 +74,6 @@ class LurkingJackalsStateTriggeredAbility extends StateTriggeredAbility {
return false; 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 { class LurkingJackalsToken extends TokenImpl {

View file

@ -70,31 +70,6 @@ class OpalAvengerStateTriggeredAbility extends StateTriggeredAbility {
return false; 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 { class OpalAvengerToken extends TokenImpl {

View file

@ -1,4 +1,3 @@
package mage.cards.s; package mage.cards.s;
import java.util.UUID; import java.util.UUID;
@ -40,35 +39,32 @@ public final class SynodCenturion extends CardImpl {
return new SynodCenturion(this); return new SynodCenturion(this);
} }
class SynodCenturionStateTriggeredAbility extends StateTriggeredAbility { }
public SynodCenturionStateTriggeredAbility() { class SynodCenturionStateTriggeredAbility extends StateTriggeredAbility {
super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
} SynodCenturionStateTriggeredAbility() {
super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
private SynodCenturionStateTriggeredAbility(final SynodCenturionStateTriggeredAbility ability) { setTriggerPhrase("When you control no other artifacts, ");
super(ability); }
}
private SynodCenturionStateTriggeredAbility(final SynodCenturionStateTriggeredAbility ability) {
@Override super(ability);
public SynodCenturionStateTriggeredAbility copy() { }
return new SynodCenturionStateTriggeredAbility(this);
} @Override
public SynodCenturionStateTriggeredAbility copy() {
@Override return new SynodCenturionStateTriggeredAbility(this);
public boolean checkTrigger(GameEvent event, Game game) { }
for (Permanent perm : game.getBattlefield().getAllActivePermanents(controllerId)) {
if (!perm.getId().equals(this.getSourceId()) && perm.isArtifact(game)) { @Override
return false; public boolean checkTrigger(GameEvent event, Game game) {
} for (Permanent perm : game.getBattlefield().getAllActivePermanents(controllerId)) {
} if (!perm.getId().equals(this.getSourceId()) && perm.isArtifact(game)) {
return true; return false;
} }
}
@Override return true;
public String getRule() { }
return "When you control no other artifacts, sacrifice {this}.";
}
}
} }

View file

@ -75,31 +75,6 @@ class VeiledCrocodileStateTriggeredAbility extends StateTriggeredAbility {
return false; 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 { class VeilCrocodileToken extends TokenImpl {

View file

@ -21,7 +21,7 @@ import java.util.UUID;
*/ */
public abstract class StateTriggeredAbility extends TriggeredAbilityImpl { public abstract class StateTriggeredAbility extends TriggeredAbilityImpl {
public StateTriggeredAbility(Zone zone, Effect effect) { protected StateTriggeredAbility(Zone zone, Effect effect) {
super(zone, effect); super(zone, effect);
} }