Merge branch 'develop'

evilfactory · evilfactory · commit ad837423a8d7 · 2025-07-01T17:56:36.000-03:00
diff --git a/.github/DISCUSSION_TEMPLATE/bug-reports.yml b/.github/DISCUSSION_TEMPLATE/bug-reports.yml
@@ -73,7 +73,7 @@ body:
       label: Version
       description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu.
       options:
-        - v1.9.7.0 (Summer Update 2025)        
+        - v1.9.8.0 (Summer Update Hotfix 1)        
         - Other
     validations:
       required: true
diff --git a/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs b/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs
@@ -461,7 +461,10 @@ protected override void LoadContent()
 
             Eos.EosAccount.LoginPlatformSpecific();
 
-            initialLoadingThread = new Thread(Load);
+            initialLoadingThread = new Thread(Load)
+            {
+                Name = "Load"
+            };
             initialLoadingThread.Start();
         }
 
diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs
@@ -265,6 +265,7 @@ public void UpdateSounds()
                 float gainDiff = targetGain - loopingSoundChannel.Gain;
                 loopingSoundChannel.Gain += Math.Abs(gainDiff) < 0.1f ? gainDiff : Math.Sign(gainDiff) * 0.1f;
                 loopingSoundChannel.Position = new Vector3(item.WorldPosition, 0.0f);
+                loopingSound.RoundSound.LastStreamSeekPos = loopingSoundChannel.StreamSeekPos;
             }
             for (int i = 0; i < playingOneshotSoundChannels.Count; i++)
             {
@@ -409,6 +410,10 @@ private void PlaySound(ItemSound itemSound, Vector2 position)
                         loopingSoundChannel.Near = loopingSound.Range * 0.4f;
                         loopingSoundChannel.Far = loopingSound.Range;
                     }
+                    if (loopingSound.RoundSound.Stream)
+                    {
+                        loopingSoundChannel.StreamSeekPos = loopingSound.RoundSound.LastStreamSeekPos;
+                    }
                 }
             }
             else
diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/RoundSound.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/RoundSound.cs
@@ -16,6 +16,8 @@ class RoundSound
         public readonly bool Stream;
         public readonly bool IgnoreMuffling;
 
+        public int LastStreamSeekPos;
+
         public readonly bool MuteBackgroundMusic;
 
         public readonly string? Filename;
diff --git a/Barotrauma/BarotraumaClient/ClientSource/StatusEffects/StatusEffect.cs b/Barotrauma/BarotraumaClient/ClientSource/StatusEffects/StatusEffect.cs
@@ -152,6 +152,8 @@ partial void ApplyProjSpecific(float deltaTime, Entity entity, IReadOnlyList<ISe
 
         private bool ignoreMuffling;
 
+        private RoundSound lastPlayingSound;
+
         private void PlaySound(Entity entity, Hull hull, Vector2 worldPosition)
         {
             if (sounds.Count == 0) { return; }
@@ -204,6 +206,7 @@ private void PlaySound(Entity entity, Hull hull, Vector2 worldPosition)
             else
             {
                 soundChannel.Position = new Vector3(worldPosition, 0.0f);
+                if (lastPlayingSound != null && lastPlayingSound.Stream) { lastPlayingSound.LastStreamSeekPos = soundChannel.StreamSeekPos; }
             }
 
             KeepLoopingSoundAlive(soundChannel);
@@ -248,6 +251,11 @@ void PlaySound(RoundSound selectedSound)
                 ignoreMuffling = selectedSound.IgnoreMuffling;
                 if (soundChannel != null)
                 {
+                    if (soundChannel.IsStream && lastPlayingSound == selectedSound)
+                    {
+                        soundChannel.StreamSeekPos = lastPlayingSound.LastStreamSeekPos;
+                    }
+                    lastPlayingSound = selectedSound;
                     soundChannel.Looping = loopSound;
                     KeepLoopingSoundAlive(soundChannel);
                 }
diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.9.7.0</Version>
+    <Version>1.9.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2024</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>
diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.9.7.0</Version>
+    <Version>1.9.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2024</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>
diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.9.7.0</Version>
+    <Version>1.9.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2024</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>
diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.9.7.0</Version>
+    <Version>1.9.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>
diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.9.7.0</Version>
+    <Version>1.9.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>
diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.9.7.0</Version>
+    <Version>1.9.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>
diff --git a/Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]RegEx Timeout Test/RegEx Timeout Test.sub b/Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]RegEx Timeout Test/RegEx Timeout Test.sub
diff --git a/Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]RegEx Timeout Test/filelist.xml b/Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]RegEx Timeout Test/filelist.xml
@@ -0,0 +1,4 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<contentpackage name="[DebugOnlyTest]RegEx Timeout Test" modversion="1.0.0" corepackage="False" gameversion="1.9.7.0">
+  <Submarine file="%ModDir%/RegEx Timeout Test.sub" />
+</contentpackage>
diff --git a/Barotrauma/BarotraumaShared/SharedSource/GameAnalytics/GameAnalyticsConsent.cs b/Barotrauma/BarotraumaShared/SharedSource/GameAnalytics/GameAnalyticsConsent.cs
@@ -282,6 +282,8 @@ public static void InitIfConsented()
 
         private static async Task<Consent> RequestAnswerFromRemoteDatabase()
         {
+            await Task.Yield();
+
             static void error(string reason, Exception? exception)
             {
                 DebugConsole.ThrowError($"Error in {nameof(GameAnalyticsManager)}.{nameof(RequestAnswerFromRemoteDatabase)}: {reason}", exception);
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/RegExFindComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/RegExFindComponent.cs
@@ -1,11 +1,25 @@
 ﻿using System;
+using System.Diagnostics;
 using System.Text.RegularExpressions;
 
 namespace Barotrauma.Items.Components
 {
     class RegExFindComponent : ItemComponent
     {
-        private static readonly TimeSpan timeout = TimeSpan.FromMilliseconds(1);
+        /// <summary>
+        /// The timeout should be a lot shorter (used to be 1 ms), but there seems to be an issue in .NET 8 
+        /// that sometimes causes the evaluation to randomly take a significant amount of time 
+        /// (an expression that normally takes 20 ticks might sometimes take several milliseconds every few minutes).
+        /// So let's use a relatively long timeout instead, and measure the actual time the expression took ourselves.
+        /// </summary>
+        private static readonly TimeSpan timeout = TimeSpan.FromMilliseconds(50);
+
+        private static readonly TimeSpan shortTimeout = TimeSpan.FromMilliseconds(1);
+
+        private readonly Stopwatch stopwatch = new Stopwatch();
+        private bool timedOut;
+        private int timeOutsInARow;
+        const int MaxTimeOutsInARow = 3;
 
         private string expression;
 
@@ -19,6 +33,7 @@ class RegExFindComponent : ItemComponent
 
         private bool nonContinuousOutputSent;
 
+
         private int maxOutputLength;
         [Editable, Serialize(200, IsPropertySaveable.No, description: "The maximum length of the output string. Warning: Large values can lead to large memory usage or networking issues.")]
         public int MaxOutputLength
@@ -80,7 +95,7 @@ public string Expression
                     return;
                 }
                 //reactivate the component, in case some faulty/malicious expression caused it to time out and deactivate itself
-                IsActive = true;
+                timedOut = false;
             }
         }
 
@@ -93,14 +108,39 @@ public RegExFindComponent(Item item, ContentXElement element)
 
         public override void Update(float deltaTime, Camera cam)
         {
+            if (timedOut)
+            {
+                item.SendSignal("TIMEOUT", "signal_out");
+                return;
+            }
+
             if (string.IsNullOrWhiteSpace(expression) || regex == null) { return; }
             if (!ContinuousOutput && nonContinuousOutputSent) { return; }
 
             if (receivedSignal != previousReceivedSignal && receivedSignal != null)
             {
                 try
                 {
+                    stopwatch.Restart();
                     Match match = regex.Match(receivedSignal);
+                    stopwatch.Stop();
+
+                    //workaround to regex timeout issues in .NET 8, see comment on the timeout variable
+                    if (stopwatch.Elapsed > shortTimeout)
+                    {
+                        timeOutsInARow++;
+                        //if the regex times out just once every now and then, it's a symptom of the .NET 8 bug,
+                        //if multiple times in a row, it's most likely a performance-intensive/malicious expression we should react to
+                        if (timeOutsInARow >= MaxTimeOutsInARow)
+                        {
+                            throw new RegexMatchTimeoutException();
+                        }
+                    }
+                    else
+                    {
+                        timeOutsInARow = 0;
+                    }
+
                     previousResult = match.Success;
                     previousGroups = UseCaptureGroup && previousResult ? match.Groups : null;
                     previousReceivedSignal = receivedSignal;
@@ -109,9 +149,7 @@ public override void Update(float deltaTime, Camera cam)
                 {
                     if (e is RegexMatchTimeoutException)
                     {
-                        item.SendSignal("TIMEOUT", "signal_out");
-                        //deactivate the component if the expression caused it to time out
-                        IsActive = false;
+                        timedOut = true;
                     }
                     else
                     {
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
@@ -2336,7 +2336,6 @@ public void SendPendingNetworkUpdates()
 
         private void SendPendingNetworkUpdatesInternal()
         {
-            DebugConsole.NewMessage($"Sending status event for item {Name}", Color.Gray);
             CreateStatusEvent(loadingRound: false);
             lastSentCondition = condition;
             sendConditionUpdateTimer = NetConfig.ItemConditionUpdateInterval;
diff --git a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/DelayedEffect.cs b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/DelayedEffect.cs
@@ -113,6 +113,7 @@ public override void Apply(ActionType type, float deltaTime, Entity entity, ISer
         public override void Apply(ActionType type, float deltaTime, Entity entity, IReadOnlyList<ISerializableEntity> targets, Vector2? worldPosition = null)
         {
             if (this.type != type) { return; }
+            if (Disabled) { return; }
             if (ShouldWaitForInterval(entity, deltaTime)) { return; }
             if (!HasRequiredItems(entity)) { return; }
             if (delayType == DelayTypes.ReachCursor && Character.Controlled == null) { return; }
diff --git a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
@@ -855,6 +855,9 @@ public string Tags
             }
         }
 
+        /// <summary>
+        /// Disabled effects will no longer be executed. Used to make <see cref="oneShot">oneshot</> effects only execute once.
+        /// </summary>
         public bool Disabled { get; private set; }
 
         public static StatusEffect Load(ContentXElement element, string parentDebugName)
diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,10 @@ protected override void LoadContent()`
`461`	`461`
`462`	`462`	`Eos.EosAccount.LoginPlatformSpecific();`
`463`	`463`
`464`		`- initialLoadingThread = new Thread(Load);`
	`464`	`+ initialLoadingThread = new Thread(Load)`
	`465`	`+ {`
	`466`	`+ Name = "Load"`
	`467`	`+ };`
`465`	`468`	`initialLoadingThread.Start();`
`466`	`469`	`}`
`467`	`470`
Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,7 @@ public void UpdateSounds()`
`265`	`265`	`float gainDiff = targetGain - loopingSoundChannel.Gain;`
`266`	`266`	`loopingSoundChannel.Gain += Math.Abs(gainDiff) < 0.1f ? gainDiff : Math.Sign(gainDiff) * 0.1f;`
`267`	`267`	`loopingSoundChannel.Position = new Vector3(item.WorldPosition, 0.0f);`
	`268`	`+ loopingSound.RoundSound.LastStreamSeekPos = loopingSoundChannel.StreamSeekPos;`
`268`	`269`	`}`
`269`	`270`	`for (int i = 0; i < playingOneshotSoundChannels.Count; i++)`
`270`	`271`	`{`
`@@ -409,6 +410,10 @@ private void PlaySound(ItemSound itemSound, Vector2 position)`
`409`	`410`	`loopingSoundChannel.Near = loopingSound.Range * 0.4f;`
`410`	`411`	`loopingSoundChannel.Far = loopingSound.Range;`
`411`	`412`	`}`
	`413`	`+ if (loopingSound.RoundSound.Stream)`
	`414`	`+ {`
	`415`	`+ loopingSoundChannel.StreamSeekPos = loopingSound.RoundSound.LastStreamSeekPos;`
	`416`	`+ }`
`412`	`417`	`}`
`413`	`418`	`}`
`414`	`419`	`else`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ partial void ApplyProjSpecific(float deltaTime, Entity entity, IReadOnlyList<ISe`
`152`	`152`
`153`	`153`	`private bool ignoreMuffling;`
`154`	`154`
	`155`	`+ private RoundSound lastPlayingSound;`
	`156`	`+`
`155`	`157`	`private void PlaySound(Entity entity, Hull hull, Vector2 worldPosition)`
`156`	`158`	`{`
`157`	`159`	`if (sounds.Count == 0) { return; }`
`@@ -204,6 +206,7 @@ private void PlaySound(Entity entity, Hull hull, Vector2 worldPosition)`
`204`	`206`	`else`
`205`	`207`	`{`
`206`	`208`	`soundChannel.Position = new Vector3(worldPosition, 0.0f);`
	`209`	`+ if (lastPlayingSound != null && lastPlayingSound.Stream) { lastPlayingSound.LastStreamSeekPos = soundChannel.StreamSeekPos; }`
`207`	`210`	`}`
`208`	`211`
`209`	`212`	`KeepLoopingSoundAlive(soundChannel);`
`@@ -248,6 +251,11 @@ void PlaySound(RoundSound selectedSound)`
`248`	`251`	`ignoreMuffling = selectedSound.IgnoreMuffling;`
`249`	`252`	`if (soundChannel != null)`
`250`	`253`	`{`
	`254`	`+ if (soundChannel.IsStream && lastPlayingSound == selectedSound)`
	`255`	`+ {`
	`256`	`+ soundChannel.StreamSeekPos = lastPlayingSound.LastStreamSeekPos;`
	`257`	`+ }`
	`258`	`+ lastPlayingSound = selectedSound;`
`251`	`259`	`soundChannel.Looping = loopSound;`
`252`	`260`	`KeepLoopingSoundAlive(soundChannel);`
`253`	`261`	`}`