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

Fix butchering inside of a container making the target unbutcherable permenantly (#12328)

Browse Source
This commit is contained in:
Jacob Tong
2022-10-31 22:52:53 -07:00
committed by GitHub
parent 924d21d2b9
commit dbb23f9cf7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,11 +83,11 @@ public sealed class SharpSystem : EntitySystem
if (!TryComp<SharpComponent>(ev.Sharp, out var sharp)) if (!TryComp<SharpComponent>(ev.Sharp, out var sharp))
return; return;
sharp.Butchering.Remove(ev.Entity);
if (_containerSystem.IsEntityInContainer(ev.Entity)) if (_containerSystem.IsEntityInContainer(ev.Entity))
return; return;
sharp.Butchering.Remove(ev.Entity);
var spawnEntities = EntitySpawnCollection.GetSpawns(butcher.SpawnedEntities, _robustRandom); var spawnEntities = EntitySpawnCollection.GetSpawns(butcher.SpawnedEntities, _robustRandom);
var coords = Transform(ev.Entity).MapPosition; var coords = Transform(ev.Entity).MapPosition;
EntityUid popupEnt = default; EntityUid popupEnt = default;