Fix chunk select if ChunkOrder is missing

ModernWoWTools · Jul 19, 2024 · c9b6bb7 · c9b6bb7
1 parent fe9c4e2
commit c9b6bb7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Warcraft.NET/Files/ChunkedFile.cs b/Warcraft.NET/Files/ChunkedFile.cs
@@ -43,7 +43,7 @@ public void LoadBinaryData(byte[] inData)
                 var chunkProperties = GetType()
                     .GetProperties()
                     .Where(p => (ChunkIgnoreAttribute)p.GetCustomAttribute(typeof(ChunkIgnoreAttribute), false) == null)
-                    .OrderBy(p => ((ChunkOrderAttribute)p.GetCustomAttributes(typeof(ChunkOrderAttribute), false).Single()).Order);
+                    .OrderBy(p => ((ChunkOrderAttribute)p.GetCustomAttributes(typeof(ChunkOrderAttribute), false).FirstOrDefault())?.Order ?? short.MaxValue);
 
                 foreach (PropertyInfo chunkProperty in chunkProperties)
                 {
@@ -115,7 +115,7 @@ public byte[] Serialize(long offset = 0)
                 var terrainChunkProperties = GetType()
                     .GetProperties()
                     .Where(p => (ChunkIgnoreAttribute)p.GetCustomAttribute(typeof(ChunkIgnoreAttribute), false) == null)
-                    .OrderBy(p => ((ChunkOrderAttribute)p.GetCustomAttributes(typeof(ChunkOrderAttribute), false).Single()).Order);
+                    .OrderBy(p => ((ChunkOrderAttribute)p.GetCustomAttributes(typeof(ChunkOrderAttribute), false).FirstOrDefault())?.Order ?? short.MaxValue);
 
                 foreach (PropertyInfo chunkPropertie in terrainChunkProperties)
                 {

diff --git a/Warcraft.NET/Files/WMO/WorldMapObject/BfA/WorldMapObjectRoot.cs b/Warcraft.NET/Files/WMO/WorldMapObject/BfA/WorldMapObjectRoot.cs
@@ -33,13 +33,13 @@ public class WorldMapObjectRoot : WorldMapObjectRootBase
         /// <summary>
         /// List of file ids for M2 (mdx) models that appear in this WMO.
         /// </summary>
-        [ChunkOrder(5)]
+        [ChunkOrder(5), ChunkOptional]
         public MODI DoodadFileId { get; set; }
 
         /// <summary>
         /// Scale values for doodad entries.
         /// </summary>
-        [ChunkOrder(6)]
+        [ChunkOrder(6), ChunkOptional]
         public MDDI DoodadScale { get; set; }
 
         /// <summary>

diff --git a/Warcraft.NET/Warcraft.NET.csproj b/Warcraft.NET/Warcraft.NET.csproj
@@ -33,10 +33,4 @@
   	  <_Parameter1>Warcraft.NET.Docs</_Parameter1>
   	</AssemblyAttribute>
   </ItemGroup>
-
-  <ItemGroup>
-  	<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-  	  <_Parameter1>Warcraft.NET.Tests</_Parameter1>
-  	</AssemblyAttribute>
-  </ItemGroup>
 </Project>