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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,12 +17,12 @@ namespace Content.Shared.Movement.Components
public static bool IsWeightless(this IEntity entity, PhysicsComponent? body = null, EntityCoordinates? coords = null, IMapManager? mapManager = null, IEntityManager? entityManager = null)
{
if (body == null)
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out body);
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out body);
if (IoCManager.Resolve<IEntityManager>().HasComponent<MovementIgnoreGravityComponent>(entity.Uid) ||
if (IoCManager.Resolve<IEntityManager>().HasComponent<MovementIgnoreGravityComponent>(entity) ||
(body?.BodyType & (BodyType.Static | BodyType.Kinematic)) != 0) return false;
var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid);
var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity);
var gridId = transform.GridID;
if (!gridId.IsValid())
@@ -38,7 +38,7 @@ namespace Content.Shared.Movement.Components
entityManager ??= IoCManager.Resolve<IEntityManager>();
var gridEntity = entityManager.GetEntity(gridEntityId);
if (!IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(gridEntity.Uid).Enabled)
if (!IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(gridEntity).Enabled)
{
return true;
}

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

@@ -119,7 +119,7 @@ namespace Content.Shared.Movement.Components
{
base.Initialize();
Owner.EnsureComponentWarn<PhysicsComponent>();
LastGridAngle = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Parent?.WorldRotation ?? new Angle(0);
LastGridAngle = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).Parent?.WorldRotation ?? new Angle(0);
}
/// <summary>

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

@@ -86,7 +86,7 @@ namespace Content.Shared.Movement.Components
protected override void Initialize()
{
base.Initialize();
if (!IoCManager.Resolve<IEntityManager>().HasComponent<IMoverComponent>(Owner.Uid))
if (!IoCManager.Resolve<IEntityManager>().HasComponent<IMoverComponent>(Owner))
{
Owner.EnsureComponentWarn<SharedPlayerInputMoverComponent>();
}