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-02-10 13:04:20 +00:00
parent 44c9108c21
commit 1317f0ee7f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/Combat.java
View File

@@ -713,8 +713,8 @@ public class Combat {
needFirstStrike = true;
if (this.getAttackingPlayer().isHuman()) { // human attacks
if (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
&& GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as" +
" though it weren't blocked?")) {
&& GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as"
+ " though it weren't blocked?")) {
this.addDefendingDamage(damageDealt, attacker);
} else {
if (attacker.hasKeyword("Trample") || (block.size() > 1)) {
@@ -765,8 +765,8 @@ public class Combat {
if (this.getAttackingPlayer().isHuman()) { // human attacks
if (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
&& GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as" +
" though it weren't blocked?")) {
&& GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as"
+ " though it weren't blocked?")) {
this.addDefendingDamage(damageDealt, attacker);
} else {
if (attacker.hasKeyword("Trample") || (block.size() > 1)) {
@@ -799,7 +799,7 @@ public class Combat {
*/
private void distributeAIDamage(final Card attacker, final CardList block, int damage) {
final Card c = attacker;
if (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")) {
this.addDefendingDamage(damage, attacker);
}

8
src/main/java/forge/CombatUtil.java
View File

@@ -1063,8 +1063,8 @@ public class CombatUtil {
final CardList blockers = combat.getBlockers(attacker);
if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage " +
"as though it weren't blocked.")) {
if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage "
+ "as though it weren't blocked.")) {
unblocked.add(attacker);
} else if (attacker.hasKeyword("Trample")
&& (CombatUtil.getAttack(attacker) > CombatUtil.totalShieldDamage(attacker, blockers))) {
@@ -1104,8 +1104,8 @@ public class CombatUtil {
final CardList blockers = combat.getBlockers(attacker);
if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage" +
" as though it weren't blocked.")) {
if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage"
+ " as though it weren't blocked.")) {
unblocked.add(attacker);
} else if (attacker.hasKeyword("Trample")
&& (CombatUtil.getAttack(attacker) > CombatUtil.totalShieldDamage(attacker, blockers))) {

8
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -819,7 +819,7 @@ public final class AbilityFactoryChangeZone {
CardList fetchList;
if (defined) {
fetchList = new CardList(AbilityFactory.getDefinedCards(card, params.get("Defined"), sa));
} else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)){
} else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)) {
fetchList = AllZoneUtil.getCardsIn(origin);
} else {
fetchList = player.getCardsIn(origin);
@@ -914,7 +914,7 @@ public final class AbilityFactoryChangeZone {
}
movedCard = AllZone.getGameAction().moveTo(c.getController().getZone(destination), c);
} else if(destination.equals(Zone.Exile)) {
} else if (destination.equals(Zone.Exile)) {
movedCard = AllZone.getGameAction().exile(c);
if (params.containsKey("ExileFaceDown")) {
movedCard.setState("FaceDown");
@@ -988,7 +988,7 @@ public final class AbilityFactoryChangeZone {
CardList fetchList;
if (defined) {
fetchList = new CardList(AbilityFactory.getDefinedCards(card, params.get("Defined"), sa));
} else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)){
} else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)) {
fetchList = AllZoneUtil.getCardsIn(origin);
fetchList = AbilityFactory.filterListByType(fetchList, type, sa);
} else {
@@ -1102,7 +1102,7 @@ public final class AbilityFactoryChangeZone {
}
newCard = AllZone.getGameAction().moveTo(c.getController().getZone(destination), c);
} else if(destination.equals(Zone.Exile)) {
} else if (destination.equals(Zone.Exile)) {
newCard = AllZone.getGameAction().exile(c);
if (params.containsKey("ExileFaceDown")) {
newCard.setState("FaceDown");