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

fix butchering bug (#12253)

Browse Source 
* fix butchering bug

* gib again
This commit is contained in:
Rane
2022-11-08 15:50:05 -05:00
committed by GitHub
parent c82782b54d
commit 3b9cb3346d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Kitchen/EntitySystems/SharpSystem.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Nutrition.Components;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Storage; using Content.Shared.Storage;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Content.Shared.Destructible;
using Robust.Server.Containers; using Robust.Server.Containers;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Random; using Robust.Shared.Random;
@@ -18,6 +19,7 @@ namespace Content.Server.Kitchen.EntitySystems;
public sealed class SharpSystem : EntitySystem public sealed class SharpSystem : EntitySystem
{ {
[Dependency] private readonly BodySystem _bodySystem = default!; [Dependency] private readonly BodySystem _bodySystem = default!;
[Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly ContainerSystem _containerSystem = default!; [Dependency] private readonly ContainerSystem _containerSystem = default!;
@@ -108,13 +110,9 @@ public sealed class SharpSystem : EntitySystem
popupEnt, Filter.Entities(ev.User), popupType); popupEnt, Filter.Entities(ev.User), popupType);
if (hasBody) if (hasBody)
{
_bodySystem.GibBody(body!.Owner, body: body); _bodySystem.GibBody(body!.Owner, body: body);
}
else _destructibleSystem.DestroyEntity(ev.Entity);
{
QueueDel(ev.Entity);
}
} }
private void OnDoafterCancelled(SharpButcherDoafterCancelled ev) private void OnDoafterCancelled(SharpButcherDoafterCancelled ev)