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

DoAfterSystem uses EntityUid internally, adds EntityUid constructor for DoAfterEventArgs.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-09-28 11:33:33 +02:00
parent 35067b3a3e
commit 4e6d602784
4 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/DoAfter/DoAfterSystem.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Server.DoAfter
{
foreach (var doAfter in comp.DoAfters.ToArray())
{
doAfter.Run(frameTime);
doAfter.Run(frameTime, EntityManager);
switch (doAfter.Status)
{
@@ -66,11 +66,11 @@ namespace Content.Server.DoAfter
{
comp.Cancelled(doAfter);
if(!doAfter.EventArgs.User.Deleted && doAfter.EventArgs.UserCancelledEvent != null)
RaiseLocalEvent(doAfter.EventArgs.User.Uid, doAfter.EventArgs.UserCancelledEvent, false);
if(EntityManager.EntityExists(doAfter.EventArgs.User) && doAfter.EventArgs.UserCancelledEvent != null)
RaiseLocalEvent(doAfter.EventArgs.User, doAfter.EventArgs.UserCancelledEvent, false);
if(doAfter.EventArgs.Target is { Deleted: false } && doAfter.EventArgs.TargetCancelledEvent != null)
RaiseLocalEvent(doAfter.EventArgs.Target.Uid, doAfter.EventArgs.TargetCancelledEvent, false);
if(doAfter.EventArgs.Target is {} target && EntityManager.EntityExists(target) && doAfter.EventArgs.TargetCancelledEvent != null)
RaiseLocalEvent(target, doAfter.EventArgs.TargetCancelledEvent, false);
if(doAfter.EventArgs.BroadcastCancelledEvent != null)
RaiseLocalEvent(doAfter.EventArgs.BroadcastCancelledEvent);
@@ -80,11 +80,11 @@ namespace Content.Server.DoAfter
{
comp.Finished(doAfter);
if(!doAfter.EventArgs.User.Deleted && doAfter.EventArgs.UserFinishedEvent != null)
RaiseLocalEvent(doAfter.EventArgs.User.Uid, doAfter.EventArgs.UserFinishedEvent, false);
if(EntityManager.EntityExists(doAfter.EventArgs.User) && doAfter.EventArgs.UserFinishedEvent != null)
RaiseLocalEvent(doAfter.EventArgs.User, doAfter.EventArgs.UserFinishedEvent, false);
if(doAfter.EventArgs.Target is { Deleted: false } && doAfter.EventArgs.TargetFinishedEvent != null)
RaiseLocalEvent(doAfter.EventArgs.Target.Uid, doAfter.EventArgs.TargetFinishedEvent, false);
if(doAfter.EventArgs.Target is {} target && EntityManager.EntityExists(target) && doAfter.EventArgs.TargetFinishedEvent != null)
RaiseLocalEvent(target, doAfter.EventArgs.TargetFinishedEvent, false);
if(doAfter.EventArgs.BroadcastFinishedEvent != null)
RaiseLocalEvent(doAfter.EventArgs.BroadcastFinishedEvent);
@@ -124,9 +124,9 @@ namespace Content.Server.DoAfter
private DoAfter CreateDoAfter(DoAfterEventArgs eventArgs)
{
// Setup
var doAfter = new DoAfter(eventArgs);
var doAfter = new DoAfter(eventArgs, EntityManager);
// Caller's gonna be responsible for this I guess
var doAfterComponent = eventArgs.User.GetComponent<DoAfterComponent>();
var doAfterComponent = EntityManager.GetComponent<DoAfterComponent>(eventArgs.User);
doAfterComponent.Add(doAfter);
return doAfter;
}