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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -20,10 +20,10 @@ namespace Content.Server.Explosion.EntitySystems
/// </summary>
public class TriggerEvent : HandledEntityEventArgs
{
public IEntity Triggered { get; }
public IEntity? User { get; }
public EntityUid Triggered { get; }
public EntityUid User { get; }
public TriggerEvent(IEntity triggered, IEntity? user = null)
public TriggerEvent(EntityUid triggered, EntityUid user = default)
{
Triggered = triggered;
User = user;
@@ -116,13 +116,13 @@ namespace Content.Server.Explosion.EntitySystems
Trigger(component.Owner);
}
public void Trigger(IEntity trigger, IEntity? user = null)
public void Trigger(EntityUid trigger, EntityUid user = default)
{
var triggerEvent = new TriggerEvent(trigger, user);
EntityManager.EventBus.RaiseLocalEvent(trigger, triggerEvent);
}
public void HandleTimerTrigger(TimeSpan delay, IEntity triggered, IEntity? user = null)
public void HandleTimerTrigger(TimeSpan delay, EntityUid triggered, EntityUid user = default)
{
if (delay.TotalSeconds <= 0)
{