Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix station deletion bug (#10348)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-07 15:53:07 +12:00
committed by GitHub
parent 31141ad0fb
commit 099d38b562
5 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -101,6 +101,7 @@ namespace Content.IntegrationTests.Tests
"DebugExceptionStartup",
"Map", // We aren't testing a map entity in this test
"MapGrid",
"StationData", // errors when removed mid-round
"Actor", // We aren't testing actor components, those need their player session set.
};
@@ -195,6 +196,7 @@ namespace Content.IntegrationTests.Tests
"DebugExceptionStartup",
"Map", // We aren't testing a map entity in this test
"MapGrid",
"StationData", // errors when deleted mid-round
"Actor", // We aren't testing actor components, those need their player session set.
};

17
Content.IntegrationTests/Tests/FollowerSystemTest.cs
View File

@@ -43,22 +43,7 @@ public sealed class FollowerSystemTest
followerSystem.StartFollowingEntity(follower, followed);
foreach (var ent in entMan.GetEntities().ToArray())
{
// Let's skip entities that have been deleted, as we want to get their TransformComp for extra info.
if (entMan.Deleted(ent))
{
logger.Info($"Skipping {entMan.ToPrettyString(ent)}...");
continue;
}
// Log some information about the entity before we delete it.
var transform = entMan.GetComponent<TransformComponent>(ent);
logger.Info($"Deleting entity {entMan.ToPrettyString(ent)}... Parent: {entMan.ToPrettyString(transform.ParentUid)} | Children: {string.Join(", ", transform.Children.Select(c => entMan.ToPrettyString(c.Owner)))}");
// Actually delete the entity now.
entMan.DeleteEntity(ent);
}
entMan.DeleteEntity(mapMan.GetMapEntityId(map));
});
await pairTracker.CleanReturnAsync();
}