Inline Delete

This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:43:03 +01:00
parent f10ed6c0c3
commit e3227546b3
53 changed files with 80 additions and 60 deletions

View File

@@ -38,7 +38,7 @@ namespace Content.IntegrationTests.Tests
Assert.That(inv.Equip(Slots.HEAD, item, false), Is.True);
// Delete parent.
container.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(container.Uid);
// Assert that child item was also deleted.
Assert.That(item.Deleted, Is.True);

View File

@@ -4,6 +4,7 @@ using Content.Server.Doors.Components;
using Content.Shared.Doors;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Physics;
@@ -96,7 +97,7 @@ namespace Content.IntegrationTests.Tests.Doors
{
Assert.DoesNotThrow(() =>
{
airlock.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(airlock.Uid);
});
});

View File

@@ -49,12 +49,12 @@ namespace Content.IntegrationTests.Tests
server.Assert(() =>
{
visitEnt.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(visitEnt.Uid);
Assert.That(mind.VisitingEntity, Is.Null);
// This used to throw so make sure it doesn't.
playerEnt.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(playerEnt.Uid);
});
await server.WaitIdleAsync();
@@ -91,7 +91,7 @@ namespace Content.IntegrationTests.Tests
server.Post(() =>
{
playerEnt.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(playerEnt.Uid);
});
server.RunTicks(1);