external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

rem warning,

Browse Source 
replace array with immutable list in Color
This commit is contained in:
Maxmtg
2013-03-16 10:01:18 +00:00
parent 92a63d23d8
commit 92caa7514d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/Color.java
View File

@@ -19,6 +19,8 @@ package forge;
import java.util.EnumSet; import java.util.EnumSet;
import com.google.common.collect.ImmutableList;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.card.mana.ManaCostBeingPaid; import forge.card.mana.ManaCostBeingPaid;
@@ -46,7 +48,7 @@ public enum Color {
/** The Blue. */ /** The Blue. */
Blue(16); Blue(16);
public static final Color[] WUBRG = new Color[] { White, Blue, Black, Red, Green }; public static final ImmutableList<Color> WUBRG = ImmutableList.of( White, Blue, Black, Red, Green );
@SuppressWarnings("unused") @SuppressWarnings("unused")
private int flag = 0; private int flag = 0;
@@ -128,7 +130,7 @@ public enum Color {
final EnumSet<Color> colors = EnumSet.of(Color.Colorless); final EnumSet<Color> colors = EnumSet.of(Color.Colorless);
for( int i = 0; i < MagicColor.NUMBER_OR_COLORS; i++ ) { for( int i = 0; i < MagicColor.NUMBER_OR_COLORS; i++ ) {
if( cc.hasAnyColor(MagicColor.WUBRG[i]) ) if( cc.hasAnyColor(MagicColor.WUBRG[i]) )
colors.add(Color.WUBRG[i]); colors.add(Color.WUBRG.get(i));
} }
if (colors.size() > 1) { if (colors.size() > 1) {
colors.remove(Color.Colorless); colors.remove(Color.Colorless);

1
src/main/java/forge/card/trigger/WrappedAbility.java
View File

@@ -7,7 +7,6 @@ import java.util.Map;
import forge.Card; import forge.Card;
import forge.Singletons; import forge.Singletons;
import forge.card.ability.AbilityFactory;
import forge.card.ability.ApiType; import forge.card.ability.ApiType;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;