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

MobStates use EntityUid

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 12:15:12 +01:00
parent 5cec5c421c
commit e5c062559a
11 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/MobState/States/CriticalMobState.cs
View File

@@ -9,13 +9,13 @@ namespace Content.Server.MobState.States
{
public class CriticalMobState : SharedCriticalMobState
{
public override void EnterState(IEntity entity)
public override void EnterState(EntityUid uid, IEntityManager entityManager)
{
base.EnterState(entity);
base.EnterState(uid, entityManager);
if (entity.TryGetComponent(out StatusEffectsComponent? stun))
if (entityManager.TryGetComponent(uid, out StatusEffectsComponent? stun))
{
EntitySystem.Get<StatusEffectsSystem>().TryRemoveStatusEffect(entity.Uid, "Stun");
EntitySystem.Get<StatusEffectsSystem>().TryRemoveStatusEffect(uid, "Stun");
}
}
}

10
Content.Server/MobState/States/DeadMobState.cs
View File

@@ -13,18 +13,18 @@ namespace Content.Server.MobState.States
{
public class DeadMobState : SharedDeadMobState
{
public override void EnterState(IEntity entity)
public override void EnterState(EntityUid uid, IEntityManager entityManager)
{
base.EnterState(entity);
base.EnterState(uid, entityManager);
if (entity.TryGetComponent(out ServerAlertsComponent? status))
if (entityManager.TryGetComponent(uid, out ServerAlertsComponent? status))
{
status.ShowAlert(AlertType.HumanDead);
}
if (entity.TryGetComponent(out StatusEffectsComponent? stun))
if (entityManager.TryGetComponent(uid, out StatusEffectsComponent? stun))
{
EntitySystem.Get<StatusEffectsSystem>().TryRemoveStatusEffect(entity.Uid, "Stun");
EntitySystem.Get<StatusEffectsSystem>().TryRemoveStatusEffect(uid, "Stun");
}
}
}

10
Content.Server/MobState/States/NormalMobState.cs
View File

@@ -10,21 +10,21 @@ namespace Content.Server.MobState.States
{
public class NormalMobState : SharedNormalMobState
{
public override void UpdateState(IEntity entity, FixedPoint2 threshold)
public override void UpdateState(EntityUid entity, FixedPoint2 threshold, IEntityManager entityManager)
{
base.UpdateState(entity, threshold);
base.UpdateState(entity, threshold, entityManager);
if (!entity.TryGetComponent(out DamageableComponent? damageable))
if (!entityManager.TryGetComponent(entity, out DamageableComponent? damageable))
{
return;
}
if (!entity.TryGetComponent(out ServerAlertsComponent? alerts))
if (!entityManager.TryGetComponent(entity, out ServerAlertsComponent? alerts))
{
return;
}
if (!entity.TryGetComponent(out MobStateComponent? stateComponent))
if (!entityManager.TryGetComponent(entity, out MobStateComponent? stateComponent))
{
return;
}