Handling exceptions thrown at any point during coroutine update, not just at Coroutine.MoveNext, dirty workaround for a (rare?) pathfinding bug I haven't been able to reproduce
This commit is contained in:
@@ -346,6 +346,14 @@ namespace Barotrauma
|
|||||||
{
|
{
|
||||||
finalPath.Add(pathNode.Waypoint);
|
finalPath.Add(pathNode.Waypoint);
|
||||||
|
|
||||||
|
//there was one bug report that seems to have been caused by this loop never terminating:
|
||||||
|
//couldn't reproduce or figure out what caused it, but here's a workaround that prevents the game from crashing in case it happens again
|
||||||
|
if (finalPath.Count > nodes.Count)
|
||||||
|
{
|
||||||
|
DebugConsole.ThrowError("Pathfinding error: constructing final path failed");
|
||||||
|
return new SteeringPath(true);
|
||||||
|
}
|
||||||
|
|
||||||
path.Cost += pathNode.F;
|
path.Cost += pathNode.F;
|
||||||
pathNode = pathNode.Parent;
|
pathNode = pathNode.Parent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,6 +64,8 @@ namespace Barotrauma
|
|||||||
DeltaTime = deltaTime;
|
DeltaTime = deltaTime;
|
||||||
|
|
||||||
for (int i = Coroutines.Count-1; i>=0; i--)
|
for (int i = Coroutines.Count-1; i>=0; i--)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (Coroutines[i].Coroutine.Current != null)
|
if (Coroutines[i].Coroutine.Current != null)
|
||||||
{
|
{
|
||||||
@@ -86,21 +88,19 @@ namespace Barotrauma
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//try
|
|
||||||
//{
|
|
||||||
Coroutines[i].Coroutine.MoveNext();
|
Coroutines[i].Coroutine.MoveNext();
|
||||||
//}
|
}
|
||||||
|
|
||||||
//catch (Exception e)
|
catch (Exception e)
|
||||||
//{
|
{
|
||||||
// DebugConsole.ThrowError("Coroutine " + Coroutines[i].Name + " threw an exception: " + e.Message);
|
DebugConsole.ThrowError("Coroutine " + Coroutines[i].Name + " threw an exception: " + e.Message);
|
||||||
|
|
||||||
//#if DEBUG
|
//#if DEBUG
|
||||||
// throw e;
|
// throw e;
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
// Coroutines.RemoveAt(i);
|
Coroutines.RemoveAt(i);
|
||||||
// }
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -318,8 +318,8 @@ namespace Barotrauma
|
|||||||
|
|
||||||
if (leaveBehind)
|
if (leaveBehind)
|
||||||
{
|
{
|
||||||
saveElement.Add(new XAttribute("location", Level.Loaded.Seed));
|
saveElement.SetAttributeValue("location", Level.Loaded.Seed);
|
||||||
saveElement.Add(new XAttribute("worldpos", ToolBox.Vector2ToString(sub.SubBody.Position)));
|
saveElement.SetAttributeValue("worldpos", ToolBox.Vector2ToString(sub.SubBody.Position));
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -328,8 +328,7 @@ namespace Barotrauma
|
|||||||
if (saveElement.Attribute("worldpos") != null) saveElement.Attribute("worldpos").Remove();
|
if (saveElement.Attribute("worldpos") != null) saveElement.Attribute("worldpos").Remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (saveElement.Attribute("pos") != null) saveElement.Attribute("pos").Remove();
|
saveElement.SetAttributeValue("pos", ToolBox.Vector2ToString(Position - Submarine.HiddenSubPosition));
|
||||||
saveElement.Add(new XAttribute("pos", ToolBox.Vector2ToString(Position - Submarine.HiddenSubPosition)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user