From e7359573f26b1fb72f29205a775fd31f60cdd0ab Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Tue, 18 Jul 2017 10:09:19 +0000
Subject: [PATCH] - A more appropriate fix for BoosterGenerator and newer sets
 (takes into accounts sets like SOI/EMN).

---
 forge-core/src/main/java/forge/card/BoosterGenerator.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/BoosterGenerator.java b/forge-core/src/main/java/forge/card/BoosterGenerator.java
index af1febe1c92..cccf0b6e46f 100644
--- a/forge-core/src/main/java/forge/card/BoosterGenerator.java
+++ b/forge-core/src/main/java/forge/card/BoosterGenerator.java
@@ -204,7 +204,11 @@ public class BoosterGenerator {
 
             boolean foilInThisSlot = hasFoil && (slotType.equals(foilSlot));
 
-            if (foilInThisSlot) {
+            if (foilInThisSlot && !foilAtEndOfPack) {
+                numCards--;
+            }
+
+            if (foilAtEndOfPack && hasFoil && slotType.startsWith(BoosterSlots.COMMON)) {
                 numCards--;
             }
 
@@ -471,4 +475,4 @@ public class BoosterGenerator {
     }
 
 
-}
\ No newline at end of file
+}