Release v0.15.12.0

2021-10-27 18:50:57 +03:00
parent bf95e82d80
commit 234fb6bc06
450 changed files with 26042 additions and 10457 deletions
@@ -237,6 +237,9 @@ namespace Barotrauma
                    {
                        CharacterInfo.ApplyHealthData(character, character.Info.HealthData);
                    }
+
+                    character.LoadTalents();
+
                    character.GiveIdCardTags(spawnWaypoints[i]);
                    character.Info.StartItemsGiven = true;
                    if (character.Info.OrderData != null)
@@ -486,6 +489,11 @@ namespace Barotrauma
                            continue;
                    }
                }
+                if (orderInfo.Order.TargetEntity == null || (orderInfo.Order.IsIgnoreOrder && ignoreTarget == null))
+                {
+                    // The order target doesn't exist anymore, just discard the loaded order
+                    continue;
+                }
                if (ignoreTarget != null)
                {
                    ignoreTarget.OrderedToBeIgnored = true;