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

Merge branch 'master' of https://git.cardforge.org/core-developers/forge

Browse Source
This commit is contained in:
churrufli
2019-04-09 14:21:03 +02:00
parent ada8d59b2c 64eacd07a1
commit cc19b2b39e
57 changed files with 570 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.23-SNAPSHOT</version>
<version>1.6.24-SNAPSHOT</version>
</parent>
<artifactId>forge-game</artifactId>

5
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -1032,8 +1032,9 @@ public class CardFactoryUtil {
// Count$TopOfLibraryCMC
if (sq[0].contains("TopOfLibraryCMC")) {
final Card topCard = cc.getCardsIn(ZoneType.Library).getFirst();
return doXMath(topCard == null ? 0 : topCard.getCMC(), m, c);
int cmc = cc.getCardsIn(ZoneType.Library).isEmpty() ? 0 :
cc.getCardsIn(ZoneType.Library).getFirst().getCMC();
return doXMath(cmc, m, c);
}
// Count$EnchantedControllerCreatures