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

- Fixed some minor checkstyle errors (mostly trailing linespaces)

Browse Source
This commit is contained in:
moomarc
2012-09-07 08:44:41 +00:00
parent f976868b0c
commit 9e5ec17ecf
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2818,9 +2818,8 @@ public class AbilityFactory {
final AbilityFactory af = sa.getAbilityFactory(); final AbilityFactory af = sa.getAbilityFactory();
if (af == null) { if (af == null) {
sa.resolve(); sa.resolve();
if(sa.getSubAbility() != null) if (sa.getSubAbility() != null) {
{ resolve(sa.getSubAbility(), usedStack);
resolve(sa.getSubAbility(),usedStack);
} }
return; return;
} }

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

@@ -4823,10 +4823,9 @@ public class CardFactoryUtil {
card.getIntrinsicAbilities().add(abilityStr.toString()); card.getIntrinsicAbilities().add(abilityStr.toString());
} }
for(String kw : card.getKeyword()) { for (String kw : card.getKeyword()) {
if (kw.startsWith("ETBReplacement")) if (kw.startsWith("ETBReplacement")) {
{
String[] splitkw = kw.split(":"); String[] splitkw = kw.split(":");
ReplacementLayer layer = ReplacementLayer.smartValueOf(splitkw[1]); ReplacementLayer layer = ReplacementLayer.smartValueOf(splitkw[1]);
AbilityFactory af = new AbilityFactory(); AbilityFactory af = new AbilityFactory();
@@ -4835,8 +4834,8 @@ public class CardFactoryUtil {
setupETBReplacementAbility(repAb); setupETBReplacementAbility(repAb);
String repeffstr = "Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Description$ " + desc; String repeffstr = "Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Description$ " + desc;
if(splitkw.length == 4) { if (splitkw.length == 4) {
if(splitkw[3].contains("Optional")) { if (splitkw[3].contains("Optional")) {
repeffstr += " | Optional$ True"; repeffstr += " | Optional$ True";
} }
} }
@@ -4854,7 +4853,7 @@ public class CardFactoryUtil {
public static void setupETBReplacementAbility(SpellAbility sa) { public static void setupETBReplacementAbility(SpellAbility sa) {
SpellAbility tailend = sa; SpellAbility tailend = sa;
while(tailend.getSubAbility() != null) { while (tailend.getSubAbility() != null) {
tailend = tailend.getSubAbility(); tailend = tailend.getSubAbility();
} }
@@ -4864,7 +4863,9 @@ public class CardFactoryUtil {
/** /**
* TODO: Write javadoc for Constructor. * TODO: Write javadoc for Constructor.
* @param sourceCard * @param sourceCard
* the source card
* @param tgt * @param tgt
* the target
*/ */
public ETBReplacementMove(Card sourceCard, Target tgt) { public ETBReplacementMove(Card sourceCard, Target tgt) {
super(sourceCard, tgt); super(sourceCard, tgt);
@@ -4872,7 +4873,7 @@ public class CardFactoryUtil {
@Override @Override
public void resolve() { public void resolve() {
forge.Singletons.getModel().getGameAction().moveToPlay(((Card)this.getReplacingObject("Card"))); forge.Singletons.getModel().getGameAction().moveToPlay(((Card) this.getReplacingObject("Card")));
} }
/* (non-Javadoc) /* (non-Javadoc)
@@ -4889,7 +4890,7 @@ public class CardFactoryUtil {
@Override @Override
public AbilitySub getCopy() { public AbilitySub getCopy() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return new ETBReplacementMove(getSourceCard(),null); return new ETBReplacementMove(getSourceCard(), null);
} }
/* (non-Javadoc) /* (non-Javadoc)
@@ -4903,7 +4904,7 @@ public class CardFactoryUtil {
} }
tailend.setSubAbility(new ETBReplacementMove(sa.getSourceCard(),null)); tailend.setSubAbility(new ETBReplacementMove(sa.getSourceCard(), null));
} }
/** /**
@@ -5155,11 +5156,11 @@ public class CardFactoryUtil {
card.clearDevoured(); card.clearDevoured();
if (card.getController().isHuman()) { if (card.getController().isHuman()) {
if (creats.size() > 0) { if (creats.size() > 0) {
final List<Object> selection = GuiUtils.getOrderChoices("Devour", "Devouring", false, (Object[])creats.toArray()); final List<Object> selection = GuiUtils.getOrderChoices("Devour", "Devouring", false, (Object[]) creats.toArray());
numCreatures[0] = selection.size(); numCreatures[0] = selection.size();
for(Object o : selection) { for (Object o : selection) {
Card dinner = (Card)o; Card dinner = (Card) o;
card.addDevoured(dinner); card.addDevoured(dinner);
Singletons.getModel().getGameAction().sacrifice(dinner, null); Singletons.getModel().getGameAction().sacrifice(dinner, null);
} }