v0.19.0.0 (unstable)

2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
@@ -27,16 +27,24 @@ namespace Barotrauma
 #endif
                        continue;
                    }
-                    
-                    if (selectedOption == byte.MaxValue)
+
+                    if (convAction.SelectedOption > -1)
                    {
-                        convAction.IgnoreClient(sender, 3f);
+                        //someone else already chose an option for this conversation: interrupt for this client
+                        convAction.ServerWrite(convAction.speaker, sender, interrupt: true);
                    }
                    else
                    {
-                        convAction.SelectedOption = selectedOption;
+                        if (selectedOption == byte.MaxValue)
+                        {
+                            convAction.IgnoreClient(sender, 3f);
+                        }
+                        else
+                        {
+                            convAction.SelectedOption = selectedOption;
+                        }
                    }
-                    return;                    
+                    return;
                }                
            }
        }