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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-11-30 01:34:20 +00:00
parent 0e2a1d461a
commit f21f7b7738
10 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/Card.java
View File

@@ -7962,7 +7962,7 @@ public class Card extends GameEntity implements Comparable<Card> {
return 0;
}
if (source.isCreature() && Singletons.getModel().getGame().isCardInPlay("Well-Laid Plans")
if (source.isCreature() && Singletons.getModel().getGame().isCardInPlay("Well-Laid Plans")
&& source.sharesColorWith(this)) {
return 0;
}

8
src/main/java/forge/card/CardRules.java
View File

@@ -46,7 +46,7 @@ public final class CardRules {
private String toughness = null;
private String loyalty = null;
//Vanguard avatar modifiers
private Integer life = null;
private Integer hand = null;
@@ -267,8 +267,8 @@ public final class CardRules {
if (slashPos == -1) {
throw new RuntimeException(String.format("Vanguard '%s' has bad hand/life stats", this.getName()));
}
this.hand = Integer.parseInt(pt.substring(0,pt.indexOf('/')).replace("+", ""));
this.life = Integer.parseInt(pt.substring(pt.indexOf('/')+1).replace("+", ""));
this.hand = Integer.parseInt(pt.substring(0, pt.indexOf('/')).replace("+", ""));
this.life = Integer.parseInt(pt.substring(pt.indexOf('/') + 1).replace("+", ""));
}
if (this.characteristics.getSetsData().isEmpty()) {
@@ -416,5 +416,3 @@ public final class CardRules {
}

4
src/main/java/forge/card/CardRulesReader.java
View File

@@ -111,9 +111,9 @@ public class CardRulesReader {
this.characteristics[this.curCharacteristics].setDeckNeeds(CardRulesReader.getValueAfterKey(line, "DeckNeeds:"));
}
break;
case 'H':
if(line.startsWith("HandLifeModifier:")) {
if (line.startsWith("HandLifeModifier:")) {
this.characteristics[this.curCharacteristics].setPtLine(CardRulesReader.getValueAfterKey(line, "HandLifeModifier:"));
}
break;

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

@@ -203,7 +203,7 @@ public final class CardType implements Comparable<CardType> {
public boolean isSorcery() {
return this.coreType.contains(CardCoreType.Sorcery);
}
/**
* Checks if is vanguard.
*

4
src/main/java/forge/card/abilityfactory/AbilityFactory.java
View File

@@ -1647,9 +1647,9 @@ public class AbilityFactory {
}
}
}
// AI will only pay when it's not already payed and only opponents abilities
if (paid || (payers.size() > 1
if (paid || (payers.size() > 1
&& (sa.getActivatingPlayer().equals(payer) && !"OnlyOwn".equals(sa.getParam("UnlessAI"))))) {
continue;
}

2
src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java
View File

@@ -168,7 +168,7 @@ public class DamageAllAi extends SpellAiLogic {
final List<Card> humanList = this.getKillableCreatures(sa, enemy, dmg);
List<Card> computerList = this.getKillableCreatures(sa, ai, dmg);
final Target tgt = sa.getTarget();
if (tgt != null && sa.canTarget(enemy)) {
tgt.resetTargets();
sa.getTarget().addTarget(enemy);

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

@@ -3189,7 +3189,7 @@ public class CardFactoryUtil {
Singletons.getModel().getGame().getAction().moveToPlay(temp);
list.add(temp);
}
Singletons.getModel().getGame().getEvents().post(new TokenCreatedEvent());
return list;

2
src/main/java/forge/card/spellability/Target.java
View File

@@ -674,7 +674,7 @@ public class Target {
*/
public final boolean canTgtCreature() {
for (final String s : this.validTgts) {
if ((s.contains("Creature") || CardUtil.isACreatureType(s) || s.startsWith("Permanent"))
if ((s.contains("Creature") || CardUtil.isACreatureType(s) || s.startsWith("Permanent"))
&& !s.contains("nonCreature")) {
return true;
}

2
src/main/java/forge/card/staticability/StaticAbility.java
View File

@@ -494,7 +494,7 @@ public class StaticAbility {
return false;
}
}
if (params.containsKey("Condition")) {
if (params.get("Condition").equals("Threshold")) {
if (!controller.hasThreshold()) {

20
src/main/java/forge/game/player/Player.java
View File

@@ -107,8 +107,8 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
/** The max hand size. */
private int maxHandSize = 7;
/** Starting hand size */
/** Starting hand size. */
private int startingHandSize = 7;
/** The unlimited hand size. */
@@ -2539,7 +2539,7 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
public void setUnlimitedHandSize(boolean unlimited) {
this.unlimitedHandSize = unlimited;
}
/**
* <p>
@@ -3022,15 +3022,15 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
return other.getType() != this.getType();
}
public int getStartingHandSize()
{
public int getStartingHandSize() {
return this.startingHandSize;
}
public void setStartingHandSize(int shs)
{
public void setStartingHandSize(int shs) {
this.startingHandSize = shs;
}