From da383dbecc7a9b648edcaf4b5f4f7e354b0dd65d Mon Sep 17 00:00:00 2001 From: Chatziargyriou Eleftheria <36453738+Sedictious@users.noreply.github.com> Date: Tue, 31 Jul 2018 17:17:58 +0300 Subject: [PATCH] Update ExpansionSet.java --- Mage/src/main/java/mage/cards/ExpansionSet.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index 78129607430..42ef02c8f2e 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -231,7 +231,14 @@ public abstract class ExpansionSet implements Serializable { return booster; } } + + //Battlebond packs alway contain both partners + if (hasPartnerMechanic){ + booster = createPartnerBooster(); + return booster; + } return tryBooster(); + } protected boolean boosterIsValid(List booster) { @@ -284,12 +291,6 @@ public abstract class ExpansionSet implements Serializable { } } } - //Battlebond packs alway contain both partners - if (hasPartnerMechanic){ - booster = createPartnerBooster(); - return booster; - } - return tryBooster(); // check that all colors are present if (magicColors.stream().anyMatch(color -> colorWeight.get(color) < 60)) {