diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java index 6979861ee8..48c40e90ad 100644 --- a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java +++ b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java @@ -5,6 +5,8 @@ import mage.constants.RangeOfInfluence; import mage.game.match.MatchType; import mage.game.mulligan.Mulligan; +import java.util.UUID; + /** * @author JayDi85 */ @@ -12,6 +14,7 @@ public class OathbreakerDuel extends OathbreakerFreeForAll { public OathbreakerDuel(MultiplayerAttackOption attackOption, RangeOfInfluence range, Mulligan mulligan, int startLife) { super(attackOption, range, mulligan, startLife); + this.startingPlayerSkipsDraw = true; } public OathbreakerDuel(final OathbreakerDuel game) { @@ -33,4 +36,11 @@ public class OathbreakerDuel extends OathbreakerFreeForAll { return new OathbreakerDuel(this); } + @Override + protected void init(UUID choosingPlayerId) { + super.init(choosingPlayerId); + + startingPlayerSkipsDraw = false; + } + } diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java index 4491870a5a..7e068208e2 100644 --- a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java +++ b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java @@ -33,6 +33,7 @@ public class OathbreakerFreeForAll extends GameCommanderImpl { public OathbreakerFreeForAll(MultiplayerAttackOption attackOption, RangeOfInfluence range, Mulligan mulligan, int startLife) { super(attackOption, range, mulligan, startLife); + this.startingPlayerSkipsDraw = false; } public OathbreakerFreeForAll(final OathbreakerFreeForAll game) { @@ -42,13 +43,6 @@ public class OathbreakerFreeForAll extends GameCommanderImpl { game.playerOathbreakers.forEach((key, value) -> this.playerOathbreakers.put(key, new HashSet<>(value))); } - @Override - protected void init(UUID choosingPlayerId) { - // init base commander game - startingPlayerSkipsDraw = false; - super.init(choosingPlayerId); - } - private String getCommanderTypeName(Card commander) { return commander.isInstantOrSorcery() ? COMMANDER_NAME_SIGNATURE_SPELL : COMMANDER_NAME_OATHBREAKER; }