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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Actions/SharedActionsSystem.cs
View File

@@ -96,7 +96,7 @@ public abstract class SharedActionsSystem : EntitySystem
{
if (result != null)
{
DebugTools.Assert(result.Owner == uid);
DebugTools.AssertOwner(uid, result);
return true;
}
@@ -494,7 +494,7 @@ public abstract class SharedActionsSystem : EntitySystem
(TryComp(action.Container, out ActionsContainerComponent? containerComp)
&& containerComp.Container.Contains(actionId)));
DebugTools.Assert(comp == null || comp.Owner == performer);
DebugTools.AssertOwner(performer, comp);
comp ??= EnsureComp<ActionsComponent>(performer);
action.AttachedEntity = performer;
comp.Actions.Add(actionId);
@@ -523,7 +523,7 @@ public abstract class SharedActionsSystem : EntitySystem
if (!Resolve(container, ref containerComp))
return;
DebugTools.Assert(comp == null || comp.Owner == performer);
DebugTools.AssertOwner(performer, comp);
comp ??= EnsureComp<ActionsComponent>(performer);
foreach (var actionId in actions)