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

Stops the exception spam in console about PlayWeaponArc when the client is outside the PVS of a weapon swing. This does not fix the bug, just catches it.

Browse Source
This commit is contained in:
Acruid
2021-01-31 15:54:05 -08:00
parent e0bf335030
commit afb8e5a782
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Mobs;
using Content.Client.GameObjects.Components.Weapons.Melee; using Content.Client.GameObjects.Components.Weapons.Melee;
using Content.Shared.GameObjects.Components.Weapons.Melee; using Content.Shared.GameObjects.Components.Weapons.Melee;
@@ -14,7 +14,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Timers;
using static Content.Shared.GameObjects.EntitySystemMessages.MeleeWeaponSystemMessages; using static Content.Shared.GameObjects.EntitySystemMessages.MeleeWeaponSystemMessages;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
@@ -49,7 +48,12 @@ namespace Content.Client.GameObjects.EntitySystems
return; return;
} }
var attacker = EntityManager.GetEntity(msg.Attacker); if (!EntityManager.TryGetEntity(msg.Attacker, out var attacker))
{
//FIXME: This should never happen.
Logger.Error($"Tried to play a weapon arc {msg.ArcPrototype}, but the attacker does not exist. attacker={msg.Attacker}, source={msg.Source}");
return;
}
if (!attacker.Deleted) if (!attacker.Deleted)
{ {