refactor: use same naming as original classes (related #12233)

This commit is contained in:
Oleg Agafonov 2024-05-17 09:24:53 +04:00
parent 6fd6417d0b
commit 6e4e52373b

View file

@ -22,19 +22,19 @@ import java.util.List;
*/ */
public class UntilYourNextTurnDelayedTriggeredAbility extends DelayedTriggeredAbility { public class UntilYourNextTurnDelayedTriggeredAbility extends DelayedTriggeredAbility {
private final TriggeredAbility trigger; private final TriggeredAbility ability;
public UntilYourNextTurnDelayedTriggeredAbility(TriggeredAbility trigger) { public UntilYourNextTurnDelayedTriggeredAbility(TriggeredAbility ability) {
super(null, Duration.UntilYourNextTurn); super(null, Duration.UntilYourNextTurn);
if (trigger.isLeavesTheBattlefieldTrigger()) { if (ability.isLeavesTheBattlefieldTrigger()) {
this.setLeavesTheBattlefieldTrigger(true); this.setLeavesTheBattlefieldTrigger(true);
} }
this.trigger = trigger; this.ability = ability;
} }
protected UntilYourNextTurnDelayedTriggeredAbility(final UntilYourNextTurnDelayedTriggeredAbility ability) { protected UntilYourNextTurnDelayedTriggeredAbility(final UntilYourNextTurnDelayedTriggeredAbility ability) {
super(ability); super(ability);
this.trigger = ability.trigger.copy(); this.ability = ability.ability.copy();
} }
@Override @Override
@ -44,63 +44,63 @@ public class UntilYourNextTurnDelayedTriggeredAbility extends DelayedTriggeredAb
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return trigger.checkEventType(event, game); return ability.checkEventType(event, game);
} }
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
trigger.setSourceId(this.getSourceId()); ability.setSourceId(this.getSourceId());
trigger.setControllerId(this.getControllerId()); ability.setControllerId(this.getControllerId());
return trigger.checkTrigger(event, game); return ability.checkTrigger(event, game);
} }
@Override @Override
public String getRule() { public String getRule() {
return "Until your next turn, " + CardUtil.getTextWithFirstCharLowerCase(trigger.getRule()); return "Until your next turn, " + CardUtil.getTextWithFirstCharLowerCase(ability.getRule());
} }
@Override @Override
public Effects getEffects() { public Effects getEffects() {
return trigger.getEffects(); return ability.getEffects();
} }
@Override @Override
public void addEffect(Effect effect) { public void addEffect(Effect effect) {
trigger.addEffect(effect); ability.addEffect(effect);
} }
@Override @Override
public Modes getModes() { public Modes getModes() {
return trigger.getModes(); return ability.getModes();
} }
@Override @Override
public List<Watcher> getWatchers() { public List<Watcher> getWatchers() {
return trigger.getWatchers(); return ability.getWatchers();
} }
@Override @Override
public void addWatcher(Watcher watcher) { public void addWatcher(Watcher watcher) {
trigger.addWatcher(watcher); ability.addWatcher(watcher);
} }
@Override @Override
public Effects getEffects(Game game, EffectType effectType) { public Effects getEffects(Game game, EffectType effectType) {
return trigger.getEffects(game, effectType); return ability.getEffects(game, effectType);
} }
@Override @Override
public boolean isOptional() { public boolean isOptional() {
return trigger.isOptional(); return ability.isOptional();
} }
@Override @Override
public void setSourceObjectZoneChangeCounter(int sourceObjectZoneChangeCounter) { public void setSourceObjectZoneChangeCounter(int sourceObjectZoneChangeCounter) {
trigger.setSourceObjectZoneChangeCounter(sourceObjectZoneChangeCounter); ability.setSourceObjectZoneChangeCounter(sourceObjectZoneChangeCounter);
} }
@Override @Override
public int getSourceObjectZoneChangeCounter() { public int getSourceObjectZoneChangeCounter() {
return trigger.getSourceObjectZoneChangeCounter(); return ability.getSourceObjectZoneChangeCounter();
} }
} }