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

More error fixes.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-04 12:47:09 +01:00
parent 424c83e39c
commit 151778a1b9
30 changed files with 97 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Pulling/Components/PullableComponent.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Shared.Pulling.Components
/// The current entity pulling this component.
/// SharedPullingStateManagementSystem should be writing this. This means definitely not you.
/// </summary>
public IEntity? Puller { get; set; }
public EntityUid? Puller { get; set; }
/// <summary>
/// The pull joint.
/// SharedPullingStateManagementSystem should be writing this. This means probably not you.
@@ -71,7 +71,7 @@ namespace Content.Shared.Pulling.Components
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullerComponent?>(entity, out var comp))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullerComponent?>(entity.Value, out var comp))
{
Logger.Error($"Entity {state.Puller.Value} for pulling had no Puller component");
// ensure it disconnects from any different puller, still

2
Content.Shared/Pulling/Components/SharedPullerComponent.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Shared.Pulling.Components
public float SprintSpeedModifier => Pulling == null ? 1.0f : 0.75f;
[ViewVariables]
public IEntity? Pulling { get; set; }
public EntityUid? Pulling { get; set; }
protected override void Shutdown()
{

6
Content.Shared/Pulling/Events/StartPullAttemptEvent.cs
View File

@@ -7,13 +7,13 @@ namespace Content.Shared.Pulling.Events
/// </summary>
public class StartPullAttemptEvent : CancellableEntityEventArgs
{
public StartPullAttemptEvent(IEntity puller, IEntity pulled)
public StartPullAttemptEvent(EntityUid puller, EntityUid pulled)
{
Puller = puller;
Pulled = pulled;
}
public IEntity Puller { get; }
public IEntity Pulled { get; }
public EntityUid Puller { get; }
public EntityUid Pulled { get; }
}
}