From 3feb2017d3e3e729acc7e1b411132c105b690fc5 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 23 Mar 2021 20:43:16 -0400 Subject: [PATCH] removed unnecessary overrides of adjustTargets and adjustCosts --- Mage/src/main/java/mage/MageObjectImpl.java | 6 +++-- Mage/src/main/java/mage/cards/CardImpl.java | 24 ------------------- .../mage/game/permanent/PermanentCard.java | 24 ------------------- .../mage/game/permanent/PermanentToken.java | 18 -------------- 4 files changed, 4 insertions(+), 68 deletions(-) diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index 4673d1f1607..d6c50fd6795 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -241,11 +241,13 @@ public abstract class MageObjectImpl implements MageObject { } @Override - public void adjustCosts(Ability ability, Game game) { + public final void adjustCosts(Ability ability, Game game) { + ability.adjustCosts(game); } @Override - public void adjustTargets(Ability ability, Game game) { + public final void adjustTargets(Ability ability, Game game) { + ability.adjustTargets(game); } @Override diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index 8b769adeacc..f3321519121 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -367,30 +367,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { return spellAbility; } - /** - * Dynamic cost modification for card (process only own abilities). Example: - * if it need stack related info (like real targets) then must check two - * states (game.inCheckPlayableState): - *

- * 1. In playable state it must check all possible use cases (e.g. allow to - * reduce on any available target and modes) - *

- * 2. In real cast state it must check current use case (e.g. real selected - * targets and modes) - * - * @param ability - * @param game - */ - @Override - public void adjustCosts(Ability ability, Game game) { - ability.adjustCosts(game); - } - - @Override - public void adjustTargets(Ability ability, Game game) { - ability.adjustTargets(game); - } - @Override public void setOwnerId(UUID ownerId) { this.ownerId = ownerId; diff --git a/Mage/src/main/java/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java index 3366c8784e6..54efa8c9cc2 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -174,30 +174,6 @@ public class PermanentCard extends PermanentImpl { return false; } - @Override - public void adjustTargets(Ability ability, Game game) { - if (this.isTransformed() && card.getSecondCardFace() != null) { - card.getSecondCardFace().adjustTargets(ability, game); - } else { - if (this.isCopy()) { - // if COPIED card have adjuster then it's must be called instead own -- see OathOfLieges tests - // raise null error on wrong copy - this.getCopyFrom().adjustTargets(ability, game); - } else { - card.adjustTargets(ability, game); - } - } - } - - @Override - public void adjustCosts(Ability ability, Game game) { - if (this.isTransformed() && card.getSecondCardFace() != null) { - card.getSecondCardFace().adjustCosts(ability, game); - } else { - card.adjustCosts(ability, game); - } - } - @Override public ManaCosts getManaCost() { if (faceDown) { // face down permanent has always {0} mana costs diff --git a/Mage/src/main/java/mage/game/permanent/PermanentToken.java b/Mage/src/main/java/mage/game/permanent/PermanentToken.java index a0d755bec9e..49c6294e9ca 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentToken.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentToken.java @@ -102,24 +102,6 @@ public class PermanentToken extends PermanentImpl { return new PermanentToken(this); } - @Override - public void adjustTargets(Ability ability, Game game) { - if (getToken().getCopySourceCard() != null) { - getToken().getCopySourceCard().adjustTargets(ability, game); - } else { - super.adjustTargets(ability, game); - } - } - - @Override - public void adjustCosts(Ability ability, Game game) { - if (getToken().getCopySourceCard() != null) { - getToken().getCopySourceCard().adjustCosts(ability, game); - } else { - super.adjustCosts(ability, game); - } - } - @Override public void updateZoneChangeCounter(Game game, ZoneChangeEvent event) { // token must change zcc on enters to battlefield (like cards do with stack),