Merge branch 'master' of https://github.com/VladimirKhil/SI

VladimirKhil · May 1, 2024 · fc44401 · fc44401
2 parents 572b6f2 + 341058a
commit fc44401
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/SICore/SICore/Clients/Game/Game.cs b/src/SICore/SICore/Clients/Game/Game.cs
@@ -2066,9 +2066,12 @@ private void OnAnswer(Message message, string[] args)
 
             for (var i = 0; i < ClientData.Players.Count; i++)
             {
-                if (ClientData.Players[i].Name == message.Sender && ClientData.QuestionPlayState.AnswererIndicies.Contains(i) && ClientData.Players[i].Answer == "")
+                if (ClientData.Players[i].Name == message.Sender
+                    && ClientData.QuestionPlayState.AnswererIndicies.Contains(i)
+                    && ClientData.Players[i].Flag)
                 {
                     ClientData.AnswererIndex = i;
+                    ClientData.Players[i].Flag = false;
                     _gameActions.SendMessageWithArgs(Messages.PersonFinalAnswer, i);
                     break;
                 }

diff --git a/src/SICore/SICore/Clients/Game/GameLogic.cs b/src/SICore/SICore/Clients/Game/GameLogic.cs
@@ -3220,6 +3220,7 @@ private void AskAnswer()
                 if (_data.QuestionPlayState.AnswererIndicies.Contains(i))
                 {
                     _data.Players[i].Answer = "";
+                    _data.Players[i].Flag = true;
                     _gameActions.SendMessage(Messages.Answer, _data.Players[i].Name);
                 }
             }