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

Inline RemoveComponent

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:34:00 +01:00
parent f64df117be
commit e0fe09cb46
11 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.SubFloor;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Disposal.Visualizers
@@ -48,7 +49,7 @@ namespace Content.Client.Disposal.Visualizers
}
else if (appearance.Owner.HasComponent<SubFloorHideComponent>())
{
appearance.Owner.RemoveComponent<SubFloorHideComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<SubFloorHideComponent>(appearance.Owner.Uid);
}
}

2
Content.Client/Entry/EntryPoint.cs
View File

@@ -153,7 +153,7 @@ namespace Content.Client.Entry
{
if (!((!IoCManager.Resolve<IEntityManager>().EntityExists(eventArgs.OldEntity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(eventArgs.OldEntity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted))
{
eventArgs.OldEntity.RemoveComponent<CharacterInterfaceComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<CharacterInterfaceComponent>(eventArgs.OldEntity.Uid);
}
}

3
Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
View File

@@ -1,5 +1,6 @@
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace Content.Client.Weapons.Melee.Components
@@ -45,7 +46,7 @@ namespace Content.Client.Weapons.Melee.Components
if (deleteSelf)
{
Owner.RemoveComponent<MeleeLungeComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<MeleeLungeComponent>(Owner.Uid);
}
}
}