fix: Fix 3.23.1 live parsing

StarCitizenWiki · May 18, 2024 · 7cecfd9 · 7cecfd9
1 parent 704c96a
commit 7cecfd9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Loader/ItemBuilder.cs b/Loader/ItemBuilder.cs
@@ -92,7 +92,9 @@ List<string> BuildTagList(EntityClassDefinition entity)
 		{
 			var tags = new List<string>();
 
-			var tagString = entity.Components.SAttachableComponentParams?.AttachDef.Tags;
+			if (entity?.Components?.SAttachableComponentParams?.AttachDef?.Tags == null) return tags;
+
+			var tagString = entity.Components?.SAttachableComponentParams?.AttachDef?.Tags;
 			if (tagString != null)
 			{
 				foreach (var tag in tagString.Split(" "))

diff --git a/Loader/ItemClassifier.cs b/Loader/ItemClassifier.cs
@@ -99,7 +99,7 @@ public string Classify(EntityClassDefinition entity)
 			{
 				if (!match.Matcher(entity)) continue;
 
-				var classification = match.Classifier(entity.Components?.SAttachableComponentParams?.AttachDef.Type, entity.Components?.SAttachableComponentParams.AttachDef.SubType);
+				var classification = match.Classifier(entity.Components?.SAttachableComponentParams?.AttachDef.Type, entity.Components?.SAttachableComponentParams?.AttachDef?.SubType);
 				if (classification?.EndsWith(".UNDEFINED") ?? false) classification = classification.Substring(0, classification.Length - 10);
 
 				return classification;

diff --git a/Loader/ItemInstaller.cs b/Loader/ItemInstaller.cs
@@ -28,7 +28,7 @@ public void InstallLoadout(StandardisedItem item, List<StandardisedLoadoutEntry>
 
 		public void InstallLoadout(EntityClassDefinition item, List<StandardisedLoadoutEntry> loadout)
 		{
-			if (item?.Components?.SItemPortContainerComponentParams?.Ports == null)
+			if (item == null || item?.Components?.SItemPortContainerComponentParams?.Ports == null)
 			{
 				return;
 			}

diff --git a/Loader/scdb.Xml/Vehicles/AngleRange.cs b/Loader/scdb.Xml/Vehicles/AngleRange.cs
@@ -6,9 +6,9 @@ namespace scdb.Xml.Vehicles
 	public class AngleRange
 	{
 		[XmlAttribute]
-		public int min;
+		public string min;
 
 		[XmlAttribute]
-		public int max;
+		public string max;
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		public void InstallLoadout(EntityClassDefinition item, List<StandardisedLoadoutEntry> loadout)
     		{
-    			if (item?.Components?.SItemPortContainerComponentParams?.Ports == null)
+    			if (item == null || item?.Components?.SItemPortContainerComponentParams?.Ports == null)
     			{
     				return;
     			}
@@ Expand Down @@