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

Combat mode prediction thing (#36620)

Browse Source 
Was written before predicted popups prolly
This commit is contained in:
metalgearsloth
2025-04-16 20:27:10 +10:00
committed by GitHub
parent 14cc8f7a50
commit 7e3f3a7ca3
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/CombatMode/SharedCombatModeSystem.cs
View File

@@ -46,14 +46,8 @@ public abstract class SharedCombatModeSystem : EntitySystem
args.Handled = true; args.Handled = true;
SetInCombatMode(uid, !component.IsInCombatMode, component); SetInCombatMode(uid, !component.IsInCombatMode, component);
// TODO better handling of predicted pop-ups.
// This probably breaks if the client has prediction disabled.
if (!_netMan.IsClient || !Timing.IsFirstTimePredicted)
return;
var msg = component.IsInCombatMode ? "action-popup-combat-enabled" : "action-popup-combat-disabled"; var msg = component.IsInCombatMode ? "action-popup-combat-enabled" : "action-popup-combat-disabled";
_popup.PopupEntity(Loc.GetString(msg), args.Performer, args.Performer); _popup.PopupClient(Loc.GetString(msg), args.Performer, args.Performer);
} }
public void SetCanDisarm(EntityUid entity, bool canDisarm, CombatModeComponent? component = null) public void SetCanDisarm(EntityUid entity, bool canDisarm, CombatModeComponent? component = null)