corvax-team/ss14-wl
1
0
Fork 0
mirror of https://github.com/corvax-team/ss14-wl.git synced 2026-02-15 03:31:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update submodule to 0.34.0.0 (#10356)" (#10359)

Browse Source
This commit is contained in:
metalgearsloth
2022-08-06 16:48:21 +10:00
committed by GitHub
parent bab54e5e3e
commit 45bd1edd5b
69 changed files with 86 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/UserInterface/ActivatableUISystem.cs
View File

@@ -17,7 +17,6 @@ namespace Content.Server.UserInterface
{
[Dependency] private readonly IAdminManager _adminManager = default!;
[Dependency] private readonly ActionBlockerSystem _blockerSystem = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
public override void Initialize()
{
@@ -57,7 +56,11 @@ namespace Content.Server.UserInterface
if (!TryComp(args.Performer, out ActorComponent? actor))
return;
args.Handled = _uiSystem.TryToggleUi(uid, args.Key, actor.PlayerSession);
if (!component.TryGetBoundUserInterface(args.Key, out var bui))
return;
bui.Toggle(actor.PlayerSession);
args.Handled = true;
}
private void AddOpenUiVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEvent<ActivationVerb> args)

5
Content.Server/UserInterface/UserInterfaceHelpers.cs
View File

@@ -4,10 +4,9 @@ namespace Content.Server.UserInterface
{
public static class UserInterfaceHelpers
{
[Obsolete("Use UserInterfaceSystem")]
public static BoundUserInterface? GetUIOrNull(this EntityUid entity, Enum uiKey)
public static BoundUserInterface? GetUIOrNull(this EntityUid entity, object uiKey)
{
return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<UserInterfaceSystem>().GetUiOrNull(entity, uiKey);
return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ServerUserInterfaceComponent>(entity)?.GetBoundUserInterfaceOrNull(uiKey);
}
}
}