Replace Overriden getTriggerPhrase() with setTriggerPhrase() usage (#9343)

This commit is contained in:
Alex Vasile 2022-08-08 23:28:46 -04:00 committed by GitHub
parent 188e6dd8c1
commit ebdb6b53a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
406 changed files with 918 additions and 2665 deletions

View file

@ -17,36 +17,34 @@ import mage.game.permanent.Permanent;
*/
public class ZoneChangeTriggeredAbility extends TriggeredAbilityImpl {
protected Zone fromZone;
protected Zone toZone;
protected String rule;
protected final Zone fromZone;
protected final Zone toZone;
public ZoneChangeTriggeredAbility(Zone fromZone, Zone toZone, Effect effect, String rule, boolean optional) {
this(toZone == null ? Zone.ALL : toZone, fromZone, toZone, effect, rule, optional);
public ZoneChangeTriggeredAbility(Zone fromZone, Zone toZone, Effect effect, String triggerPhrase, boolean optional) {
this(toZone == null ? Zone.ALL : toZone, fromZone, toZone, effect, triggerPhrase, optional);
}
public ZoneChangeTriggeredAbility(Zone worksInZone, Zone fromZone, Zone toZone, Effect effect, String rule, boolean optional) {
public ZoneChangeTriggeredAbility(Zone worksInZone, Zone fromZone, Zone toZone, Effect effect, String triggerPhrase, boolean optional) {
super(worksInZone, effect, optional);
if (fromZone == Zone.BATTLEFIELD) {
setLeavesTheBattlefieldTrigger(true);
}
this.fromZone = fromZone;
this.toZone = toZone;
this.rule = rule;
setTriggerPhrase(triggerPhrase);
}
public ZoneChangeTriggeredAbility(Zone toZone, Effect effect, String rule, boolean optional) {
public ZoneChangeTriggeredAbility(Zone toZone, Effect effect, String triggerPhrase, boolean optional) {
super(toZone, effect, optional);
this.fromZone = null;
this.toZone = toZone;
this.rule = rule;
setTriggerPhrase(triggerPhrase);
}
public ZoneChangeTriggeredAbility(final ZoneChangeTriggeredAbility ability) {
super(ability);
this.fromZone = ability.fromZone;
this.toZone = ability.toZone;
this.rule = ability.rule;
}
@Override
@ -65,11 +63,6 @@ public class ZoneChangeTriggeredAbility extends TriggeredAbilityImpl {
return false;
}
@Override
public String getTriggerPhrase() {
return rule ;
}
@Override
public ZoneChangeTriggeredAbility copy() {
return new ZoneChangeTriggeredAbility(this);