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

Use Uid for standingstate methods (#4856)

Browse Source
This commit is contained in:
metalgearsloth
2021-10-13 18:58:18 +11:00
committed by GitHub
parent 60da7aeb8d
commit 2f3914e01e
10 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Buckle/Components/BuckleComponent.cs
View File

@@ -130,11 +130,11 @@ namespace Content.Server.Buckle.Components
ownTransform.WorldRotation = strapTransform.WorldRotation;
break;
case StrapPosition.Stand:
EntitySystem.Get<StandingStateSystem>().Stand(Owner);
EntitySystem.Get<StandingStateSystem>().Stand(Owner.Uid);
ownTransform.WorldRotation = strapTransform.WorldRotation;
break;
case StrapPosition.Down:
EntitySystem.Get<StandingStateSystem>().Down(Owner, false, false);
EntitySystem.Get<StandingStateSystem>().Down(Owner.Uid, false, false);
ownTransform.LocalRotation = Angle.Zero;
break;
}
@@ -339,11 +339,11 @@ namespace Content.Server.Buckle.Components
if (_stunnable is { KnockedDown: true }
|| (_mobState?.IsIncapacitated() ?? false))
{
EntitySystem.Get<StandingStateSystem>().Down(Owner);
EntitySystem.Get<StandingStateSystem>().Down(Owner.Uid);
}
else
{
EntitySystem.Get<StandingStateSystem>().Stand(Owner);
EntitySystem.Get<StandingStateSystem>().Stand(Owner.Uid);
}
_mobState?.CurrentState?.EnterState(Owner);

2
Content.Server/Instruments/InstrumentComponent.cs
View File

@@ -362,7 +362,7 @@ namespace Content.Server.Instruments
if (mob != null)
{
if (Handheld)
EntitySystem.Get<StandingStateSystem>().Down(mob, false);
EntitySystem.Get<StandingStateSystem>().Down(mob.Uid, false);
if (mob.TryGetComponent(out StunnableComponent? stun))
{

2
Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Morgue.Components
protected override bool AddToContents(IEntity entity)
{
if (entity.HasComponent<SharedBodyComponent>() && !EntitySystem.Get<StandingStateSystem>().IsDown(entity)) return false;
if (entity.HasComponent<SharedBodyComponent>() && !EntitySystem.Get<StandingStateSystem>().IsDown(entity.Uid)) return false;
return base.AddToContents(entity);
}

2
Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
View File

@@ -142,7 +142,7 @@ namespace Content.Server.Morgue.Components
if (CanInsert(victim))
{
Insert(victim);
EntitySystem.Get<StandingStateSystem>().Down(victim, false);
EntitySystem.Get<StandingStateSystem>().Down(victim.Uid, false);
}
else
{

2
Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
View File

@@ -68,7 +68,7 @@ namespace Content.Server.Morgue.Components
protected override bool AddToContents(IEntity entity)
{
if (entity.HasComponent<SharedBodyComponent>() && !EntitySystem.Get<StandingStateSystem>().IsDown(entity))
if (entity.HasComponent<SharedBodyComponent>() && !EntitySystem.Get<StandingStateSystem>().IsDown(entity.Uid))
return false;
return base.AddToContents(entity);
}