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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-11-17 14:00:53 +00:00
parent 378bee9dc0
commit 1d9bfe7cb2
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/EditionCollection.java
View File

@@ -80,7 +80,7 @@ public final class EditionCollection extends StorageView<CardEdition> {
final CardEdition set = this.get(code);
return set == null ? "" : set.getCode2();
}
public final Function<String, CardEdition> FN_EDITION_BY_CODE = new Function<String, CardEdition>() {
@Override
public CardEdition apply(String code) {

4
src/main/java/forge/card/abilityfactory/ai/PumpAiBase.java
View File

@@ -407,14 +407,14 @@ public abstract class PumpAiBase extends SpellAiLogic {
// is the creature unblocked and the spell will pump its power?
if (phase.is(PhaseType.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY)
&& Singletons.getModel().getGame().getCombat().isAttacking(c)
&& Singletons.getModel().getGame().getCombat().isAttacking(c)
&& Singletons.getModel().getGame().getCombat().isUnblocked(c) && (attack > 0)) {
return true;
}
// is the creature blocked and the blocker would survive
if (phase.is(PhaseType.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY) && (attack > 0)
&& Singletons.getModel().getGame().getCombat().isAttacking(c)
&& Singletons.getModel().getGame().getCombat().isAttacking(c)
&& Singletons.getModel().getGame().getCombat().isBlocked(c)
&& Singletons.getModel().getGame().getCombat().getBlockers(c) != null
&& !Singletons.getModel().getGame().getCombat().getBlockers(c).isEmpty()

2
src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java
View File

@@ -380,7 +380,7 @@ class CardFactoryArtifacts {
Zone zone = Singletons.getModel().getGame().getZoneOf(c);
return zone.is(ZoneType.Hand) && c.getController() == card.getController();
}
/* (non-Javadoc)
* @see forge.control.input.InputSelectManyCards#onDone()
*/

4
src/main/java/forge/card/cardfactory/CardFactoryLands.java
View File

@@ -286,7 +286,7 @@ class CardFactoryLands {
}
public void humanExecute() {
Singletons.getModel().getMatch().getInput().setInput(new InputSelectManyCards(0,1) {
Singletons.getModel().getMatch().getInput().setInput(new InputSelectManyCards(0, 1) {
private static final long serialVersionUID = -2774066137824255680L;
@Override
@@ -299,7 +299,7 @@ class CardFactoryLands {
Zone zone = Singletons.getModel().getGame().getZoneOf(c);
return zone.is(ZoneType.Hand) && c.isType(type) && c.getController() == card.getController();
}
@Override
protected Input onDone() {
String cardName = selected.get(0).getName();

4
src/main/java/forge/card/cost/Cost.java
View File

@@ -364,7 +364,7 @@ public class Cost {
if (xCantBe0) {
parse = parse.replaceAll(XCANTBE0_STR, "");
}
final String stripXCost = parse.replaceAll("X", "");
final int amountX = parse.length() - stripXCost.length();
@@ -451,7 +451,7 @@ public class Cost {
}
}
public final CostMana getCostMana () {
public final CostMana getCostMana() {
// TODO: Change where ChangeCost happens
for (final CostPart part : this.costParts) {
if (part instanceof CostMana) {

2
src/main/java/forge/card/cost/CostMana.java
View File

@@ -164,7 +164,7 @@ public class CostMana extends CostPart {
if (!this.mana.equals("0")) {
sb.append(this.mana);
}
return sb.toString().trim();
}

2
src/main/java/forge/card/cost/CostPutCounter.java
View File

@@ -216,7 +216,7 @@ public class CostPutCounter extends CostPartWithList {
c = AbilityFactory.calculateAmount(source, this.getAmount(), ability);
}
final List<Card> typeList =
final List<Card> typeList =
CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), this.getType().split(";"), ai, source);
Card card = null;

12
src/main/java/forge/card/cost/CostRemoveCounter.java
View File

@@ -289,7 +289,7 @@ public class CostRemoveCounter extends CostPartWithList {
if (!this.getThis()) {
this.getList().clear();
final List<Card> typeList =
final List<Card> typeList =
CardLists.getValidCards(ai.getCardsIn(this.getZone()), this.getType().split(";"), ai, source);
for (Card card : typeList) {
if (card.getCounters(this.getCounter()) >= c) {
@@ -388,7 +388,7 @@ public class CostRemoveCounter extends CostPartWithList {
return target;
}
/**
* <p>
* returnType.
@@ -432,16 +432,16 @@ public class CostRemoveCounter extends CostPartWithList {
if (o != null) {
final Card card = o;
if (card.getCounters(costRemoveCounter.getCounter()) > 0) {
this.nRemove++;
costRemoveCounter.addToList(card);
card.subtractCounter(costRemoveCounter.getCounter(), 1);
if (card.getCounters(costRemoveCounter.getCounter()) == 0) {
this.typeList.remove(card);
}
if (nNeeded == this.nRemove) {
this.done();
} else {
@@ -474,4 +474,4 @@ public class CostRemoveCounter extends CostPartWithList {
};
return target;
}
}
}

2
src/main/java/forge/card/cost/CostTapType.java
View File

@@ -191,7 +191,7 @@ public class CostTapType extends CostPartWithList {
if (c == null) {
final String sVar = ability.getSVar(amount);
if (sVar.equals("XChoice")) {
List<Card> typeList =
List<Card> typeList =
CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), this.getType().split(";"), ability.getActivatingPlayer(), ability.getSourceCard());
typeList = CardLists.filter(typeList, Presets.UNTAPPED);
c = typeList.size();

2
src/main/java/forge/card/cost/CostUtil.java
View File

@@ -83,7 +83,7 @@ public class CostUtil {
continue;
}
final List<Card> typeList =
final List<Card> typeList =
CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), type.split(","), source.getController(), source);
if (ComputerUtil.getCardPreference(ai, source, "SacCost", typeList) == null) {
return false;