(44994edc6) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

2019-05-16 06:21:10 +03:00
parent 48070a3f90
commit fcd95da483
14 changed files with 344 additions and 133 deletions
@@ -224,6 +224,10 @@ namespace Barotrauma
                // Recreate objectives, because some of them may be removed, if impossible to complete (e.g. due to path finding)
                CreateAutonomousObjectives();
            }
+            else
+            {
+                CurrentOrder.Reset();
+            }
        }

        public AIObjective CreateObjective(Order order, string option, Character orderGiver, float priorityModifier = 1)