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

Fixed exceptions in RespawnManager if the selected respawn shuttle doesn't have a nav terminal or any other item with a Steering component. Closes #438

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-06-10 21:30:41 +03:00
parent f59db98188
commit 917b869b92
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs
+14 -5
View File
@@ -204,8 +204,11 @@ namespace Barotrauma.Networking
respawnShuttle.Velocity = Vector2.Zero; respawnShuttle.Velocity = Vector2.Zero;
shuttleSteering.AutoPilot = false; if (shuttleSteering != null)
shuttleSteering.MaintainPos = false; {
shuttleSteering.AutoPilot = false;
shuttleSteering.MaintainPos = false;
}
} }
private void UpdateTransporting(float deltaTime) private void UpdateTransporting(float deltaTime)
@@ -264,7 +267,10 @@ namespace Barotrauma.Networking
respawnShuttle.PhysicsBody.FarseerBody.IgnoreCollisionWith(Level.Loaded.TopBarrier); respawnShuttle.PhysicsBody.FarseerBody.IgnoreCollisionWith(Level.Loaded.TopBarrier);
shuttleSteering.SetDestinationLevelStart(); if (shuttleSteering != null)
{
shuttleSteering.SetDestinationLevelStart();
}
foreach (Door door in shuttleDoors) foreach (Door door in shuttleDoors)
{ {
@@ -284,7 +290,7 @@ namespace Barotrauma.Networking
if (!CoroutineManager.IsCoroutineRunning("forcepos")) if (!CoroutineManager.IsCoroutineRunning("forcepos"))
{ {
if (shuttleSteering.SteeringPath != null && shuttleSteering.SteeringPath.Finished if ((shuttleSteering?.SteeringPath != null && shuttleSteering.SteeringPath.Finished)
|| (respawnShuttle.WorldPosition.Y + respawnShuttle.Borders.Y > Level.Loaded.StartPosition.Y - Level.ShaftHeight && || (respawnShuttle.WorldPosition.Y + respawnShuttle.Borders.Y > Level.Loaded.StartPosition.Y - Level.ShaftHeight &&
Math.Abs(Level.Loaded.StartPosition.X - respawnShuttle.WorldPosition.X) < 1000.0f)) Math.Abs(Level.Loaded.StartPosition.X - respawnShuttle.WorldPosition.X) < 1000.0f))
{ {
@@ -323,7 +329,10 @@ namespace Barotrauma.Networking
ResetShuttle(); ResetShuttle();
shuttleSteering.TargetVelocity = Vector2.Zero; if (shuttleSteering != null)
{
shuttleSteering.TargetVelocity = Vector2.Zero;
}
GameServer.Log("Dispatching the respawn shuttle.", ServerLog.MessageType.Spawning); GameServer.Log("Dispatching the respawn shuttle.", ServerLog.MessageType.Spawning);