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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-01-25 17:05:57 +00:00
parent 3748011641
commit 3f6fe0793d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -815,8 +815,8 @@ public class AbilityFactoryDealDamage {
if (AllZoneUtil.isCardInPlay(c) && (!targeted || c.canBeTargetedBy(saMe))) {
if (noPrevention) {
c.addDamageWithoutPrevention(dmg, source);
} else if(combatDmg) {
HashMap<Card,Integer> combatmap = new HashMap<Card,Integer>();
} else if (combatDmg) {
HashMap<Card, Integer> combatmap = new HashMap<Card, Integer>();
combatmap.put(source, dmg);
c.addCombatDamage(combatmap);
} else {
@@ -829,7 +829,7 @@ public class AbilityFactoryDealDamage {
if (!targeted || p.canBeTargetedBy(saMe)) {
if (noPrevention) {
p.addDamageWithoutPrevention(dmg, source);
} else if(combatDmg) {
} else if (combatDmg) {
p.addCombatDamage(dmg, source);
} else {
p.addDamage(dmg, source);

6
src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
View File

@@ -2344,7 +2344,6 @@ public class CardFactoryCreatures {
card.addSpellAbility(ability);
} // *************** END ************ END **************************
// *************** START *********** START **************************
else if (cardName.equals("Duct Crawler") || cardName.equals("Shrewd Hatchling")
|| cardName.equals("Spin Engine") || cardName.equals("Screeching Griffin")) {
@@ -2495,10 +2494,9 @@ public class CardFactoryCreatures {
sb.append(" Target opponent gains control of target permanent.");
ability.setStackDescription(sb.toString());
card.addSpellAbility(ability);
}
} // *************** END ************ END **************************
// *************** START *********** START **************************
else if (cardName.equals("Bazaar Trader")) {
final Target player = new Target(card, "Select target player", "Player".split(","));
@@ -2545,7 +2543,7 @@ public class CardFactoryCreatures {
sb.append(" Target player gains control of target artifact, creature, or land you control.");
ability.setStackDescription(sb.toString());
card.addSpellAbility(ability);
}
} // *************** END ************ END **************************
// ***************************************************
// end of card specific code