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

Inline HasComponent entirely

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 12:23:18 +01:00
parent 88141ae6b8
commit 0feebbff00
117 changed files with 201 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Shared.Movement.Components
if (body == null)
entity.TryGetComponent(out body);
if (entity.HasComponent<MovementIgnoreGravityComponent>() ||
if (IoCManager.Resolve<IEntityManager>().HasComponent<MovementIgnoreGravityComponent>(entity.Uid) ||
(body?.BodyType & (BodyType.Static | BodyType.Kinematic)) != 0) return false;
var transform = entity.Transform;

3
Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs
View File

@@ -1,6 +1,7 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Players;
@@ -85,7 +86,7 @@ namespace Content.Shared.Movement.Components
protected override void Initialize()
{
base.Initialize();
if (!Owner.HasComponent<IMoverComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<IMoverComponent>(Owner.Uid))
{
Owner.EnsureComponentWarn<SharedPlayerInputMoverComponent>();
}

2
Content.Shared/Movement/SharedMoverController.cs
View File

@@ -164,7 +164,7 @@ namespace Content.Shared.Movement
protected bool UseMobMovement(PhysicsComponent body)
{
return body.BodyStatus == BodyStatus.OnGround &&
body.Owner.HasComponent<MobStateComponent>() &&
IoCManager.Resolve<IEntityManager>().HasComponent<MobStateComponent>(body.Owner.Uid) &&
// If we're being pulled then don't mess with our velocity.
(!body.Owner.TryGetComponent(out SharedPullableComponent? pullable) || !pullable.BeingPulled) &&
_blocker.CanMove(body.OwnerUid);