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

12
Content.Shared/Throwing/ThrowEvents.cs
View File

@@ -13,19 +13,19 @@ namespace Content.Shared.Throwing
/// <summary>
/// The entity that threw <see cref="Thrown"/>.
/// </summary>
public IEntity? User { get; }
public EntityUid? User { get; }
/// <summary>
/// The entity thrown by <see cref="User"/> that hit <see cref="Target"/>
/// </summary>
public IEntity Thrown { get; }
public EntityUid Thrown { get; }
/// <summary>
/// The entity hit with <see cref="Thrown"/> by <see cref="User"/>
/// </summary>
public IEntity Target { get; }
public EntityUid Target { get; }
public ThrowEvent(IEntity? user, IEntity thrown, IEntity target)
public ThrowEvent(EntityUid? user, EntityUid thrown, EntityUid target)
{
User = user;
Thrown = thrown;
@@ -38,7 +38,7 @@ namespace Content.Shared.Throwing
/// </summary>
public class ThrowHitByEvent : ThrowEvent
{
public ThrowHitByEvent(IEntity? user, IEntity thrown, IEntity target) : base(user, thrown, target)
public ThrowHitByEvent(EntityUid? user, EntityUid thrown, EntityUid target) : base(user, thrown, target)
{
}
}
@@ -48,7 +48,7 @@ namespace Content.Shared.Throwing
/// </summary>
public class ThrowDoHitEvent : ThrowEvent
{
public ThrowDoHitEvent(IEntity? user, IEntity thrown, IEntity target) : base(user, thrown, target)
public ThrowDoHitEvent(EntityUid? user, EntityUid thrown, EntityUid target) : base(user, thrown, target)
{
}
}

2
Content.Shared/Throwing/ThrownItemComponent.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared.Throwing
{
public override string Name => "ThrownItem";
public IEntity? Thrower { get; set; }
public EntityUid? Thrower { get; set; }
}
[Serializable, NetSerializable]

2
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -136,7 +136,7 @@ namespace Content.Shared.Throwing
/// <summary>
/// Raises collision events on the thrown and target entities.
/// </summary>
public void ThrowCollideInteraction(IEntity? user, IPhysBody thrown, IPhysBody target)
public void ThrowCollideInteraction(EntityUid? user, IPhysBody thrown, IPhysBody target)
{
if (user is not null)
_adminLogSystem.Add(LogType.ThrowHit, LogImpact.Low,