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

Remove radiation & explosion damage logs. Add better explosion-trigger logs (#5689)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-05 15:34:32 +13:00
committed by GitHub
parent 8a236cdba8
commit ae65418c52
9 changed files with 62 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Explosion/Components/ClusterFlashComponent.cs
View File

@@ -119,7 +119,7 @@ namespace Content.Server.Explosion.Components
if (grenade.Deleted)
return;
EntitySystem.Get<TriggerSystem>().Trigger(grenade, eventArgs.User);
EntitySystem.Get<TriggerSystem>().Trigger(grenade, eventArgs.User.Uid);
});
}

4
Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Explosion.Components
private float _delay = 0f;
// TODO: Need to split this out so it's a generic "OnUseTimerTrigger" component.
public void Trigger(IEntity user)
public void Trigger(EntityUid user)
{
if (Owner.TryGetComponent(out AppearanceComponent? appearance))
appearance.SetData(TriggerVisuals.VisualState, TriggerVisualState.Primed);
@@ -26,7 +26,7 @@ namespace Content.Server.Explosion.Components
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
Trigger(eventArgs.User);
Trigger(eventArgs.User.Uid);
return true;
}
}