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

adds a source uid to most damage & mobstate events (#11559)

Browse Source 
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
This commit is contained in:
Paul Ritter
2022-10-08 12:15:27 +02:00
committed by GitHub
parent 548cee77e2
commit 79854e59a4
24 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs
View File

@@ -178,7 +178,7 @@ namespace Content.Shared.MobState.EntitySystems
public void UpdateState(EntityUid _, MobStateComponent component, DamageChangedEvent args)
{
UpdateState(component, args.Damageable.TotalDamage);
UpdateState(component, args.Damageable.TotalDamage, args.Origin);
}
private void OnMoveAttempt(EntityUid uid, MobStateComponent component, UpdateCanMoveEvent args)
@@ -275,20 +275,20 @@ namespace Content.Shared.MobState.EntitySystems
/// <summary>
/// Updates the mob state..
/// </summary>
public void UpdateState(MobStateComponent component, FixedPoint2 damage)
public void UpdateState(MobStateComponent component, FixedPoint2 damage, EntityUid? origin = null)
{
if (!TryGetState(component, damage, out var newState, out var threshold))
{
return;
}
SetMobState(component, component.CurrentState, (newState.Value, threshold));
SetMobState(component, component.CurrentState, (newState.Value, threshold), origin);
}
/// <summary>
/// Sets the mob state and marks the component as dirty.
/// </summary>
private void SetMobState(MobStateComponent component, DamageState? old, (DamageState state, FixedPoint2 threshold)? current)
private void SetMobState(MobStateComponent component, DamageState? old, (DamageState state, FixedPoint2 threshold)? current, EntityUid? origin = null)
{
if (!current.HasValue)
{
@@ -313,7 +313,7 @@ namespace Content.Shared.MobState.EntitySystems
EnterState(component, state);
UpdateState(component, state, threshold);
var message = new MobStateChangedEvent(component, old, state);
var message = new MobStateChangedEvent(component, old, state, origin);
RaiseLocalEvent(component.Owner, message, true);
Dirty(component);
}

6
Content.Shared/MobState/MobStateChangedEvent.cs
View File

@@ -7,11 +7,13 @@ namespace Content.Shared.MobState
public MobStateChangedEvent(
MobStateComponent component,
DamageState? oldMobState,
DamageState currentMobState)
DamageState currentMobState,
EntityUid? origin)
{
Component = component;
OldMobState = oldMobState;
CurrentMobState = currentMobState;
Origin = origin;
}
public EntityUid Entity => Component.Owner;
@@ -21,6 +23,8 @@ namespace Content.Shared.MobState
public DamageState? OldMobState { get; }
public DamageState CurrentMobState { get; }
public EntityUid? Origin { get; }
}
public static class A