diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index cc05b8422db..05d7d6398d0 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -332,6 +332,10 @@ public class CardPool extends ItemPool { sumWeights += editionsCount; weightedMean += weightedFrequency; } + + if (frequencyValues.isEmpty()) + return null; + int totalNoCards = (int)weightedMean; weightedMean /= sumWeights; diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java index c72c6ef732a..25f3f94723b 100644 --- a/forge-core/src/main/java/forge/deck/Deck.java +++ b/forge-core/src/main/java/forge/deck/Deck.java @@ -388,6 +388,8 @@ public class Deck extends DeckBase implements Iterable tokensToOptimise = tokensPerSectionWithNoSet.get(section);