From 95fc1cc025095178c492749c735fb4c6c78a534f Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Fri, 18 May 2018 12:23:31 +0300
Subject: [PATCH] Mission initialization fixes

---
 .../Source/Events/Missions/CombatMission.cs               | 4 +++-
 .../BarotraumaShared/Source/Events/Missions/Mission.cs    | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
index be9829597..55133d72a 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
@@ -29,6 +29,8 @@ namespace Barotrauma
         {
             get
             {
+                if (descriptions == null) return "";
+
                 if (GameMain.NetworkMember==null || GameMain.NetworkMember.Character==null)
                 {
                     //non-team-specific description
@@ -47,7 +49,7 @@ namespace Barotrauma
             {
                 if (winner == -1) return "";
 
-                return SuccessMessage
+                return base.SuccessMessage
                     .Replace("[loser]", teamNames[1 - winner])
                     .Replace("[winner]", teamNames[winner]);
             }
diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
index 499c5c7f0..ab981d6f3 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
@@ -88,9 +88,9 @@ namespace Barotrauma
             
             for (int n = 0; n < 2; n++)
             {
-                Description = Description.Replace("[location" + (n + 1) + "]", locations[n].Name);
-                SuccessMessage = SuccessMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
-                FailureMessage = FailureMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
+                if (Description != null) Description = Description.Replace("[location" + (n + 1) + "]", locations[n].Name);
+                if (SuccessMessage != null) SuccessMessage = SuccessMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
+                if (FailureMessage != null) FailureMessage = FailureMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
                 for (int m = 0; m < Messages.Count; m++)
                 {
                     Messages[m] = Messages[m].Replace("[location" + (n + 1) + "]", locations[n].Name);
@@ -127,7 +127,7 @@ namespace Barotrauma
             }
             else
             {
-                allowedMissions = MissionPrefab.List.FindAll(m => m.Name.ToString().ToLowerInvariant().Replace("mission", "") == missionType);
+                allowedMissions = MissionPrefab.List.FindAll(m => m.TypeMatches(missionType));
             }
 
             if (isSinglePlayer)