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

cleanup to use ObjectColor.COLORLESS (#10447)

Browse source 
* Replace for BecomesColorSourceEffect

* Replace for BecomesColorTargetEffect

* Remove unused class

* Use common static instance
This commit is contained in:
xenohedron 2023-06-11 23:36:01 -04:00 • committed by GitHub
parent 7b2f6b3d46
commit 2cdfb255cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 23 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/game/command/Dungeon.java
View file

@ -45,7 +45,6 @@ public class Dungeon extends CommandObjectImpl {
}
private static final List<CardType> cardTypes = Collections.unmodifiableList(Arrays.asList(CardType.DUNGEON));
private static final ObjectColor emptyColor = new ObjectColor();
private static final ManaCosts<ManaCost> emptyCost = new ManaCostsImpl<>();
private UUID controllerId;
@ -238,17 +237,17 @@ public class Dungeon extends CommandObjectImpl {
@Override
public ObjectColor getColor() {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override
public ObjectColor getColor(Game game) {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override
public ObjectColor getFrameColor(Game game) {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override

7
Mage/src/main/java/mage/game/command/Emblem.java
View file

@ -30,7 +30,6 @@ import java.util.UUID;
*/
public abstract class Emblem extends CommandObjectImpl {
private static final ObjectColor emptyColor = new ObjectColor();
private static final ManaCosts emptyCost = new ManaCostsImpl<>();
private UUID controllerId;
@ -153,17 +152,17 @@ public abstract class Emblem extends CommandObjectImpl {
@Override
public ObjectColor getColor() {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override
public ObjectColor getColor(Game game) {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override
public ObjectColor getFrameColor(Game game) {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override

7
Mage/src/main/java/mage/game/command/Plane.java
View file

@ -33,7 +33,6 @@ import java.util.UUID;
*/
public abstract class Plane extends CommandObjectImpl {
private static final ObjectColor emptyColor = new ObjectColor();
private static final ManaCosts emptyCost = new ManaCostsImpl<>();
private Planes planeType = null;
@ -178,17 +177,17 @@ public abstract class Plane extends CommandObjectImpl {
@Override
public ObjectColor getColor() {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override
public ObjectColor getColor(Game game) {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override
public ObjectColor getFrameColor(Game game) {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override

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

@ -45,7 +45,6 @@ public class StackAbility extends StackObjectImpl implements Ability {
private static final List<CardType> emptyCardType = Collections.unmodifiableList(new ArrayList<>());
private static final List<String> emptyString = Collections.unmodifiableList(new ArrayList<>());
private static final ObjectColor emptyColor = new ObjectColor();
private static final ManaCosts<ManaCost> emptyCost = new ManaCostsImpl<>();
private static final Costs<Cost> emptyCosts = new CostsImpl<>();
private static final Abilities<Ability> emptyAbilites = new AbilitiesImpl<>();
@ -223,12 +222,12 @@ public class StackAbility extends StackObjectImpl implements Ability {
@Override
public ObjectColor getColor() {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override
public ObjectColor getColor(Game game) {
return emptyColor;
return ObjectColor.COLORLESS;
}
@Override