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

2
Content.Server/AI/Commands/AddAiCommand.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.AI.Commands
// TODO: IMover refffaaccctttooorrr
if (ent.HasComponent<IMoverComponent>())
{
ent.RemoveComponent<IMoverComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<IMoverComponent>(ent.Uid);
}
var comp = IoCManager.Resolve<IEntityManager>().AddComponent<UtilityAi>(ent);

2
Content.Server/Administration/Commands/RejuvenateCommand.cs
View File

@@ -76,7 +76,7 @@ namespace Content.Server.Administration.Commands
if (target.HasComponent<JitteringComponent>())
{
target.RemoveComponent<JitteringComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<JitteringComponent>(target.Uid);
}
}
}

2
Content.Server/Cloning/CloningSystem.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.Cloning
!parent.TryGetComponent<CloningPodComponent>(out var cloningPodComponent) ||
component.Owner != cloningPodComponent.BodyContainer?.ContainedEntity)
{
component.Owner.RemoveComponent<BeingClonedComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<BeingClonedComponent>(component.Owner.Uid);
return;
}

2
Content.Server/Cloning/Components/CloningPodComponent.cs
View File

@@ -171,7 +171,7 @@ namespace Content.Server.Cloning.Components
if (entity == null || CloningProgress < CloningTime)
return;
entity.RemoveComponent<BeingClonedComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<BeingClonedComponent>(entity.Uid);
BodyContainer.Remove(entity!);
CapturedMind = null;
CloningProgress = 0f;

2
Content.Server/Mind/Mind.cs
View File

@@ -379,7 +379,7 @@ namespace Content.Server.Mind
if (oldVisitingEnt!.HasComponent<VisitingMindComponent>())
{
oldVisitingEnt.RemoveComponent<VisitingMindComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<VisitingMindComponent>(oldVisitingEnt.Uid);
}
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(oldVisitingEnt.Uid, new MindUnvisitedMessage());

2
Content.Server/Pointing/Components/PointingArrowComponent.cs
View File

@@ -76,7 +76,7 @@ namespace Content.Server.Pointing.Components
{
if (_rogue)
{
Owner.RemoveComponent<PointingArrowComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<PointingArrowComponent>(Owner.Uid);
IoCManager.Resolve<IEntityManager>().AddComponent<RoguePointingArrowComponent>(Owner);
return;
}

3
Content.Server/Tabletop/TabletopSystem.Session.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Tabletop.Events;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Maths;
@@ -116,7 +117,7 @@ namespace Content.Server.Tabletop
gamer.Tabletop = EntityUid.Invalid;
// You stop being a gamer.......
attachedEntity.RemoveComponent<TabletopGamerComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<TabletopGamerComponent>(attachedEntity.Uid);
}
session.Players.Remove(player);

2
Content.Server/Tabletop/TabletopSystem.cs
View File

@@ -99,7 +99,7 @@ namespace Content.Server.Tabletop
if (!gamer.Owner.TryGetComponent(out ActorComponent? actor))
{
gamer.Owner.RemoveComponent<TabletopGamerComponent>();
IoCManager.Resolve<IEntityManager>().RemoveComponent<TabletopGamerComponent>(gamer.Owner.Uid);
return;
};