vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed timer crash once for all - yes it was a race condition

Browse Source
This commit is contained in:
EvilFactory
2023-01-17 14:17:43 -03:00
parent 17d125e6d5
commit 2073cdf5e5
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsTimer.cs
View File

@@ -60,38 +60,44 @@ namespace Barotrauma
throw new ArgumentNullException(nameof(timedAction));
}
int insertionPoint = timedActions.BinarySearch(timedAction, new TimerComparer());
if (insertionPoint < 0)
lock (timedActions)
{
insertionPoint = ~insertionPoint;
int insertionPoint = timedActions.BinarySearch(timedAction, new TimerComparer());
if (insertionPoint < 0)
{
insertionPoint = ~insertionPoint;
}
timedActions.Insert(insertionPoint, timedAction);
}
timedActions.Insert(insertionPoint, timedAction);
}
public void Update()
{
TimedAction[] timedCopy = timedActions.ToArray();
for (int i = 0; i < timedCopy.Length; i++)
lock (timedActions)
{
TimedAction timedAction = timedCopy[i];
if (Time >= timedAction.ExecutionTime)
TimedAction[] timedCopy = timedActions.ToArray();
for (int i = 0; i < timedCopy.Length; i++)
{
try
TimedAction timedAction = timedCopy[i];
if (Time >= timedAction.ExecutionTime)
{
timedAction.Action();
}
catch (Exception e)
{
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.CSharpMod);
}
try
{
timedAction.Action();
}
catch (Exception e)
{
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.CSharpMod);
}
timedActions.Remove(timedAction);
}
else
{
break;
timedActions.Remove(timedAction);
}
else
{
break;
}
}
}
}