Merge pull request #886 from DomCR/issue-881_npe-in-blockrecordgetsortedentities

issue 881

Author: DomCR

src/ACadSharp.Tests/Tables/BlockRecordTests.cs

@@ -128,6 +128,10 @@ public void CloneSortensTableTest()
 
 			var sorted = record.GetSortedEntities().ToArray();
 
+			Assert.NotNull(record.SortEntitiesTable);
+			Assert.NotEmpty(record.SortEntitiesTable);
+			Assert.Equal(4, record.SortEntitiesTable.Count());
+
 			Assert.Equal(l1, sorted[0]);
 			Assert.Equal(l3, sorted[1]);
 			Assert.Equal(l5, sorted[2]);
@@ -138,7 +142,7 @@ public void CloneSortensTableTest()
 
 			Assert.NotNull(clone.SortEntitiesTable);
 			Assert.NotEmpty(clone.SortEntitiesTable);
-			Assert.Equal(4, clone.SortEntitiesTable.Count());
+			Assert.Equal(5, clone.SortEntitiesTable.Count());
 
 			sorted = clone.GetSortedEntities().ToArray();
 

src/ACadSharp/ACadSharp.csproj

@@ -17,7 +17,7 @@
 	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<Version>3.2.48</Version>
+		<Version>3.2.49</Version>
 		<PackageOutputPath>../nupkg</PackageOutputPath>
 	</PropertyGroup>
 

src/ACadSharp/Tables/BlockRecord.cs

@@ -372,8 +372,7 @@ public override CadObject Clone()
 
 			if (this.SortEntitiesTable != null)
 			{
-				clone.XDictionary.Remove(SortEntitiesTable.DictionaryEntryName);
-				clone.CreateSortEntitiesTable();
+				clone.SortEntitiesTable.BlockOwner = clone;
 			}
 
 			clone.Entities = new CadObjectCollection<Entity>(clone);
@@ -382,8 +381,7 @@ public override CadObject Clone()
 				var e = (Entity)item.Clone();
 				clone.Entities.Add(e);
 
-				if (this.SortEntitiesTable != null
-					&& this.SortEntitiesTable.Select(s => s.Entity).Contains(item))
+				if (this.SortEntitiesTable != null)
 				{
 					clone.SortEntitiesTable.Add(e, this.SortEntitiesTable.GetSorterHandle(item));
 				}
@@ -464,7 +462,6 @@ public IEnumerable<Entity> GetSortedEntities()
 			}
 
 			List<(ulong, Entity)> entities = new();
-
 			foreach (var entity in this.Entities)
 			{
 				ulong sorter = this.SortEntitiesTable.GetSorterHandle(entity);