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

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs
View File

@@ -48,7 +48,7 @@ namespace Content.Server.CharacterAppearance.Components
return;
}
if (!obj.Session.AttachedEntity.TryGetComponent(out HumanoidAppearanceComponent? looks))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(obj.Session.AttachedEntity.Uid, out HumanoidAppearanceComponent? looks))
{
return;
}
@@ -96,12 +96,12 @@ namespace Content.Server.CharacterAppearance.Components
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User.Uid, out ActorComponent? actor))
{
return;
}
if (!eventArgs.User.TryGetComponent(out HumanoidAppearanceComponent? looks))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User.Uid, out HumanoidAppearanceComponent? looks))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("magic-mirror-component-activate-user-has-no-hair"));
return;

3
Content.Server/CharacterAppearance/Systems/HumanoidAppearanceSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.CharacterAppearance.Components;
using Content.Shared.CharacterAppearance.Systems;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.CharacterAppearance.Systems
{
@@ -21,7 +22,7 @@ namespace Content.Server.CharacterAppearance.Systems
{
foreach (var (part, _) in body.Parts)
{
if (part.Owner.TryGetComponent(out SpriteComponent? sprite))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(part.Owner.Uid, out SpriteComponent? sprite))
{
sprite!.Color = component.Appearance.SkinColor;
}