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

@ -14,7 +14,6 @@ import mage.game.stack.Spell;
import mage.players.Player;
/**
*
* @author North
*/
public class LoseLifeTargetControllerEffect extends OneShotEffect {
@ -31,7 +30,7 @@ public class LoseLifeTargetControllerEffect extends OneShotEffect {
staticText = "Its controller loses " + amount + " life";
}
public LoseLifeTargetControllerEffect(final LoseLifeTargetControllerEffect effect) {
protected LoseLifeTargetControllerEffect(final LoseLifeTargetControllerEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
@ -46,25 +45,25 @@ public class LoseLifeTargetControllerEffect extends OneShotEffect {
MageObject targetCard = targetPointer.getFirstTargetPermanentOrLKI(game, source);
// if target is a countered spell
if ( targetCard == null ) {
if (targetCard == null) {
targetCard = game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.STACK);
}
if ( targetCard != null ) {
if (targetCard != null) {
Player controller = null;
//Handles interaction with permanents that were on the battlefield.
if ( targetCard instanceof Permanent ) {
Permanent targetPermanent = (Permanent)targetCard;
if (targetCard instanceof Permanent) {
Permanent targetPermanent = (Permanent) targetCard;
controller = game.getPlayer(targetPermanent.getControllerId());
}
//Handles interaction with spells that were on the stack.
else if ( targetCard instanceof Spell ) {
Spell targetSpell = (Spell)targetCard;
else if (targetCard instanceof Spell) {
Spell targetSpell = (Spell) targetCard;
controller = game.getPlayer(targetSpell.getControllerId());
}
if ( controller != null ) {
if (controller != null) {
controller.loseLife(amount.calculate(game, source, this), game, source, false);
return true;
}