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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-03-07 18:15:16 +00:00
parent 1ef9c8aece
commit a8ebf5131a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
} else { } else {
toAdd = Integer.parseInt(numCounters); toAdd = Integer.parseInt(numCounters);
} }
c.addCounter(counter, toAdd); c.addCounter(counter, toAdd);
} }
} }

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

@@ -71,7 +71,7 @@ public class BoosterGenerator {
} }
} }
private void MergeAllFacedCards() { private void mergeAllFacedCards() {
for (CardRarity v : CardRarity.values()) { for (CardRarity v : CardRarity.values()) {
List<CardPrinted> cp = new ArrayList<CardPrinted>(singleFacedByRarity.get(v)); List<CardPrinted> cp = new ArrayList<CardPrinted>(singleFacedByRarity.get(v));
cp.addAll(twoFacedByRarity.get(v)); cp.addAll(twoFacedByRarity.get(v));
@@ -92,7 +92,7 @@ public class BoosterGenerator {
for (final CardPrinted c : cards) { for (final CardPrinted c : cards) {
this.addToRarity(c); this.addToRarity(c);
} }
MergeAllFacedCards(); mergeAllFacedCards();
} }
/** /**
@@ -106,7 +106,7 @@ public class BoosterGenerator {
for (final Entry<CardPrinted, Integer> e : dPool) { for (final Entry<CardPrinted, Integer> e : dPool) {
this.addToRarity(e.getKey()); this.addToRarity(e.getKey());
} }
MergeAllFacedCards(); mergeAllFacedCards();
} }
/** /**
@@ -124,7 +124,7 @@ public class BoosterGenerator {
this.addToRarity(c); this.addToRarity(c);
// System.out.println(c); // System.out.println(c);
} }
MergeAllFacedCards(); mergeAllFacedCards();
// System.out.println("done"); // System.out.println("done");
} }

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

@@ -311,8 +311,8 @@ public class AbilityFactoryAttach {
final Card attachSource = sa.getSourceCard(); final Card attachSource = sa.getSourceCard();
// TODO AttachSource is currently set for the Source of the Spell, but // TODO AttachSource is currently set for the Source of the Spell, but
// at some point can support attaching a different card // at some point can support attaching a different card
// Don't equip if already equipping // Don't equip if already equipping
if (attachSource.getEquippingCard() != null && attachSource.getEquippingCard().getController().isComputer()) { if (attachSource.getEquippingCard() != null && attachSource.getEquippingCard().getController().isComputer()) {
return null; return null;
} }

6
src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
View File

@@ -366,7 +366,7 @@ public class AbilityFactoryEffect {
if (params.containsKey("StaticAbilities")) { if (params.containsKey("StaticAbilities")) {
effectStaticAbilities = params.get("StaticAbilities").split(","); effectStaticAbilities = params.get("StaticAbilities").split(",");
} }
if (params.containsKey("ReplacementEffects")) { if (params.containsKey("ReplacementEffects")) {
effectReplacementEffects = params.get("ReplacementEffects").split(","); effectReplacementEffects = params.get("ReplacementEffects").split(",");
} }
@@ -441,12 +441,12 @@ public class AbilityFactoryEffect {
eff.addStaticAbility(af.getHostCard().getSVar(s)); eff.addStaticAbility(af.getHostCard().getSVar(s));
} }
} }
// Grant replacement effects // Grant replacement effects
if (effectReplacementEffects != null) { if (effectReplacementEffects != null) {
for (final String s : effectReplacementEffects) { for (final String s : effectReplacementEffects) {
final String actualReplacement = af.getHostCard().getSVar(s); final String actualReplacement = af.getHostCard().getSVar(s);
final ReplacementEffect parsedReplacement = ReplacementHandler.parseReplacement(actualReplacement, eff); final ReplacementEffect parsedReplacement = ReplacementHandler.parseReplacement(actualReplacement, eff);
eff.addReplacementEffect(parsedReplacement); eff.addReplacementEffect(parsedReplacement);
} }