diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/GameViewTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/GameViewTest.java index 1e3472e572d..9f6c19194a4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/GameViewTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/GameViewTest.java @@ -2,11 +2,14 @@ package org.mage.test.serverside; import mage.constants.PhaseStep; import mage.constants.Zone; +import mage.game.Game; import mage.view.GameView; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; +import java.util.Arrays; +import java.util.HashSet; import java.util.UUID; /** @@ -26,6 +29,16 @@ public class GameViewTest extends CardTestPlayerBase { UUID userB = UUID.randomUUID(); UUID userWatcher = UUID.randomUUID(); + // game copy test + Assert.assertEquals(0, currentGame.getOptions().bannedUsers.size()); + Game copiedGame = currentGame.copy(); + Assert.assertEquals(0, copiedGame.getOptions().bannedUsers.size()); + // + currentGame.getOptions().bannedUsers.add("123"); + Assert.assertEquals(1, currentGame.getOptions().bannedUsers.size()); + copiedGame = currentGame.copy(); + Assert.assertEquals(1, copiedGame.getOptions().bannedUsers.size()); + // normal hand GameView gameView = getGameView(playerA, userA); Assert.assertNotNull(gameView); diff --git a/Mage/src/main/java/mage/game/GameOptions.java b/Mage/src/main/java/mage/game/GameOptions.java index f9fe54a7727..6db1767049c 100644 --- a/Mage/src/main/java/mage/game/GameOptions.java +++ b/Mage/src/main/java/mage/game/GameOptions.java @@ -53,16 +53,16 @@ public class GameOptions implements Serializable, Copyable { /** * Names of users banned from participating in the game */ - public Set bannedUsers = Collections.emptySet(); + public Set bannedUsers = new HashSet<>(); /** * Cards to be given to each player as emblems */ - public Collection perPlayerEmblemCards = Collections.emptySet(); + public Collection perPlayerEmblemCards = new HashSet<>(); /** * Cards to be given to the starting player as emblems */ - public Collection globalEmblemCards = Collections.emptySet(); + public Collection globalEmblemCards = new HashSet<>(); // PLANECHASE game mode