From c148e2f5d7559300a26c98f48ddcc238a09a1b7c Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 21 Oct 2023 17:37:32 +0400 Subject: [PATCH] Prismatic Piper and same cards - fixed game error on disconnected player before game begin --- Mage/src/main/java/mage/game/GameCommanderImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/game/GameCommanderImpl.java b/Mage/src/main/java/mage/game/GameCommanderImpl.java index dcd6d78999c..86f0ae07caa 100644 --- a/Mage/src/main/java/mage/game/GameCommanderImpl.java +++ b/Mage/src/main/java/mage/game/GameCommanderImpl.java @@ -80,11 +80,14 @@ public abstract class GameCommanderImpl extends GameImpl { true, "Choose a color for " + commander.getName() ); player.choose(Outcome.Neutral, choiceColor, this); - color = choiceColor.getColor(); + color = choiceColor.getColor(); // can be null on disconnect } else { color = iterator.next(); } - commander.getColor().addColor(color); + + if (color != null) { + commander.getColor().addColor(color); + } } }