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

Inline HasComponent entirely

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 12:23:18 +01:00
parent 88141ae6b8
commit 0feebbff00
117 changed files with 201 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Administration/AdminVerbSystem.cs
View File

@@ -88,7 +88,7 @@ namespace Content.Server.Administration
// Control mob verb
if (_groupController.CanCommand(player, "controlmob") &&
args.User != args.Target &&
args.User.HasComponent<MindComponent>() &&
IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(args.User.Uid) &&
args.Target.TryGetComponent<MindComponent>(out var targetMind))
{
Verb verb = new();
@@ -106,7 +106,7 @@ namespace Content.Server.Administration
// Make Sentient verb
if (_groupController.CanCommand(player, "makesentient") &&
args.User != args.Target &&
!args.Target.HasComponent<MindComponent>())
!IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(args.Target.Uid))
{
Verb verb = new();
verb.Text = Loc.GetString("make-sentient-verb-get-data-text");
@@ -138,7 +138,7 @@ namespace Content.Server.Administration
// Set clothing verb
if (_groupController.CanCommand(player, "setoutfit") &&
args.Target.HasComponent<InventoryComponent>())
IoCManager.Resolve<IEntityManager>().HasComponent<InventoryComponent>(args.Target.Uid))
{
Verb verb = new();
verb.Text = Loc.GetString("set-outfit-verb-get-data-text");
@@ -206,7 +206,7 @@ namespace Content.Server.Administration
// Add verb to open Solution Editor
if (_groupController.CanCommand(player, "addreagent") &&
args.Target.HasComponent<SolutionContainerManagerComponent>())
IoCManager.Resolve<IEntityManager>().HasComponent<SolutionContainerManagerComponent>(args.Target.Uid))
{
Verb verb = new();
verb.Text = Loc.GetString("edit-solutions-verb-get-data-text");

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

@@ -34,7 +34,7 @@ namespace Content.Server.Administration.Commands
return;
}
if (mind.VisitingEntity != null && mind.VisitingEntity.HasComponent<GhostComponent>())
if (mind.VisitingEntity != null && IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(mind.VisitingEntity.Uid))
{
player.ContentData()!.Mind?.UnVisit();
return;

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

@@ -74,7 +74,7 @@ namespace Content.Server.Administration.Commands
EntitySystem.Get<CreamPieSystem>().SetCreamPied(target.Uid, creamPied, false);
}
if (target.HasComponent<JitteringComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<JitteringComponent>(target.Uid))
{
IoCManager.Resolve<IEntityManager>().RemoveComponent<JitteringComponent>(target.Uid);
}

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

@@ -44,7 +44,7 @@ namespace Content.Server.Administration.Commands
var target = entityManager.GetEntity(eUid);
if (!target.HasComponent<MindComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(target.Uid))
{
shell.WriteLine(Loc.GetString("set-mind-command-target-has-no-mind-message"));
return;