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

Merge pull request #1323 from DrSmugleaf/thrown-entity-deletion-crash-1286

Browse Source 
Fix thrown entity deletion crash
This commit is contained in:
Víctor Aguilera Puerto
2020-07-09 00:16:43 +02:00
committed by GitHub
parent 7ae114f92c 1d7928101b
commit 6f9736c381
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Projectiles;
using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.GameObjects.EntitySystems.Click;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.Physics; using Content.Shared.Physics;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -49,6 +48,11 @@ namespace Content.Server.GameObjects.Components
private void StopThrow() private void StopThrow()
{ {
if (Deleted)
{
return;
}
if (Owner.TryGetComponent(out CollidableComponent body) && body.PhysicsShapes.Count >= 1) if (Owner.TryGetComponent(out CollidableComponent body) && body.PhysicsShapes.Count >= 1)
{ {
body.PhysicsShapes[0].CollisionMask &= (int) ~CollisionGroup.ThrownItem; body.PhysicsShapes[0].CollisionMask &= (int) ~CollisionGroup.ThrownItem;