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

Inline GetComponent

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:55:25 +01:00
parent c2e6da1e54
commit b835bea086
131 changed files with 363 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Fluids/Components/SpillExtensions.cs
View File

@@ -194,7 +194,7 @@ namespace Content.Server.Fluids.Components
}
var puddleEnt = serverEntityManager.SpawnEntity(prototype, spillGridCoords);
var newPuddleComponent = puddleEnt.GetComponent<PuddleComponent>();
var newPuddleComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PuddleComponent>(puddleEnt.Uid);
puddleSystem.TryAddSolution(newPuddleComponent.Owner.Uid, solution, sound);

2
Content.Server/Fluids/Components/SprayComponent.cs
View File

@@ -144,7 +144,7 @@ namespace Content.Server.Fluids.Components
}
// Add the solution to the vapor and actually send the thing
var vaporComponent = vapor.GetComponent<VaporComponent>();
var vaporComponent = IoCManager.Resolve<IEntityManager>().GetComponent<VaporComponent>(vapor.Uid);
var vaporSystem = EntitySystem.Get<VaporSystem>();
vaporSystem.TryAddSolution(vaporComponent, solution);

7
Content.Server/Fluids/EntitySystems/PuddleSystem.cs
View File

@@ -329,9 +329,10 @@ namespace Content.Server.Fluids.EntitySystems
}
puddle ??= () =>
IoCManager.Resolve<IEntityManager>().SpawnEntity(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(puddleComponent.Owner.Uid).EntityPrototype?.ID,
mapGrid.DirectionToGrid(coords, direction))
.GetComponent<PuddleComponent>();
{
return IoCManager.Resolve<IEntityManager>().GetComponent<PuddleComponent>(IoCManager.Resolve<IEntityManager>().SpawnEntity(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(puddleComponent.Owner.Uid).EntityPrototype?.ID,
mapGrid.DirectionToGrid(coords, direction)).Uid);
};
return true;
}