Code cleanup: protect all copy constructors (#10750)

* apply regex to change public copy constructors to protected
* cleanup code using now protected constructors
* fix manaBuilder weird casting of Mana into ConditionalMana
This commit is contained in:
Susucre 2023-08-05 01:34:58 +02:00 committed by GitHub
parent b04b13d530
commit f75b1c9f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1565 changed files with 2412 additions and 2731 deletions

View file

@ -13,7 +13,6 @@ import mage.game.events.GameEvent.EventType;
import mage.players.Player;
/**
*
* @author LevelX2
*/
public abstract class PayCostToAttackBlockEffectImpl extends ReplacementEffectImpl implements PayCostToAttackBlockEffect {
@ -53,14 +52,13 @@ public abstract class PayCostToAttackBlockEffectImpl extends ReplacementEffectIm
if (cost instanceof ManaCosts) {
this.cost = null;
this.manaCosts = (ManaCosts) cost;
}
else {
} else {
this.cost = cost;
this.manaCosts = null;
}
}
public PayCostToAttackBlockEffectImpl(final PayCostToAttackBlockEffectImpl effect) {
protected PayCostToAttackBlockEffectImpl(final PayCostToAttackBlockEffectImpl effect) {
super(effect);
if (effect.cost != null) {
this.cost = effect.cost.copy();
@ -130,7 +128,7 @@ public abstract class PayCostToAttackBlockEffectImpl extends ReplacementEffectIm
attackBlockOtherTax.clearPaid();
if (attackBlockOtherTax.canPay(source, source, event.getPlayerId(), game)
&& player.chooseUse(Outcome.Neutral,
attackBlockOtherTax.getText() + " to " + (event.getType() == GameEvent.EventType.DECLARE_ATTACKER ? "attack?" : "block?"), source, game)) {
attackBlockOtherTax.getText() + " to " + (event.getType() == GameEvent.EventType.DECLARE_ATTACKER ? "attack?" : "block?"), source, game)) {
if (attackBlockOtherTax.pay(source, game, source, event.getPlayerId(), false, null)) {
return false;
}