diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java index 49d1dfc2f65..78fb4cc9e18 100644 --- a/src/main/java/forge/game/GameNew.java +++ b/src/main/java/forge/game/GameNew.java @@ -119,7 +119,8 @@ public class GameNew { boolean canSideBoard = !isFirstGame && gameType.isSideboardingAllowed() && hasSpareCards; if (canSideBoard) { - myDeck = player.getController().sideboard(psc.getCurrentDeck(), gameType); + // This method changes the deck passed as parameter + player.getController().sideboard(psc.getCurrentDeck(), gameType); } else { psc.restoreOriginalDeck(); myDeck = psc.getCurrentDeck(); diff --git a/src/main/java/forge/game/PlayerStartConditions.java b/src/main/java/forge/game/PlayerStartConditions.java index 473e9ac9951..48b0606e8f1 100644 --- a/src/main/java/forge/game/PlayerStartConditions.java +++ b/src/main/java/forge/game/PlayerStartConditions.java @@ -11,7 +11,7 @@ import forge.item.CardPrinted; public class PlayerStartConditions { private final Deck originalDeck; private Deck currentDeck; - + private int startingLife = 20; private int startingHand = 7; private Function> cardsOnBattlefield = null; @@ -32,6 +32,11 @@ public class PlayerStartConditions { return currentDeck; } + public void setCurrentDeck(Deck currentDeck0) { + this.currentDeck = currentDeck0; + } + + public final int getStartingLife() { return startingLife; }