SporeServer: correct SporeModel xml parsing more

Rosalie241 · Nov 8, 2024 · c774d60 · c774d60
1 parent 04e9590
commit c774d60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/SporeServer/Models/Xml/SporeModel.cs b/SporeServer/Models/Xml/SporeModel.cs
@@ -173,9 +173,9 @@ public static SporeModel SerializeFromXml(Stream stream)
                 {
                     AvatarLocked = XmlHelper.ParseInt32_Null(scenarioResourceNode.SelectSingleNode("bAvatarLocked")),
                     AllowedPosseMembers = XmlHelper.ParseInt32_Null(scenarioResourceNode.SelectSingleNode("numAllowedPosseMembers")),
-                    WinText = scenarioResourceNode.SelectSingleNode("winText").InnerText,
-                    LoseText = scenarioResourceNode.SelectSingleNode("loseText").InnerText,
-                    IntroText = scenarioResourceNode.SelectSingleNode("introText").InnerText,
+                    WinText = XmlHelper.ParseString_Null(scenarioResourceNode.SelectSingleNode("winText")),
+                    LoseText = XmlHelper.ParseString_Null(scenarioResourceNode.SelectSingleNode("loseText")),
+                    IntroText = XmlHelper.ParseString_Null(scenarioResourceNode.SelectSingleNode("introText")),
                     Type = XmlHelper.ParseInt64_Null(scenarioResourceNode.SelectSingleNode("type")),
                     AvatarAsset = XmlHelper.ParseInt64List(scenarioResourceNode.SelectSingleNode("mAvatarAsset").SelectSingleNode("ID"))
                 };

diff --git a/SporeServer/Models/Xml/SporeModelScenarioResource.cs b/SporeServer/Models/Xml/SporeModelScenarioResource.cs
@@ -12,9 +12,9 @@ public class SporeModelScenarioResource
     {
         public Int32? AvatarLocked { get; set; }
         public Int32? AllowedPosseMembers { get; set; }
-        public string WinText { get; set; }
-        public string LoseText { get; set; }
-        public string IntroText { get; set; }
+        public string? WinText { get; set; }
+        public string? LoseText { get; set; }
+        public string? IntroText { get; set; }
         public Int64? Type { get; set; }
         public Int64[]? AvatarAsset { get; set; }
         public SporeModelScenarioResourceAct[] Acts { get; set; }