space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Inline Delete

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:43:03 +01:00
parent f44d797057
commit ba8deea700
10 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Client/Placement/PlacementManager.cs
View File

@@ -662,7 +662,7 @@ namespace Robust.Client.Placement
if (CurrentPlacementOverlayEntity != null)
{
if (!((!IoCManager.Resolve<IEntityManager>().EntityExists(CurrentPlacementOverlayEntity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(CurrentPlacementOverlayEntity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted))
CurrentPlacementOverlayEntity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(CurrentPlacementOverlayEntity.Uid);
CurrentPlacementOverlayEntity = null;
}
}

2
Robust.Server/Console/Commands/DeleteCommand.cs
View File

@@ -33,7 +33,7 @@ namespace Robust.Server.Console.Commands
return;
}
entity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
}
}
}

2
Robust.Server/Placement/PlacementManager.cs
View File

@@ -214,7 +214,7 @@ namespace Robust.Server.Placement
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || entity.HasComponent<IMapGridComponent>() || entity.HasComponent<ActorComponent>())
continue;
entity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
}
}

3
Robust.Shared/Containers/Container.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -61,7 +62,7 @@ namespace Robust.Shared.Containers
foreach (var entity in _containerList)
{
entity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
}
}
}

2
Robust.Shared/Containers/ContainerHelpers.cs
View File

@@ -142,7 +142,7 @@ namespace Robust.Shared.Containers
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(ent.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ent.Uid).EntityLifeStage) >= EntityLifeStage.Deleted) continue;
container.ForceRemove(ent);
ent.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(ent.Uid);
}
}

7
Robust.Shared/Containers/ContainerSlot.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -84,7 +85,11 @@ namespace Robust.Shared.Containers
{
base.Shutdown();
ContainedEntity?.Delete();
IEntity? tempQualifier = ContainedEntity;
if (tempQualifier != null)
{
IoCManager.Resolve<IEntityManager>().DeleteEntity(tempQualifier.Uid);
}
}
}
}

5
Robust.Shared/GameObjects/IEntity.cs
View File

@@ -104,11 +104,6 @@ namespace Robust.Shared.GameObjects
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(Uid);
}
public void Delete()
{
IoCManager.Resolve<IEntityManager>().DeleteEntity(Uid);
}
#endregion Components
public override string ToString()

8
Robust.Shared/Map/MapManager.cs
View File

@@ -92,7 +92,7 @@ namespace Robust.Shared.Map
foreach (var childTransform in mapEnt.Transform.Children.ToArray())
{
childTransform.Owner.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(childTransform.Owner.Uid);
}
}
@@ -140,7 +140,7 @@ namespace Robust.Shared.Map
if (_entityManager.TryGetEntity(entId, out var entity))
{
Logger.InfoS("map", $"Deleting map entity {entId}");
entity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
}
if (_mapEntities.Remove(MapId.Nullspace))
@@ -208,7 +208,7 @@ namespace Robust.Shared.Map
if (_mapEntities.TryGetValue(mapID, out var ent))
{
if (_entityManager.TryGetEntity(ent, out var mapEnt))
mapEnt.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(mapEnt.Uid);
_mapEntities.Remove(mapID);
}
@@ -712,7 +712,7 @@ namespace Robust.Shared.Map
// DeleteGrid may be triggered by the entity being deleted,
// so make sure that's not the case.
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(gridEnt.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(gridEnt.Uid).EntityLifeStage) <= EntityLifeStage.MapInitialized)
gridEnt.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(gridEnt.Uid);
}
grid.Dispose();

10
Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
View File

@@ -64,7 +64,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
Assert.That(manager.GetContainer("dummy2"), Is.EqualTo(container2));
Assert.That(() => manager.GetContainer("dummy3"), Throws.TypeOf<KeyNotFoundException>());
entity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
Assert.That(manager.Deleted, Is.True);
Assert.That(container.Deleted, Is.True);
@@ -94,7 +94,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
Assert.That(success, Is.False);
container.Insert(inserted);
owner.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(owner.Uid);
// Make sure inserted was detached.
Assert.That(transform.Deleted, Is.True);
}
@@ -121,7 +121,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
Assert.That(container.Contains(entity), Is.True);
Assert.That(entity.Transform.Parent!.Owner, Is.EqualTo(owner));
owner.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(owner.Uid);
Assert.That(transform.Deleted, Is.True);
}
@@ -153,7 +153,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
Assert.That(container.Contains(entityItem), Is.True);
Assert.That(entityItem.Transform.Parent!.Owner, Is.EqualTo(entityOne));
entityOne.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(entityOne.Uid);
Assert.That((!IoCManager.Resolve<IEntityManager>().EntityExists(entityTwo.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entityTwo.Uid).EntityLifeStage) >= EntityLifeStage.Deleted, Is.True);
}
@@ -317,7 +317,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
foreach (var entity in _containerList)
{
entity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
}
}

4
Robust.UnitTesting/Shared/Map/EntityCoordinates_Tests.cs
View File

@@ -84,7 +84,7 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(result, Is.True);
mapEntity.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(mapEntity.Uid);
result = coords.IsValid(entityManager);
@@ -251,7 +251,7 @@ namespace Robust.UnitTesting.Shared.Map
Assert.That(newEntParent, Is.EqualTo(mapEnt));
// Deleting the parent should make TryGetParent return false.
mapEnt.Delete();
IoCManager.Resolve<IEntityManager>().DeleteEntity(mapEnt.Uid);
// These shouldn't be valid anymore.
Assert.That((!IoCManager.Resolve<IEntityManager>().EntityExists(newEnt.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(newEnt.Uid).EntityLifeStage) >= EntityLifeStage.Deleted, Is.True);