Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Code cleanup: protect all copy constructors (#10750)

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/game/stack/Spell.java
View file

@ -109,7 +109,7 @@ public class Spell extends StackObjectImpl implements Card {
this.countered = false;
}
public Spell(final Spell spell) {
protected Spell(final Spell spell) {
this.id = spell.id;
this.zoneChangeCounter = spell.zoneChangeCounter;
for (SpellAbility spellAbility : spell.spellAbilities) {
@ -1131,8 +1131,9 @@ public class Spell extends StackObjectImpl implements Card {
/**
* Add temporary turn controller while resolving (e.g. all choices will be made by another player)
* Example: Word of Command
*
* @param newTurnControllerId
* @param info additional info for game logs
* @param info additional info for game logs
*/
public void setCommandedBy(UUID newTurnControllerId, String info) {
this.commandedByPlayerId = newTurnControllerId;

4
Mage/src/main/java/mage/game/stack/SpellStack.java
View file

@ -4,6 +4,7 @@ package mage.game.stack;
import java.util.ArrayDeque;
import java.util.Date;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.constants.PutCards;
@ -13,7 +14,6 @@ import mage.util.CardUtil;
import org.apache.log4j.Logger;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class SpellStack extends ArrayDeque<StackObject> {
@ -25,7 +25,7 @@ public class SpellStack extends ArrayDeque<StackObject> {
public SpellStack() {
}
public SpellStack(final SpellStack stack) {
protected SpellStack(final SpellStack stack) {
for (StackObject spell : stack) {
this.addLast(spell.copy());

2
Mage/src/main/java/mage/game/stack/StackAbility.java
View file

@ -64,7 +64,7 @@ public class StackAbility extends StackObjectImpl implements Ability {
this.name = "stack ability (" + ability.getRule() + ')';
}
public StackAbility(final StackAbility stackAbility) {
protected StackAbility(final StackAbility stackAbility) {
super();
this.ability = stackAbility.ability.copy();
this.controllerId = stackAbility.controllerId;