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

Fix two crashes relating to food (#600)

Browse Source 
* Fix crash when eating bread due to a missing prototype

* Fix crash when finishing a food.

It tried to get the transform component of a deleted entity.
This commit is contained in:
Víctor Aguilera Puerto
2020-02-06 16:40:41 +01:00
committed by GitHub
parent 51c24150d3
commit 6bd818c8ce
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
View File

@@ -155,11 +155,12 @@ namespace Content.Server.GameObjects.Components.Nutrition
}
var position = Owner.Transform.GridPosition;
Owner.Delete();
if (_finishPrototype != null)
{
var finisher = Owner.EntityManager.SpawnEntity(_finishPrototype, Owner.Transform.GridPosition);
var finisher = Owner.EntityManager.SpawnEntity(_finishPrototype, position);
if (user.TryGetComponent(out HandsComponent handsComponent) && finisher.TryGetComponent(out ItemComponent itemComponent))
{
if (handsComponent.CanPutInHand(itemComponent))