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

Inline EntityManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:11:52 +01:00
parent bd18574412
commit 5e177ae734
108 changed files with 250 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
View File

@@ -12,6 +12,7 @@ using Content.Shared.Nutrition.Components;
using Content.Shared.Popups;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Player;
@@ -39,7 +40,7 @@ namespace Content.Server.Kitchen.Components
if (!string.IsNullOrEmpty(_meatPrototype))
{
var meat = Owner.EntityManager.SpawnEntity(_meatPrototype, Owner.Transform.Coordinates);
var meat = IoCManager.Resolve<IEntityManager>().SpawnEntity(_meatPrototype, Owner.Transform.Coordinates);
meat.Name = _meatName;
}

8
Content.Server/Kitchen/Components/MicrowaveComponent.cs
View File

@@ -365,13 +365,13 @@ namespace Content.Server.Kitchen.Components
if (recipeToCook != null)
{
SubtractContents(recipeToCook);
Owner.EntityManager.SpawnEntity(recipeToCook.Result, Owner.Transform.Coordinates);
IoCManager.Resolve<IEntityManager>().SpawnEntity(recipeToCook.Result, Owner.Transform.Coordinates);
}
else
{
VaporizeReagents();
VaporizeSolids();
Owner.EntityManager.SpawnEntity(_badRecipeName, Owner.Transform.Coordinates);
IoCManager.Resolve<IEntityManager>().SpawnEntity(_badRecipeName, Owner.Transform.Coordinates);
}
}
@@ -424,9 +424,9 @@ namespace Content.Server.Kitchen.Components
private void EjectSolid(EntityUid entityId)
{
if (Owner.EntityManager.EntityExists(entityId))
if (IoCManager.Resolve<IEntityManager>().EntityExists(entityId))
{
_storage.Remove(Owner.EntityManager.GetEntity(entityId));
_storage.Remove(IoCManager.Resolve<IEntityManager>().GetEntity(entityId));
}
}