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

Fix salvage gibbing (#9426)

Browse Source
This commit is contained in:
wrexbe
2022-07-05 08:03:36 -07:00
committed by GitHub
parent 8c4e17eef3
commit 4766638413
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Salvage/SalvageMobRestrictionsSystem.cs
View File

@@ -20,6 +20,7 @@ using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis;
namespace Content.Server.Salvage;
@@ -63,16 +64,20 @@ public sealed class SalvageMobRestrictionsSystem : EntitySystem
private void OnRemoveGrid(EntityUid uid, SalvageMobRestrictionsGridComponent component, ComponentRemove args)
{
foreach (EntityUid target in component.MobsToKill)
var metaQuery = GetEntityQuery<MetaDataComponent>();
var bodyQuery = GetEntityQuery<BodyComponent>();
var damageQuery = GetEntityQuery<DamageableComponent>();
foreach (var target in component.MobsToKill)
{
if (TryComp(target, out BodyComponent? body))
if (Deleted(target, metaQuery)) continue;
if (bodyQuery.TryGetComponent(target, out var body))
{
// Just because.
body.Gib();
}
else if (TryComp(target, out DamageableComponent? dc))
else if (damageQuery.TryGetComponent(target, out var damageableComponent))
{
_damageableSystem.SetAllDamage(dc, 200);
_damageableSystem.SetAllDamage(damageableComponent, 200);
}
}
}