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

Use EntityQuery for mob state system resolves (#29021)

Browse Source
This commit is contained in:
DrSmugleaf
2024-06-16 04:20:54 -07:00
committed by GitHub
parent 9348a5cea6
commit 32e1d1a3b5
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
View File

@@ -16,7 +16,8 @@ public partial class MobStateSystem
/// <returns>If the entity can be set to that MobState</returns>
public bool HasState(EntityUid entity, MobState mobState, MobStateComponent? component = null)
{
return Resolve(entity, ref component, false) && component.AllowedStates.Contains(mobState);
return _mobStateQuery.Resolve(entity, ref component, false) &&
component.AllowedStates.Contains(mobState);
}
/// <summary>
@@ -27,7 +28,7 @@ public partial class MobStateSystem
/// <param name="origin">Entity that caused the state update (if applicable)</param>
public void UpdateMobState(EntityUid entity, MobStateComponent? component = null, EntityUid? origin = null)
{
if (!Resolve(entity, ref component))
if (!_mobStateQuery.Resolve(entity, ref component))
return;
var ev = new UpdateMobStateEvent {Target = entity, Component = component, Origin = origin};
@@ -46,7 +47,7 @@ public partial class MobStateSystem
public void ChangeMobState(EntityUid entity, MobState mobState, MobStateComponent? component = null,
EntityUid? origin = null)
{
if (!Resolve(entity, ref component))
if (!_mobStateQuery.Resolve(entity, ref component))
return;
ChangeState(entity, component, mobState, origin: origin);