tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ namespace Content.Server.CharacterAppearance.Components
[ComponentReference(typeof(IActivate))]
public class MagicMirrorComponent : SharedMagicMirrorComponent, IActivate
{
[Dependency] private readonly IEntityManager _entities = default!;
[Dependency] private readonly SpriteAccessoryManager _spriteAccessoryManager = default!;
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(MagicMirrorUiKey.Key);
@@ -43,12 +44,12 @@ namespace Content.Server.CharacterAppearance.Components
private void OnUiReceiveMessage(ServerBoundUserInterfaceMessage obj)
{
if (obj.Session.AttachedEntity == null)
if (obj.Session.AttachedEntity is not {Valid: true} player)
{
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(obj.Session.AttachedEntity, out HumanoidAppearanceComponent? looks))
if (!_entities.TryGetComponent(player, out HumanoidAppearanceComponent? looks))
{
return;
}
@@ -91,17 +92,17 @@ namespace Content.Server.CharacterAppearance.Components
break;
}
EntitySystem.Get<HumanoidAppearanceSystem>().ForceAppearanceUpdate(obj.Session.AttachedEntity);
EntitySystem.Get<HumanoidAppearanceSystem>().ForceAppearanceUpdate(player);
}
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
if (!_entities.TryGetComponent(eventArgs.User, out ActorComponent? actor))
{
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out HumanoidAppearanceComponent? looks))
if (!_entities.TryGetComponent(eventArgs.User, out HumanoidAppearanceComponent? looks))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("magic-mirror-component-activate-user-has-no-hair"));
return;