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

Mjollnir and Singularity Hammer for Wizard (#34446)

Browse Source
This commit is contained in:
keronshb
2025-02-20 18:38:52 -05:00
committed by GitHub
parent f3c681153a
commit a9054c5e9c
29 changed files with 698 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Timing/UseDelaySystem.cs
View File

@@ -88,8 +88,11 @@ public sealed class UseDelaySystem : EntitySystem
/// <summary>
/// Returns true if the entity has a currently active UseDelay with the specified ID.
/// </summary>
public bool IsDelayed(Entity<UseDelayComponent> ent, string id = DefaultId)
public bool IsDelayed(Entity<UseDelayComponent?> ent, string id = DefaultId)
{
if (!Resolve(ent, ref ent.Comp, false))
return false;
if (!ent.Comp.Delays.TryGetValue(id, out var entry))
return false;
@@ -144,7 +147,7 @@ public sealed class UseDelaySystem : EntitySystem
/// Otherwise reset it and return true.</param>
public bool TryResetDelay(Entity<UseDelayComponent> ent, bool checkDelayed = false, string id = DefaultId)
{
if (checkDelayed && IsDelayed(ent, id))
if (checkDelayed && IsDelayed((ent.Owner, ent.Comp), id))
return false;
if (!ent.Comp.Delays.TryGetValue(id, out var entry))