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

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Nutrition.EntitySystems
{
SoundSystem.Play(Filter.Pvs(creamPie.Owner), creamPie.Sound.GetSound(), creamPie.Owner, AudioHelpers.WithVariation(0.125f));
if (creamPie.Owner.TryGetComponent<FoodComponent>(out var foodComp) && _solutionsSystem.TryGetSolution(creamPie.Owner.Uid, foodComp.SolutionName, out var solution))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<FoodComponent?>(creamPie.Owner.Uid, out var foodComp) && _solutionsSystem.TryGetSolution(creamPie.Owner.Uid, foodComp.SolutionName, out var solution))
{
solution.SpillAt(creamPie.Owner, "PuddleSmear", false);
}

4
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
View File

@@ -207,7 +207,7 @@ namespace Content.Server.Nutrition.EntitySystems
EntityManager.DeleteEntity(component.OwnerUid);
// Put the trash in the user's hand
if (finisher.TryGetComponent(out ItemComponent? item) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(finisher.Uid, out ItemComponent? item) &&
handsComponent.CanPutInHand(item))
{
handsComponent.PutInHand(item);
@@ -420,7 +420,7 @@ namespace Content.Server.Nutrition.EntitySystems
foreach (var item in hands.GetAllHeldItems())
{
// Is utensil?
if (!item.Owner.TryGetComponent(out UtensilComponent? utensil))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(item.Owner.Uid, out UtensilComponent? utensil))
continue;
if ((utensil.Types & component.Utensil) != 0 && // Acceptable type?

2
Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
View File

@@ -96,7 +96,7 @@ namespace Content.Server.Nutrition.EntitySystems
// This is awful. I hate this so much.
// TODO: Please, someone refactor containers and free me from this bullshit.
if (!smokable.Owner.TryGetContainerMan(out var containerManager) ||
!containerManager.Owner.TryGetComponent(out BloodstreamComponent? bloodstream))
!IoCManager.Resolve<IEntityManager>().TryGetComponent(containerManager.Owner.Uid, out BloodstreamComponent? bloodstream))
continue;
_reactiveSystem.ReactionEntity(containerManager.OwnerUid, ReactionMethod.Ingestion, inhaledSolution);