Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change getColorFlags(game) to getColorFlags()

master
melvin 2012-06-03 17:26:44 +08:00
parent 47570b3990
commit 3df113791d
28 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/magic/card/Amphibious_Kavu.java
View File

@ -17,7 +17,7 @@ public class Amphibious_Kavu {
final MagicPermanentList plist = permanent.getBlockingCreatures();
boolean pump = false;
for (final MagicPermanent blocker : plist) {
final int colorFlags = blocker.getColorFlags(game);
final int colorFlags = blocker.getColorFlags();
if (MagicColor.Blue.hasColor(colorFlags) ||
MagicColor.Black.hasColor(colorFlags)) {
pump = true;
@ -54,8 +54,8 @@ public class Amphibious_Kavu {
final MagicPermanent blocked = permanent.getBlockedCreature();
return (permanent == data &&
blocked.isValid() &&
(MagicColor.Blue.hasColor(blocked.getColorFlags(game)) ||
MagicColor.Black.hasColor(blocked.getColorFlags(game)))) ?
(MagicColor.Blue.hasColor(blocked.getColorFlags()) ||
MagicColor.Black.hasColor(blocked.getColorFlags()))) ?
new MagicEvent(
permanent,
permanent.getController(),

2
src/magic/card/Angel_s_Feather.java
View File

@ -18,7 +18,7 @@ public class Angel_s_Feather {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player = permanent.getController();
final MagicCard card = data.getCard();
return (MagicColor.White.hasColor(card.getColorFlags(game))) ?
return (MagicColor.White.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

4
src/magic/card/Balefire_Liege.java
View File

@ -48,7 +48,7 @@ public class Balefire_Liege {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player=permanent.getController();
final MagicCard card=data.getCard();
return (card.getOwner()==player&&MagicColor.Red.hasColor(card.getColorFlags(game))) ?
return (card.getOwner()==player&&MagicColor.Red.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,
@ -78,7 +78,7 @@ public class Balefire_Liege {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player=permanent.getController();
final MagicCard card=data.getCard();
return (card.getOwner()==player&&MagicColor.White.hasColor(card.getColorFlags(game))) ?
return (card.getOwner()==player&&MagicColor.White.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

2
src/magic/card/Bant_Sureblade.java
View File

@ -11,7 +11,7 @@ import magic.model.mstatic.MagicStatic;
public class Bant_Sureblade {
static boolean isValid(final MagicPermanent owner, final MagicGame game) {
for (final MagicPermanent permanent : owner.getController().getPermanents()) {
if (permanent != owner && MagicColor.isMulti(permanent.getColorFlags(game))) {
if (permanent != owner && MagicColor.isMulti(permanent.getColorFlags())) {
return true;
}
}

4
src/magic/card/Deathbringer_Liege.java
View File

@ -50,7 +50,7 @@ public class Deathbringer_Liege {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player=permanent.getController();
final MagicCard card=data.getCard();
return (card.getOwner()==player&&MagicColor.Black.hasColor(card.getColorFlags(game))) ?
return (card.getOwner()==player&&MagicColor.Black.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,
@ -83,7 +83,7 @@ public class Deathbringer_Liege {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player=permanent.getController();
final MagicCard card=data.getCard();
return (card.getOwner()==player&&MagicColor.White.hasColor(card.getColorFlags(game))) ?
return (card.getOwner()==player&&MagicColor.White.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

4
src/magic/card/Deathgazer.java
View File

@ -17,7 +17,7 @@ public class Deathgazer {
if (creature == permanent) {
final MagicPermanentList plist = new MagicPermanentList();
for (final MagicPermanent blocker : permanent.getBlockingCreatures()) {
final int colorFlags = blocker.getColorFlags(game);
final int colorFlags = blocker.getColorFlags();
if (!MagicColor.Black.hasColor(colorFlags)) {
plist.add(blocker);
}
@ -55,7 +55,7 @@ public class Deathgazer {
final MagicPermanent blocked = permanent.getBlockedCreature();
return (permanent == data &&
blocked.isValid() &&
!MagicColor.Black.hasColor(blocked.getColorFlags(game))) ?
!MagicColor.Black.hasColor(blocked.getColorFlags())) ?
new MagicEvent(
permanent,
permanent.getController(),

2
src/magic/card/Demon_s_Horn.java
View File

@ -19,7 +19,7 @@ public class Demon_s_Horn {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player = permanent.getController();
final MagicCard card = data.getCard();
return (MagicColor.Black.hasColor(card.getColorFlags(game))) ?
return (MagicColor.Black.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

2
src/magic/card/Dragon_s_Claw.java
View File

@ -18,7 +18,7 @@ public class Dragon_s_Claw {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player = permanent.getController();
final MagicCard card = data.getCard();
return (MagicColor.Red.hasColor(card.getColorFlags(game))) ?
return (MagicColor.Red.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

2
src/magic/card/Dromar__the_Banisher.java
View File

@ -47,7 +47,7 @@ public class Dromar__the_Banisher {
game.filterTargets((MagicPlayer)data[0],MagicTargetFilter.TARGET_CREATURE);
for (final MagicTarget target : targets) {
final MagicPermanent creature=(MagicPermanent)target;
if (color.hasColor(creature.getColorFlags(game))) {
if (color.hasColor(creature.getColorFlags())) {
game.doAction(new MagicRemoveFromPlayAction(creature,MagicLocationType.OwnersHand));
}
}

2
src/magic/card/Fire_Servant.java
View File

@ -14,7 +14,7 @@ public class Fire_Servant {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
final MagicSource source=damage.getSource();
if (source.getController()==permanent.getController()&&source.isSpell()&&
MagicColor.Red.hasColor(source.getColorFlags(game))&&source.getCardDefinition().isSpell()) {
MagicColor.Red.hasColor(source.getColorFlags())&&source.getCardDefinition().isSpell()) {
// Generates no event or action.
damage.setAmount(damage.getAmount()<<1);
}

2
src/magic/card/Kederekt_Parasite.java
View File

@ -16,7 +16,7 @@ public class Kederekt_Parasite {
private static boolean isValid(final MagicPermanent owner, final MagicGame game) {
for (final MagicPermanent permanent : owner.getController().getPermanents()) {
if (permanent != owner && MagicColor.Red.hasColor(permanent.getColorFlags(game))) {
if (permanent != owner && MagicColor.Red.hasColor(permanent.getColorFlags())) {
return true;
}
}

2
src/magic/card/Kraken_s_Eye.java
View File

@ -19,7 +19,7 @@ public class Kraken_s_Eye {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player = permanent.getController();
final MagicCard card = data.getCard();
return (MagicColor.Blue.hasColor(card.getColorFlags(game))) ?
return (MagicColor.Blue.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

2
src/magic/card/Murkfiend_Liege.java
View File

@ -62,7 +62,7 @@ public class Murkfiend_Liege {
game.filterTargets((MagicPlayer)data[0],MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
for (final MagicTarget target : targets) {
final MagicPermanent creature=(MagicPermanent)target;
final int colorFlags=creature.getColorFlags(game);
final int colorFlags=creature.getColorFlags();
if (creature.isTapped()&&(MagicColor.Blue.hasColor(colorFlags)||MagicColor.Green.hasColor(colorFlags))) {
game.doAction(new MagicUntapAction(creature));
}

2
src/magic/card/Nettle_Sentinel.java
View File

@ -19,7 +19,7 @@ public class Nettle_Sentinel {
final MagicPlayer player = permanent.getController();
final MagicCard card = data.getCard();
return (card.getOwner() == player &&
MagicColor.Green.hasColor(card.getColorFlags(game)) &&
MagicColor.Green.hasColor(card.getColorFlags()) &&
permanent.isTapped()) ?
new MagicEvent(
permanent,

2
src/magic/card/Phyrexian_Reaper.java
View File

@ -17,7 +17,7 @@ public class Phyrexian_Reaper {
if (creature == permanent) {
final MagicPermanentList plist = new MagicPermanentList();
for (final MagicPermanent blocker : permanent.getBlockingCreatures()) {
final int colorFlags = blocker.getColorFlags(game);
final int colorFlags = blocker.getColorFlags();
if (MagicColor.Green.hasColor(colorFlags)) {
plist.add(blocker);
}

2
src/magic/card/Phyrexian_Slayer.java
View File

@ -17,7 +17,7 @@ public class Phyrexian_Slayer {
if (creature == permanent) {
final MagicPermanentList plist = new MagicPermanentList();
for (final MagicPermanent blocker : permanent.getBlockingCreatures()) {
final int colorFlags = blocker.getColorFlags(game);
final int colorFlags = blocker.getColorFlags();
if (MagicColor.White.hasColor(colorFlags)) {
plist.add(blocker);
}

8
src/magic/card/Quirion_Dryad.java
View File

@ -18,10 +18,10 @@ public class Quirion_Dryad {
final MagicPlayer player = permanent.getController();
final MagicCard card = data.getCard();
return (card.getOwner() == player &&
(MagicColor.White.hasColor(card.getColorFlags(game)) ||
MagicColor.Blue.hasColor(card.getColorFlags(game)) ||
MagicColor.Black.hasColor(card.getColorFlags(game)) ||
MagicColor.Red.hasColor(card.getColorFlags(game))) ) ?
(MagicColor.White.hasColor(card.getColorFlags()) ||
MagicColor.Blue.hasColor(card.getColorFlags()) ||
MagicColor.Black.hasColor(card.getColorFlags()) ||
MagicColor.Red.hasColor(card.getColorFlags())) ) ?
new MagicEvent(
permanent,
player,

2
src/magic/card/Rise_of_the_Hobgoblins.java
View File

@ -69,7 +69,7 @@ public class Rise_of_the_Hobgoblins {
MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
for (final MagicTarget target : targets) {
final MagicPermanent creature=(MagicPermanent)target;
final int colorFlags=creature.getColorFlags(game);
final int colorFlags=creature.getColorFlags();
if (MagicColor.Red.hasColor(colorFlags)||MagicColor.White.hasColor(colorFlags)) {
game.doAction(new MagicSetAbilityAction(creature,MagicAbility.FirstStrike));
}

2
src/magic/card/Rith__the_Awakener.java
View File

@ -51,7 +51,7 @@ public class Rith__the_Awakener {
game.filterTargets(player,MagicTargetFilter.TARGET_PERMANENT);
for (final MagicTarget target : targets) {
final MagicPermanent permanent=(MagicPermanent)target;
if (color.hasColor(permanent.getColorFlags(game))) {
if (color.hasColor(permanent.getColorFlags())) {
game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.get("Saproling")));
}
}

2
src/magic/card/Shrine_of_Burning_Rage.java
View File

@ -117,7 +117,7 @@ public class Shrine_of_Burning_Rage {
final MagicCardOnStack data) {
final MagicPlayer player=permanent.getController();
final MagicCard card=data.getCard();
return (card.getOwner()==player&&MagicColor.Red.hasColor(card.getColorFlags(game))) ?
return (card.getOwner()==player&&MagicColor.Red.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

2
src/magic/card/Treva__the_Renewer.java
View File

@ -50,7 +50,7 @@ public class Treva__the_Renewer {
final Collection<MagicTarget> targets=game.filterTargets(player,MagicTargetFilter.TARGET_PERMANENT);
for (final MagicTarget target : targets) {
final MagicPermanent permanent=(MagicPermanent)target;
if (color.hasColor(permanent.getColorFlags(game))) {
if (color.hasColor(permanent.getColorFlags())) {
life++;
}
}

2
src/magic/card/Wurm_s_Tooth.java
View File

@ -19,7 +19,7 @@ public class Wurm_s_Tooth {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
final MagicPlayer player = permanent.getController();
final MagicCard card = data.getCard();
return (MagicColor.Green.hasColor(card.getColorFlags(game))) ?
return (MagicColor.Green.hasColor(card.getColorFlags())) ?
new MagicEvent(
permanent,
player,

2
src/magic/model/MagicCard.java
View File

@ -167,7 +167,7 @@ public class MagicCard implements MagicSource,MagicTarget,Comparable<MagicCard>
}
@Override
public int getColorFlags(final MagicGame game) {
public int getColorFlags() {
return getCardDefinition().getColorFlags();
}

18
src/magic/model/MagicPermanent.java
View File

@ -286,7 +286,7 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
}
@Override
public int getColorFlags(final MagicGame game) {
public int getColorFlags() {
// Check if cached.
if (cached) {
return cachedColorFlags;
@ -298,7 +298,7 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
int flags = cardDefinition.getColorFlags();
flags = MagicLayer.getColorFlags(game, this, flags);
flags = MagicLayer.getColorFlags(getGame(), this, flags);
return flags;
}
@ -436,7 +436,7 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
lastKnownAbilityFlags = getAllAbilityFlags(game);
lastKnownSubTypeFlags = getSubTypeFlags(game);
lastKnownTypeFlags = getTypeFlags(game);
lastKnownColorFlags = getColorFlags(game);
lastKnownColorFlags = getColorFlags();
}
public long getAllAbilityFlags(final MagicGame game,final boolean turn) {
@ -493,7 +493,7 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
cachedTurnAbilityFlags=getAllAbilityFlags(game,true);
cachedSubTypeFlags=getSubTypeFlags(game);
cachedTypeFlags=getTypeFlags(game);
cachedColorFlags=getColorFlags(game);
cachedColorFlags=getColorFlags();
}
this.cached=aCached;
}
@ -694,12 +694,12 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
if (//source.getColoredType() == MagicColoredType.MonoColored &&
//added to fix bug with Raging Raving creature not able to block
//creature with protection from monocolored
MagicColor.isMono(source.getColorFlags(game)) &&
MagicColor.isMono(source.getColorFlags()) &&
MagicAbility.ProtectionFromMonoColored.hasAbility(abilityFlags)) {
return true;
}
final int colorFlags=source.getColorFlags(game);
final int colorFlags=source.getColorFlags();
if (colorFlags>0) {
// From all colors.
if (MagicAbility.ProtectionFromAllColors.hasAbility(abilityFlags)) {
@ -801,11 +801,11 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
// Fear and Intimidate
if (!isArtifact()) {
final int colorFlags=getColorFlags(game);
final int colorFlags=getColorFlags();
if (MagicAbility.Fear.hasAbility(attackerFlags)&&!MagicColor.Black.hasColor(colorFlags)) {
return false;
}
if (MagicAbility.Intimidate.hasAbility(attackerFlags)&&((colorFlags&attacker.getColorFlags(game))==0)) {
if (MagicAbility.Intimidate.hasAbility(attackerFlags)&&((colorFlags&attacker.getColorFlags())==0)) {
return false;
}
}
@ -856,7 +856,7 @@ public class MagicPermanent implements MagicSource,MagicTarget,Comparable<MagicP
// Can't be blocked by a color
for (final MagicColor color : MagicColor.values()) {
if (color.hasColor(this.getColorFlags(game)) &&
if (color.hasColor(this.getColorFlags()) &&
color.getCannotBeBlockedByAbility().hasAbility(attackerFlags)) {
return false;
}

2
src/magic/model/MagicSource.java
View File

@ -13,6 +13,6 @@ public interface MagicSource extends MagicCopyable, MagicMappable {
String getName();
MagicPlayer getController();
MagicColoredType getColoredType();
int getColorFlags(final MagicGame game);
int getColorFlags();
Collection<MagicActivation> getActivations();
}

4
src/magic/model/choice/MagicColorChoice.java
View File

@ -51,7 +51,7 @@ public class MagicColorChoice extends MagicChoice {
for (final MagicTarget target : targets) {
final MagicPermanent permanent=(MagicPermanent)target;
final int colorFlags=permanent.getColorFlags(game);
final int colorFlags=permanent.getColorFlags();
for (final MagicColor color : MagicColor.values()) {
if (color.hasColor(colorFlags)) {
@ -84,7 +84,7 @@ public class MagicColorChoice extends MagicChoice {
if (permanent.getController()==player) {
score=-score;
}
final int colorFlags=permanent.getColorFlags(game);
final int colorFlags=permanent.getColorFlags();
for (final MagicColor color : MagicColor.values()) {
if (color.hasColor(colorFlags)) {
scores[color.ordinal()]+=score;

34
src/magic/model/target/MagicTargetFilter.java
View File

@ -152,7 +152,7 @@ public interface MagicTargetFilter {
MagicTargetFilter TARGET_BLACK_PERMANENT=new MagicTargetFilter() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
return MagicColor.Black.hasColor(((MagicPermanent) target).getColorFlags(game));
return MagicColor.Black.hasColor(((MagicPermanent) target).getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
return targetType==MagicTargetType.Permanent;
@ -163,7 +163,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent targetPermanent = (MagicPermanent)target;
return targetPermanent.getController() == player &&
MagicColor.Black.hasColor(targetPermanent.getColorFlags(game));
MagicColor.Black.hasColor(targetPermanent.getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
return targetType == MagicTargetType.Permanent;
@ -174,7 +174,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent targetPermanent = (MagicPermanent)target;
return targetPermanent.getController() == player &&
MagicColor.Green.hasColor(targetPermanent.getColorFlags(game));
MagicColor.Green.hasColor(targetPermanent.getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
return targetType == MagicTargetType.Permanent;
@ -193,7 +193,7 @@ public interface MagicTargetFilter {
MagicTargetFilter TARGET_BLACK_RED_PERMANENT=new MagicTargetFilter() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent targetPermanent=(MagicPermanent)target;
final int colors = targetPermanent.getColorFlags(game);
final int colors = targetPermanent.getColorFlags();
return MagicColor.Black.hasColor(colors)||MagicColor.Red.hasColor(colors);
}
public boolean acceptType(final MagicTargetType targetType) {
@ -617,7 +617,7 @@ public interface MagicTargetFilter {
if (target.getController()==player) {
final MagicPermanent permanent=(MagicPermanent)target;
if (permanent.isCreature()) {
final int colorFlags=permanent.getColorFlags(game);
final int colorFlags=permanent.getColorFlags();
return MagicColor.Red.hasColor(colorFlags)||MagicColor.Green.hasColor(colorFlags);
}
}
@ -634,7 +634,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent permanent = (MagicPermanent)target;
if (permanent.isCreature()) {
final int colorFlags = permanent.getColorFlags(game);
final int colorFlags = permanent.getColorFlags();
return MagicColor.Green.hasColor(colorFlags) || MagicColor.White.hasColor(colorFlags);
}
return false;
@ -649,7 +649,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent permanent = (MagicPermanent)target;
if (permanent.isCreature()) {
final int colorFlags = permanent.getColorFlags(game);
final int colorFlags = permanent.getColorFlags();
return MagicColor.White.hasColor(colorFlags) || MagicColor.Blue.hasColor(colorFlags);
}
return false;
@ -663,7 +663,7 @@ public interface MagicTargetFilter {
MagicTargetFilter TARGET_BLACK_CREATURE = new MagicTargetFilter() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent permanent = (MagicPermanent)target;
return permanent.isCreature() && MagicColor.Black.hasColor(permanent.getColorFlags(game));
return permanent.isCreature() && MagicColor.Black.hasColor(permanent.getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
@ -675,7 +675,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
if (target.getController() == player) {
final MagicPermanent permanent = (MagicPermanent)target;
return permanent.isCreature() && MagicColor.Black.hasColor(permanent.getColorFlags(game));
return permanent.isCreature() && MagicColor.Black.hasColor(permanent.getColorFlags());
}
return false;
}
@ -689,7 +689,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
if (target.getController() == player) {
final MagicPermanent permanent = (MagicPermanent)target;
return permanent.isCreature() && MagicColor.Blue.hasColor(permanent.getColorFlags(game));
return permanent.isCreature() && MagicColor.Blue.hasColor(permanent.getColorFlags());
}
return false;
}
@ -703,7 +703,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
if (target.getController() == player) {
final MagicPermanent permanent = (MagicPermanent)target;
return permanent.isCreature() && MagicColor.Green.hasColor(permanent.getColorFlags(game));
return permanent.isCreature() && MagicColor.Green.hasColor(permanent.getColorFlags());
}
return false;
}
@ -717,7 +717,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
if (target.getController() == player) {
final MagicPermanent permanent = (MagicPermanent)target;
return permanent.isCreature() && MagicColor.Red.hasColor(permanent.getColorFlags(game));
return permanent.isCreature() && MagicColor.Red.hasColor(permanent.getColorFlags());
}
return false;
}
@ -730,7 +730,7 @@ public interface MagicTargetFilter {
MagicTargetFilter TARGET_WHITE_CREATURE = new MagicTargetFilter() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent permanent = (MagicPermanent)target;
return permanent.isCreature() && MagicColor.White.hasColor(permanent.getColorFlags(game));
return permanent.isCreature() && MagicColor.White.hasColor(permanent.getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
@ -742,7 +742,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
if (target.getController() == player) {
final MagicPermanent permanent = (MagicPermanent)target;
return permanent.isCreature() && MagicColor.White.hasColor(permanent.getColorFlags(game));
return permanent.isCreature() && MagicColor.White.hasColor(permanent.getColorFlags());
}
return false;
}
@ -1270,7 +1270,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent permanent=(MagicPermanent)target;
return permanent.isCreature()&&!MagicColor.White.hasColor(permanent.getColorFlags(game));
return permanent.isCreature()&&!MagicColor.White.hasColor(permanent.getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
@ -1282,7 +1282,7 @@ public interface MagicTargetFilter {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
final MagicPermanent permanent=(MagicPermanent)target;
return permanent.isCreature()&&!MagicColor.Black.hasColor(permanent.getColorFlags(game));
return permanent.isCreature()&&!MagicColor.Black.hasColor(permanent.getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
@ -1308,7 +1308,7 @@ public interface MagicTargetFilter {
final MagicPermanent permanent=(MagicPermanent)target;
return permanent.isCreature() &&
!permanent.isArtifact() &&
!MagicColor.Black.hasColor(permanent.getColorFlags(game));
!MagicColor.Black.hasColor(permanent.getColorFlags());
}
public boolean acceptType(final MagicTargetType targetType) {
return targetType == MagicTargetType.Permanent;

2
src/magic/ui/viewer/PermanentViewerInfo.java
View File

@ -140,7 +140,7 @@ public class PermanentViewerInfo {
}
// Colors
final int colorFlags=permanent.getColorFlags(game);
final int colorFlags=permanent.getColorFlags();
for (final MagicColor color : MagicColor.values()) {
if (color.hasColor(colorFlags)) {