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

Re-do InteractionSystem IEntity -> EntityUid conversion (#5767)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-14 06:17:18 +01:00
committed by GitHub
parent fe1836c99d
commit e3478f894e
5 changed files with 76 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
View File

@@ -74,7 +74,7 @@ namespace Content.Server.Weapon.Melee
args.Handled = true;
var curTime = _gameTiming.CurTime;
if (curTime < comp.CooldownEnd || !args.Target.IsValid())
if (curTime < comp.CooldownEnd || args.Target == null)
return;
var location = EntityManager.GetComponent<TransformComponent>(args.User).Coordinates;
@@ -101,10 +101,10 @@ namespace Content.Server.Weapon.Melee
{
if (args.Used == args.User)
_logSystem.Add(LogType.MeleeHit,
$"{ToPrettyString(args.User):user} melee attacked {ToPrettyString(args.Target):target} using their hands and dealt {damageResult.Total:damage} damage");
$"{ToPrettyString(args.User):user} melee attacked {ToPrettyString(args.Target.Value):target} using their hands and dealt {damageResult.Total:damage} damage");
else
_logSystem.Add(LogType.MeleeHit,
$"{ToPrettyString(args.User):user} melee attacked {ToPrettyString(args.Target):target} using {ToPrettyString(args.Used):used} and dealt {damageResult.Total:damage} damage");
$"{ToPrettyString(args.User):user} melee attacked {ToPrettyString(args.Target.Value):target} using {ToPrettyString(args.Used):used} and dealt {damageResult.Total:damage} damage");
}
SoundSystem.Play(Filter.Pvs(owner), comp.HitSound.GetSound(), target);