tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bunch more error fixes.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-04 12:59:44 +01:00
parent 151778a1b9
commit 2ff16a580b
31 changed files with 120 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Shared.Pulling
{
[Dependency] private readonly ActionBlockerSystem _blocker = default!;
public bool CanPull(IEntity puller, IEntity pulled)
public bool CanPull(EntityUid puller, EntityUid pulled)
{
if (!IoCManager.Resolve<IEntityManager>().HasComponent<SharedPullerComponent>(puller))
{
@@ -73,7 +73,7 @@ namespace Content.Shared.Pulling
return !startPull.Cancelled;
}
public bool TogglePull(IEntity puller, SharedPullableComponent pullable)
public bool TogglePull(EntityUid puller, SharedPullableComponent pullable)
{
if (pullable.Puller == puller)
{
@@ -84,7 +84,7 @@ namespace Content.Shared.Pulling
// -- Core attempted actions --
public bool TryStopPull(SharedPullableComponent pullable, IEntity? user = null)
public bool TryStopPull(SharedPullableComponent pullable, EntityUid? user = null)
{
if (!pullable.BeingPulled)
{
@@ -100,13 +100,13 @@ namespace Content.Shared.Pulling
return true;
}
public bool TryStartPull(IEntity puller, IEntity pullable)
public bool TryStartPull(EntityUid puller, EntityUid pullable)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullerComponent?>(puller, out var pullerComp))
if (!EntityManager.TryGetComponent<SharedPullerComponent?>(puller, out var pullerComp))
{
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullableComponent?>(pullable, out var pullableComp))
if (!EntityManager.TryGetComponent<SharedPullableComponent?>(pullable, out var pullableComp))
{
return false;
}
@@ -121,17 +121,17 @@ namespace Content.Shared.Pulling
// Pulling a new object : Perform sanity checks.
if (!EntitySystem.Get<SharedPullingSystem>().CanPull(puller.Owner, pullable.Owner))
if (!CanPull(puller.Owner, pullable.Owner))
{
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent?>(puller.Owner, out var pullerPhysics))
if (!EntityManager.TryGetComponent<PhysicsComponent?>(puller.Owner, out var pullerPhysics))
{
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent?>(pullable.Owner, out var pullablePhysics))
if (!EntityManager.TryGetComponent<PhysicsComponent?>(pullable.Owner, out var pullablePhysics))
{
return false;
}
@@ -143,7 +143,7 @@ namespace Content.Shared.Pulling
var oldPullable = puller.Pulling;
if (oldPullable != null)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullableComponent?>(oldPullable, out var oldPullableComp))
if (EntityManager.TryGetComponent<SharedPullableComponent?>(oldPullable.Value, out var oldPullableComp))
{
if (!TryStopPull(oldPullableComp))
{