- CheckStyle.

This commit is contained in:
Chris
2012-01-23 14:19:56 +00:00
parent 90959ccc4c
commit 3b0065e8b2
7 changed files with 18 additions and 18 deletions

View File

@@ -1096,7 +1096,7 @@ public class MagicStack extends MyObservable {
AllZone.getGameAction().checkStateEffects();
AllZone.getPhaseHandler().setNeedToNextPhase(false);
this.curResolvingCard = null;
// TODO: change to use forge.view.FView?
@@ -1488,12 +1488,12 @@ public class MagicStack extends MyObservable {
public final CardList getCardsCastLastTurn() {
return this.lastTurnCast;
}
public final boolean isResolving(Card c) {
if(!this.getResolving() || this.curResolvingCard == null) {
if (!this.getResolving() || this.curResolvingCard == null) {
return false;
}
return c.equals(this.curResolvingCard);
}
}

View File

@@ -2132,7 +2132,7 @@ public class CardFactoryCreatures {
@Override
public void resolve() {
String imageFileName = card.getImageFilename();
if (card.getController().isComputer()) {
final CardList creatures = AllZoneUtil.getCreaturesInPlay();
if (!creatures.isEmpty()) {

View File

@@ -980,7 +980,7 @@ public class CardFactorySorceries {
sub.resolve();
}
};
spell.setSubAbility(sub);
final StringBuilder sbDesc = new StringBuilder();

View File

@@ -340,11 +340,11 @@ public class SpellPermanent extends Spell {
* @return a boolean.
*/
public static boolean checkETBEffects(final Card card, final SpellAbility sa, final String api) {
if(card.isCreature() && AllZoneUtil.isCardInPlay("Torpor Orb")) {
if (card.isCreature() && AllZoneUtil.isCardInPlay("Torpor Orb")) {
return true;
}
// Trigger play improvements
final ArrayList<Trigger> triggers = card.getTriggers();
for (final Trigger tr : triggers) {

View File

@@ -60,10 +60,10 @@ public class StaticAbilityCantBeCast {
if (params.containsKey("OnlySorcerySpeed") && (activator != null) && PhaseHandler.canCastSorcery(activator)) {
return false;
}
if(params.containsKey("Origin")) {
if (params.containsKey("Origin")) {
Zone src = Zone.smartValueOf(params.get("Origin"));
if(src != AllZone.getZoneOf(card).getZoneType()) {
if (src != AllZone.getZoneOf(card).getZoneType()) {
return false;
}
}

View File

@@ -46,7 +46,7 @@ public class FMatchState {
public static final int MIN_GAMES_TO_WIN_MATCH = 2;
private final List<GameSummary> gamesPlayed = new ArrayList<GameSummary>();
private final List<CardPrinted> antesWon = new ArrayList<CardPrinted>();
private final List<CardPrinted> antesLost = new ArrayList<CardPrinted>();
@@ -144,7 +144,7 @@ public class FMatchState {
public final boolean isMatchWonBy(final String name) {
return this.countGamesWonBy(name) >= FMatchState.MIN_GAMES_TO_WIN_MATCH;
}
/**
* Adds a CardList to the antes that have already been won this match.
*
@@ -161,7 +161,7 @@ public class FMatchState {
}
return antesPrinted;
}
/**
* Gets a list of all cards won in ante during this match.
*
@@ -170,7 +170,7 @@ public class FMatchState {
public final List<CardPrinted> getAnteWon() {
return antesWon;
}
/**
* Adds the ante cards won this match to the CardPool (and they get marker as NEW).
*
@@ -179,7 +179,7 @@ public class FMatchState {
public final void addAnteWonToCardPool() {
AllZone.getQuestData().getCards().addAllCards(antesWon);
}
/**
* Adds a CardList to the antes that have already been lost this match.
*

View File

@@ -220,7 +220,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
if ((outcome % QuestPreferences.getWinsForBooster(this.model.qData.getDifficultyIndex())) == 0) {
this.awardBooster();
}
// Add any antes won this match (regardless of Match Win/Lose to Card Pool
// Note: Antes lost have already been remove from decks.
AllZone.getMatchState().addAnteWonToCardPool();