From e5c062559aa3ec048d52845cfa1e8bd953099102 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Tue, 9 Nov 2021 12:15:12 +0100 Subject: [PATCH] MobStates use EntityUid --- .../MobState/States/DeadMobState.cs | 6 ++--- .../Buckle/Components/BuckleComponent.cs | 2 +- .../MobState/States/CriticalMobState.cs | 8 +++---- .../MobState/States/DeadMobState.cs | 10 ++++---- .../MobState/States/NormalMobState.cs | 10 ++++---- .../MobState/Components/MobStateComponent.cs | 10 ++++---- Content.Shared/MobState/State/BaseMobState.cs | 6 ++--- Content.Shared/MobState/State/IMobState.cs | 6 ++--- .../MobState/State/SharedCriticalMobState.cs | 16 ++++++------- .../MobState/State/SharedDeadMobState.cs | 24 +++++++++---------- .../MobState/State/SharedNormalMobState.cs | 8 +++---- 11 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Content.Client/MobState/States/DeadMobState.cs b/Content.Client/MobState/States/DeadMobState.cs index d33840bc13..93c3264951 100644 --- a/Content.Client/MobState/States/DeadMobState.cs +++ b/Content.Client/MobState/States/DeadMobState.cs @@ -8,11 +8,11 @@ namespace Content.Client.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 AppearanceComponent? appearance)) + if (entityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) { appearance.SetData(DamageStateVisuals.State, DamageState.Dead); } diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index 089e5631e9..50791f55db 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/Content.Server/Buckle/Components/BuckleComponent.cs @@ -335,7 +335,7 @@ namespace Content.Server.Buckle.Components EntitySystem.Get().Stand(Owner.Uid); } - _mobState?.CurrentState?.EnterState(Owner); + _mobState?.CurrentState?.EnterState(Owner.Uid, Owner.EntityManager); UpdateBuckleStatus(); diff --git a/Content.Server/MobState/States/CriticalMobState.cs b/Content.Server/MobState/States/CriticalMobState.cs index 660cded153..f692ca59f1 100644 --- a/Content.Server/MobState/States/CriticalMobState.cs +++ b/Content.Server/MobState/States/CriticalMobState.cs @@ -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().TryRemoveStatusEffect(entity.Uid, "Stun"); + EntitySystem.Get().TryRemoveStatusEffect(uid, "Stun"); } } } diff --git a/Content.Server/MobState/States/DeadMobState.cs b/Content.Server/MobState/States/DeadMobState.cs index 13030e723b..81d05e66ad 100644 --- a/Content.Server/MobState/States/DeadMobState.cs +++ b/Content.Server/MobState/States/DeadMobState.cs @@ -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().TryRemoveStatusEffect(entity.Uid, "Stun"); + EntitySystem.Get().TryRemoveStatusEffect(uid, "Stun"); } } } diff --git a/Content.Server/MobState/States/NormalMobState.cs b/Content.Server/MobState/States/NormalMobState.cs index 0094a98ec2..f86b29b151 100644 --- a/Content.Server/MobState/States/NormalMobState.cs +++ b/Content.Server/MobState/States/NormalMobState.cs @@ -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; } diff --git a/Content.Shared/MobState/Components/MobStateComponent.cs b/Content.Shared/MobState/Components/MobStateComponent.cs index 5591391c61..f19c4e78d3 100644 --- a/Content.Shared/MobState/Components/MobStateComponent.cs +++ b/Content.Shared/MobState/Components/MobStateComponent.cs @@ -290,7 +290,7 @@ namespace Content.Shared.MobState.Components { if (!current.HasValue) { - old?.ExitState(Owner); + old?.ExitState(Owner.Uid, Owner.EntityManager); return; } @@ -300,16 +300,16 @@ namespace Content.Shared.MobState.Components if (state == old) { - state.UpdateState(Owner, threshold); + state.UpdateState(Owner.Uid, threshold, Owner.EntityManager); return; } - old?.ExitState(Owner); + old?.ExitState(Owner.Uid, Owner.EntityManager); CurrentState = state; - state.EnterState(Owner); - state.UpdateState(Owner, threshold); + state.EnterState(Owner.Uid, Owner.EntityManager); + state.UpdateState(Owner.Uid, threshold, Owner.EntityManager); var message = new MobStateChangedMessage(this, old, state); #pragma warning disable 618 diff --git a/Content.Shared/MobState/State/BaseMobState.cs b/Content.Shared/MobState/State/BaseMobState.cs index 620d48ca26..370cb7f5b0 100644 --- a/Content.Shared/MobState/State/BaseMobState.cs +++ b/Content.Shared/MobState/State/BaseMobState.cs @@ -29,10 +29,10 @@ namespace Content.Shared.MobState.State return IsCritical() || IsDead(); } - public virtual void EnterState(IEntity entity) { } + public virtual void EnterState(EntityUid uid, IEntityManager entityManager) { } - public virtual void ExitState(IEntity entity) { } + public virtual void ExitState(EntityUid uid, IEntityManager entityManager) { } - public virtual void UpdateState(IEntity entity, FixedPoint2 threshold) { } + public virtual void UpdateState(EntityUid entity, FixedPoint2 threshold, IEntityManager entityManager) { } } } diff --git a/Content.Shared/MobState/State/IMobState.cs b/Content.Shared/MobState/State/IMobState.cs index c7c493e538..acb9a468a5 100644 --- a/Content.Shared/MobState/State/IMobState.cs +++ b/Content.Shared/MobState/State/IMobState.cs @@ -27,16 +27,16 @@ namespace Content.Shared.MobState.State /// /// Called when this state is entered. /// - void EnterState(IEntity entity); + void EnterState(EntityUid uid, IEntityManager entityManager); /// /// Called when this state is left for a different state. /// - void ExitState(IEntity entity); + void ExitState(EntityUid uid, IEntityManager entityManager); /// /// Called when this state is updated. /// - void UpdateState(IEntity entity, FixedPoint2 threshold); + void UpdateState(EntityUid entity, FixedPoint2 threshold, IEntityManager entityManager); } } diff --git a/Content.Shared/MobState/State/SharedCriticalMobState.cs b/Content.Shared/MobState/State/SharedCriticalMobState.cs index 8eddf4fc5a..0962cc3ca8 100644 --- a/Content.Shared/MobState/State/SharedCriticalMobState.cs +++ b/Content.Shared/MobState/State/SharedCriticalMobState.cs @@ -11,28 +11,28 @@ namespace Content.Shared.MobState.State { protected override DamageState DamageState => DamageState.Critical; - 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 SharedAlertsComponent? status)) + if (entityManager.TryGetComponent(uid, out SharedAlertsComponent? status)) { status.ShowAlert(AlertType.HumanCrit); // TODO: combine humancrit-0 and humancrit-1 into a gif and display it } - EntitySystem.Get().Down(entity.Uid); + EntitySystem.Get().Down(uid); - if (entity.TryGetComponent(out SharedAppearanceComponent? appearance)) + if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) { appearance.SetData(DamageStateVisuals.State, DamageState.Critical); } } - public override void ExitState(IEntity entity) + public override void ExitState(EntityUid uid, IEntityManager entityManager) { - base.ExitState(entity); + base.ExitState(uid, entityManager); - EntitySystem.Get().Stand(entity.Uid); + EntitySystem.Get().Stand(uid); } } } diff --git a/Content.Shared/MobState/State/SharedDeadMobState.cs b/Content.Shared/MobState/State/SharedDeadMobState.cs index 75de9026ac..9f2b6e4198 100644 --- a/Content.Shared/MobState/State/SharedDeadMobState.cs +++ b/Content.Shared/MobState/State/SharedDeadMobState.cs @@ -8,37 +8,37 @@ namespace Content.Shared.MobState.State { protected override DamageState DamageState => DamageState.Dead; - public override void EnterState(IEntity entity) + public override void EnterState(EntityUid uid, IEntityManager entityManager) { - base.EnterState(entity); - var wake = entity.EnsureComponent(); + base.EnterState(uid, entityManager); + var wake = entityManager.EnsureComponent(uid); wake.Enabled = true; var standingState = EntitySystem.Get(); - standingState.Down(entity.Uid); + standingState.Down(uid); - if (standingState.IsDown(entity.Uid) && entity.TryGetComponent(out PhysicsComponent? physics)) + if (standingState.IsDown(uid) && entityManager.TryGetComponent(uid, out PhysicsComponent? physics)) { physics.CanCollide = false; } - if (entity.TryGetComponent(out SharedAppearanceComponent? appearance)) + if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) { appearance.SetData(DamageStateVisuals.State, DamageState.Dead); } } - public override void ExitState(IEntity entity) + public override void ExitState(EntityUid uid, IEntityManager entityManager) { - base.ExitState(entity); - if (entity.HasComponent()) + base.ExitState(uid, entityManager); + if (entityManager.HasComponent(uid)) { - entity.RemoveComponent(); + entityManager.RemoveComponent(uid); } var standingState = EntitySystem.Get(); - standingState.Stand(entity.Uid); + standingState.Stand(uid); - if (!standingState.IsDown(entity.Uid) && entity.TryGetComponent(out PhysicsComponent? physics)) + if (!standingState.IsDown(uid) && entityManager.TryGetComponent(uid, out PhysicsComponent? physics)) { physics.CanCollide = true; } diff --git a/Content.Shared/MobState/State/SharedNormalMobState.cs b/Content.Shared/MobState/State/SharedNormalMobState.cs index 681e70e89a..f90c40d823 100644 --- a/Content.Shared/MobState/State/SharedNormalMobState.cs +++ b/Content.Shared/MobState/State/SharedNormalMobState.cs @@ -11,12 +11,12 @@ namespace Content.Shared.MobState.State { protected override DamageState DamageState => DamageState.Alive; - public override void EnterState(IEntity entity) + public override void EnterState(EntityUid uid, IEntityManager entityManager) { - base.EnterState(entity); - EntitySystem.Get().Stand(entity.Uid); + base.EnterState(uid, entityManager); + EntitySystem.Get().Stand(uid); - if (entity.TryGetComponent(out SharedAppearanceComponent? appearance)) + if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) { appearance.SetData(DamageStateVisuals.State, DamageState.Alive); }