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

Fix ghost actions not appearing (#15805)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-26 16:05:04 +12:00
committed by GitHub
parent 4e7cea96de
commit 250a97ae6f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Actions/ActionsSystem.cs
View File

@@ -129,9 +129,6 @@ namespace Content.Client.Actions
public override void AddAction(EntityUid uid, ActionType action, EntityUid? provider, ActionsComponent? comp = null, bool dirty = true) public override void AddAction(EntityUid uid, ActionType action, EntityUid? provider, ActionsComponent? comp = null, bool dirty = true)
{ {
if (uid != _playerManager.LocalPlayer?.ControlledEntity)
return;
if (GameTiming.ApplyingState && !action.ClientExclusive) if (GameTiming.ApplyingState && !action.ClientExclusive)
return; return;
@@ -140,14 +137,13 @@ namespace Content.Client.Actions
dirty &= !action.ClientExclusive; dirty &= !action.ClientExclusive;
base.AddAction(uid, action, provider, comp, dirty); base.AddAction(uid, action, provider, comp, dirty);
ActionAdded?.Invoke(action);
if (uid == _playerManager.LocalPlayer?.ControlledEntity)
ActionAdded?.Invoke(action);
} }
public override void RemoveAction(EntityUid uid, ActionType action, ActionsComponent? comp = null, bool dirty = true) public override void RemoveAction(EntityUid uid, ActionType action, ActionsComponent? comp = null, bool dirty = true)
{ {
if (uid != _playerManager.LocalPlayer?.ControlledEntity)
return;
if (GameTiming.ApplyingState && !action.ClientExclusive) if (GameTiming.ApplyingState && !action.ClientExclusive)
return; return;
@@ -157,7 +153,7 @@ namespace Content.Client.Actions
dirty &= !action.ClientExclusive; dirty &= !action.ClientExclusive;
base.RemoveAction(uid, action, comp, dirty); base.RemoveAction(uid, action, comp, dirty);
if (action.AutoRemove) if (action.AutoRemove && uid == _playerManager.LocalPlayer?.ControlledEntity)
ActionRemoved?.Invoke(action); ActionRemoved?.Invoke(action);
} }