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

Fix HasComp(uid, Type) (#4594)

Browse Source
This commit is contained in:
metalgearsloth
2023-11-23 16:52:31 +11:00
committed by GitHub
parent bd73f1c05a
commit 861807f8b4
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Shared/GameObjects/EntityManager.Components.cs
View File

@@ -583,7 +583,7 @@ namespace Robust.Shared.GameObjects
if (!IsAlive(uid) || !_world.TryGet(uid, type, out var comp))
return false;
return ((IComponent)comp!).Deleted;
return !((IComponent)comp!).Deleted;
}
/// <inheritdoc />

36
Robust.UnitTesting/Shared/GameObjects/EntityManager_Components_Tests.cs
View File

@@ -82,7 +82,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.HasComponent<DummyComponent>(entity);
@@ -91,6 +91,22 @@ namespace Robust.UnitTesting.Shared.GameObjects
Assert.That(result, Is.True);
}
[Test]
public void HasComponentNoGenericTest()
{
// Arrange
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.HasComponent(entity, typeof(DummyComponent));
// Assert
Assert.That(result, Is.True);
}
[Test]
public void HasNetComponentTest()
{
@@ -102,7 +118,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.HasComponent(entity, netId.Value);
@@ -122,7 +138,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.GetComponent(entity, netId.Value);
@@ -138,7 +154,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.TryGetComponent<DummyComponent>(entity, out var comp);
@@ -159,7 +175,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.TryGetComponent(entity, netId.Value, out var comp);
@@ -176,7 +192,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
entMan.RemoveComponent<DummyComponent>(entity);
@@ -214,7 +230,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
entMan.RemoveComponent(entity, netId.Value);
@@ -231,7 +247,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.GetComponents<DummyComponent>(entity);
@@ -249,7 +265,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = SimulationFactory();
var entMan = sim.Resolve<IEntityManager>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.EntityQuery<DummyComponent>(true);
@@ -268,7 +284,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var entMan = sim.Resolve<IEntityManager>();
var fac = sim.Resolve<IComponentFactory>();
var entity = entMan.SpawnEntity(null, DefaultCoords);
var component = IoCManager.Resolve<IEntityManager>().AddComponent<DummyComponent>(entity);
var component = entMan.AddComponent<DummyComponent>(entity);
// Act
var result = entMan.GetComponents(entity);