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

Damage other on hit player feedback (#18539)

Browse Source
This commit is contained in:
Slava0135
2023-08-02 12:30:04 +03:00
committed by GitHub
parent 3e09fe4b7c
commit e6159d8581
5 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,26 +5,15 @@ namespace Content.Shared.Throwing
/// </summary>
public abstract class ThrowEvent : HandledEntityEventArgs
{
/// <summary>
/// The entity that threw <see cref="Thrown"/>.
/// </summary>
public EntityUid? User { get; }
public readonly EntityUid Thrown;
public readonly EntityUid Target;
public ThrownItemComponent Component;
/// <summary>
/// The entity thrown by <see cref="User"/> that hit <see cref="Target"/>
/// </summary>
public EntityUid Thrown { get; }
/// <summary>
/// The entity hit with <see cref="Thrown"/> by <see cref="User"/>
/// </summary>
public EntityUid Target { get; }
public ThrowEvent(EntityUid? user, EntityUid thrown, EntityUid target)
public ThrowEvent(EntityUid thrown, EntityUid target, ThrownItemComponent component)
{
User = user;
Thrown = thrown;
Target = target;
Component = component;
}
}
@@ -33,7 +22,7 @@ namespace Content.Shared.Throwing
/// </summary>
public sealed class ThrowHitByEvent : ThrowEvent
{
public ThrowHitByEvent(EntityUid? user, EntityUid thrown, EntityUid target) : base(user, thrown, target)
public ThrowHitByEvent(EntityUid thrown, EntityUid target, ThrownItemComponent component) : base(thrown, target, component)
{
}
}
@@ -43,7 +32,7 @@ namespace Content.Shared.Throwing
/// </summary>
public sealed class ThrowDoHitEvent : ThrowEvent
{
public ThrowDoHitEvent(EntityUid? user, EntityUid thrown, EntityUid target) : base(user, thrown, target)
public ThrowDoHitEvent(EntityUid thrown, EntityUid target, ThrownItemComponent component) : base(thrown, target, component)
{
}
}