From c774d6071e48b18042c854b234913192d949e7df Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Thu, 18 May 2023 16:32:07 +0200 Subject: [PATCH] SporeServer: correct SporeModel xml parsing more --- SporeServer/Models/Xml/SporeModel.cs | 6 +++--- SporeServer/Models/Xml/SporeModelScenarioResource.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SporeServer/Models/Xml/SporeModel.cs b/SporeServer/Models/Xml/SporeModel.cs index f0a8378..9736025 100644 --- 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 index df06433..2e3be4e 100644 --- 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; }