* cleanups

This commit is contained in:
jendave
2011-08-06 04:51:18 +00:00
parent d45ef08d46
commit 64c5081c69
3 changed files with 6 additions and 7 deletions

View File

@@ -15672,7 +15672,7 @@ public class CardFactory implements NewConstants {
public boolean canPlay() {
PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw() == card.getController();
return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController());
}
};

View File

@@ -10819,7 +10819,7 @@ public class CardFactory_Creatures {
PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getController());
return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw() == card.getController() && hand.size() > 0;
return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController()) && hand.size() > 0;
}
};
@@ -10852,7 +10852,7 @@ public class CardFactory_Creatures {
PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getController());
return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw() == card.getController() && hand.size() > 0;
return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController()) && hand.size() > 0;
}
};

View File

@@ -484,18 +484,17 @@ public class ManaPool extends Card {
PlayerZone play = AllZone.getZone(Constant.Zone.Play, Constant.Player.Human);
Omnath_Human.addAll(play.getCards());
Omnath_Human = Omnath_Human.getName("Omnath, Locus of Mana");
String New_ManaPool = "";
StringBuffer New_ManaPool = new StringBuffer();
if(Omnath_Human.size() > 0) {
String Human_ManaPool = has;
int Count = Human_ManaPool.length();
for(int i = 0; i < Count; i++) {
if(Human_ManaPool.contains("G") == true) {
Human_ManaPool = Human_ManaPool.replaceFirst("G", "");
New_ManaPool = New_ManaPool + "G";
New_ManaPool.append("G");
}
}
New_ManaPool = New_ManaPool.trim();
has = New_ManaPool;
has = New_ManaPool.toString().trim();
//Omnath, Locus of Mana Mana Storage
} else {
has = "";//Arrays.fill(has, 0);