Unstable 0.1400.0.0

2021-05-11 15:47:47 +03:00
parent 3f324b14e8
commit 92f0264af2
247 changed files with 8238 additions and 1911 deletions
@@ -240,7 +240,7 @@ namespace Barotrauma
                    {
                        TryStartConversation(speaker);
                    }
-                    else
+                    else if (speaker.ActiveConversation != this)
                    {
                        speaker.CampaignInteractionType = CampaignMode.InteractionType.Talk;
                        speaker.ActiveConversation = this;
@@ -352,6 +352,14 @@ namespace Barotrauma
            ShowDialog(speaker, targetCharacter);

            dialogOpened = true;
+            if (speaker != null)
+            {
+                speaker.CampaignInteractionType = CampaignMode.InteractionType.None;
+                speaker.SetCustomInteract(null, null);
+#if SERVER
+                GameMain.NetworkMember.CreateEntityEvent(speaker, new object[] { NetEntityEvent.Type.AssignCampaignInteraction });
+#endif
+            }
        }

        partial void ShowDialog(Character speaker, Character targetCharacter);