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

free blocks option moved to PlayerControllerHuman

Browse Source
This commit is contained in:
Maxmtg
2014-01-24 05:44:23 +00:00
parent 68acaf77c5
commit e4fb939e91
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/Dependencies.java
View File

@@ -6,6 +6,5 @@ public class Dependencies {
public interface PreferencesMethods {
@Deprecated public abstract boolean getCloneModeSource();
@Deprecated public abstract boolean isManaBurnEnabled();
@Deprecated public abstract boolean areBlocksFree();
}
}

11
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -696,8 +696,8 @@ public class PhaseHandler implements java.io.Serializable {
private static boolean payRequiredBlockCosts(Game game, Card blocker, Card attacker) {
Cost blockCost = new Cost(ManaCost.ZERO, true);
boolean hasBlockCost = false;
// Sort abilities to apply them in proper order
boolean noCost = true;
List<ZoneType> checkZones = ZoneType.listValueOf("Battlefield,Command");
for (Card card : game.getCardsIn(checkZones)) {
final ArrayList<StaticAbility> staticAbilities = card.getStaticAbilities();
@@ -705,17 +705,12 @@ public class PhaseHandler implements java.io.Serializable {
Cost c1 = stAb.getBlockCost(blocker, attacker);
if (c1 != null) {
blockCost.add(c1);
hasBlockCost = true;
noCost = false;
}
}
}
boolean hasPaid = blockCost.getTotalMana().isZero() && blockCost.isOnlyManaCost() && (!hasBlockCost || Dependencies.preferences.areBlocksFree()); // true if needless to pay
if (!hasPaid) {
hasPaid = blocker.getController().getController().payManaOptional(blocker, blockCost, null, "Pay cost to declare " + blocker + " a blocker. ", ManaPaymentPurpose.DeclareBlocker);
}
return hasPaid;
return !noCost || blocker.getController().getController().payManaOptional(blocker, blockCost, null, "Pay cost to declare " + blocker + " a blocker. ", ManaPaymentPurpose.DeclareBlocker);
}
/**