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

merge latest trunk

Browse Source
This commit is contained in:
myk
2013-03-11 10:01:52 +00:00
parent e07bf3a5c4 1ec1bceedb
commit 736b9e61b5
6 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9171,7 +9171,7 @@ public class Card extends GameEntity implements Comparable<Card> {
int requestedCMC = 0;
if (getRules().getSplitType() == CardSplitType.Split) {
if (getRules() != null && getRules().getSplitType() == CardSplitType.Split) {
switch(mode) {
case CurrentSideCMC:
// TODO: test if this returns combined CMC for the full face (then get rid of CombinedCMC mode?)

4
src/main/java/forge/card/ability/AbilityUtils.java
View File

@@ -1201,7 +1201,9 @@ public class AbilityUtils {
&& ComputerUtilCost.checkDamageCost(payer, ability.getPayCosts(), source, 4)
&& ComputerUtilCost.checkDiscardCost(payer, ability.getPayCosts(), source)
&& (!source.getName().equals("Tyrannize") || payer.getCardsIn(ZoneType.Hand).size() > 2)
&& (!source.getName().equals("Breaking Point") || payer.getCreaturesInPlay().size() > 1)) {
&& (!source.getName().equals("Breaking Point") || payer.getCreaturesInPlay().size() > 1)
&& (!source.getName().equals("Chain of Vapor")
|| (payer.getOpponent().getCreaturesInPlay().size() > 0 && payer.getLandsInPlay().size() > 3))) {
// AI was crashing because the blank ability used to pay costs
// Didn't have any of the data on the original SA to pay dependant costs
return true;