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

Close context menu on entering combat mode (#11624)

Browse Source
This commit is contained in:
metalgearsloth
2022-10-04 12:12:13 +11:00
committed by GitHub
parent d1440c1eb2
commit 5c48d9257f
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Verbs/UI/VerbMenuPresenter.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Client.CombatMode;
using Content.Client.ContextMenu.UI;
using Content.Shared.Input;
using Content.Shared.Verbs;
@@ -28,14 +29,16 @@ namespace Content.Client.Verbs.UI
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
private readonly CombatModeSystem _combatMode;
private readonly VerbSystem _verbSystem;
public EntityUid CurrentTarget;
public SortedSet<Verb> CurrentVerbs = new();
public VerbMenuPresenter(VerbSystem verbSystem)
public VerbMenuPresenter(CombatModeSystem combatMode, VerbSystem verbSystem)
{
IoCManager.InjectDependencies(this);
_combatMode = combatMode;
_verbSystem = verbSystem;
}
@@ -46,7 +49,8 @@ namespace Content.Client.Verbs.UI
/// <param name="force">Used to force showing all verbs (mostly for admins).</param>
public void OpenVerbMenu(EntityUid target, bool force = false)
{
if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} user)
if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} user ||
_combatMode.IsInCombatMode(user))
return;
Close();