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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Administration/UI/EditSolutionsEui.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Administration.Systems;
using Content.Server.Chemistry.Components.SolutionManager;
using Content.Server.EUI;
using Content.Shared.Administration;
@@ -30,13 +31,13 @@ namespace Content.Server.Administration.UI
public override void Closed()
{
base.Closed();
EntitySystem.Get<Systems.AdminVerbSystem>().OnEditSolutionsEuiClosed(Player);
_entityManager.System<AdminVerbSystem>().OnEditSolutionsEuiClosed(Player);
}
public override EuiStateBase GetNewState()
{
var solutions = _entityManager.GetComponentOrNull<SolutionContainerManagerComponent>(Target)?.Solutions;
return new EditSolutionsEuiState(Target, solutions);
return new EditSolutionsEuiState(_entityManager.GetNetEntity(Target), solutions);
}
}
}

3
Content.Server/Administration/UI/SetOutfitEui.cs
View File

@@ -10,6 +10,7 @@ namespace Content.Server.Administration.UI
public sealed class SetOutfitEui : BaseEui
{
[Dependency] private readonly IAdminManager _adminManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
private readonly EntityUid _target;
public SetOutfitEui(EntityUid entity)
@@ -30,7 +31,7 @@ namespace Content.Server.Administration.UI
{
return new SetOutfitEuiState
{
TargetEntityId = _target
TargetNetEntity = _entManager.GetNetEntity(_target)
};
}