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

Fix damage mispredict (#13304)

Browse Source 
Fixes https://github.com/space-wizards/space-station-14/issues/13147
This commit is contained in:
Leon Friedrich
2023-01-03 19:43:35 +13:00
committed by GitHub
parent 05c02540e6
commit 52272e19cd
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Damage/Systems/DamageableSystem.cs
View File

@@ -7,6 +7,7 @@ using Content.Shared.MobState.Components;
using Content.Shared.Radiation.Events; using Content.Shared.Radiation.Events;
using Content.Shared.Rejuvenate; using Content.Shared.Rejuvenate;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Network;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -16,6 +17,7 @@ namespace Content.Shared.Damage
{ {
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly INetManager _netMan = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -231,7 +233,15 @@ namespace Content.Shared.Damage
private void DamageableGetState(EntityUid uid, DamageableComponent component, ref ComponentGetState args) private void DamageableGetState(EntityUid uid, DamageableComponent component, ref ComponentGetState args)
{ {
args.State = new DamageableComponentState(component.Damage.DamageDict, component.DamageModifierSetId); if (_netMan.IsServer)
{
args.State = new DamageableComponentState(component.Damage.DamageDict, component.DamageModifierSetId);
}
else
{
// avoid mispredicting damage on newly spawned entities.
args.State = new DamageableComponentState(component.Damage.DamageDict.ShallowClone(), component.DamageModifierSetId);
}
} }
private void OnIrradiated(EntityUid uid, DamageableComponent component, OnIrradiatedEvent args) private void OnIrradiated(EntityUid uid, DamageableComponent component, OnIrradiatedEvent args)