Merge branch 'puzzle-engine' into 'master'

Added puzzle PS_GRN7 (Possibility Storm - Guilds of Ravnica 07). Fixed Setup Game State not clearing effect cards from command zone.

See merge request core-developers/forge!1120
This commit is contained in:
Michael Kamensky
2018-11-20 05:17:28 +00:00
3 changed files with 37 additions and 0 deletions

View File

@@ -1004,6 +1004,12 @@ public abstract class GameState {
private void setupPlayerState(int life, Map<ZoneType, String> cardTexts, final Player p, final int landsPlayed, final int landsPlayedLastTurn) {
// Lock check static as we setup player state
// Clear all zones first, this ensures that any lingering cards and effects (e.g. in command zone) get cleared up
// before setting up a new state
for (ZoneType zt : ZONES.keySet()) {
p.getZone(zt).removeAllCards(true);
}
Map<ZoneType, CardCollectionView> playerCards = new EnumMap<ZoneType, CardCollectionView>(ZoneType.class);
for (Entry<ZoneType, String> kv : cardTexts.entrySet()) {
String value = kv.getValue();