Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -15,6 +15,8 @@ namespace Barotrauma
public override bool AllowInAnySub => true;
public override bool AllowWhileHandcuffed => false;
private readonly Hull targetHull;
private AIObjectiveGetItem getExtinguisherObjective;
@@ -30,8 +32,7 @@ namespace Barotrauma
{
if (!IsAllowed)
{
Priority = 0;
Abandon = true;
HandleNonAllowed();
return Priority;
}
bool isOrder = objectiveManager.HasOrder<AIObjectiveExtinguishFires>();
@@ -176,19 +177,19 @@ namespace Barotrauma
getExtinguisherObjective = null;
gotoObjective = null;
sinTime = 0;
SteeringManager.Reset();
SteeringManager?.Reset();
}
protected override void OnCompleted()
{
base.OnCompleted();
SteeringManager.Reset();
SteeringManager?.Reset();
}
protected override void OnAbandon()
{
base.OnAbandon();
SteeringManager.Reset();
SteeringManager?.Reset();
}
}
}