(221f9f2a6) Merge branch 'dev' into capitalizationfixes

2019-06-04 15:38:31 +03:00
parent f797235bfd
commit e592c49fa8
22 changed files with 97 additions and 72 deletions
@@ -234,6 +234,7 @@ namespace Barotrauma
            switch (order.AITag.ToLowerInvariant())
            {
                case "follow":
+                    if (orderGiver == null) { return null; }
                    newObjective = new AIObjectiveGoTo(orderGiver, character, this, repeat: true, priorityModifier: priorityModifier)
                    {
                        CloseEnough = 150,