Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

8
Content.Server/Botany/Components/PlantHolderComponent.cs
View File

@@ -426,7 +426,7 @@ namespace Content.Server.Botany.Components
if (Harvest && !Dead)
{
if (user.TryGetComponent(out HandsComponent? hands))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(user.Uid, out HandsComponent? hands))
{
if (!Seed.CheckHarvest(user, hands.GetActiveHand?.Owner))
return false;
@@ -654,7 +654,7 @@ namespace Content.Server.Botany.Components
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(usingItem.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(usingItem.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !EntitySystem.Get<ActionBlockerSystem>().CanInteract(user.Uid))
return false;
if (usingItem.TryGetComponent(out SeedComponent? seeds))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(usingItem.Uid, out SeedComponent? seeds))
{
if (Seed == null)
{
@@ -734,7 +734,7 @@ namespace Content.Server.Botany.Components
var targetEntity = Owner.Uid;
var solutionEntity = usingItem.Uid;
if (usingItem.TryGetComponent(out SprayComponent? spray))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(usingItem.Uid, out SprayComponent? spray))
{
sprayed = true;
amount = FixedPoint2.New(1);
@@ -804,7 +804,7 @@ namespace Content.Server.Botany.Components
return DoHarvest(user);
}
if (usingItem.TryGetComponent<ProduceComponent>(out var produce))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ProduceComponent?>(usingItem.Uid, out var produce))
{
user.PopupMessageCursor(Loc.GetString("plant-holder-component-compost-message",
("owner", Owner),

2
Content.Server/Botany/Components/ProduceComponent.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Botany.Components
if (Seed == null)
return;
if (Owner.TryGetComponent(out SpriteComponent? sprite))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out SpriteComponent? sprite))
{
sprite.LayerSetRSI(0, Seed.PlantRsi);
sprite.LayerSetState(0, Seed.PlantIconState);

2
Content.Server/Botany/Components/SeedExtractorComponent.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Botany.Components
if (!_powerReceiver?.Powered ?? false)
return false;
if (eventArgs.Using.TryGetComponent(out ProduceComponent? produce) && produce.Seed != null)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Using.Uid, out ProduceComponent? produce) && produce.Seed != null)
{
eventArgs.User.PopupMessageCursor(Loc.GetString("seed-extractor-component-interact-message",("name", eventArgs.Using.Name)));

2
Content.Server/Botany/Seed.cs
View File

@@ -257,7 +257,7 @@ namespace Content.Server.Botany
var seedComp = seed.EnsureComponent<SeedComponent>();
seedComp.Seed = this;
if (seed.TryGetComponent(out SpriteComponent? sprite))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(seed.Uid, out SpriteComponent? sprite))
{
// Seed state will always be seed. Blame the spriter if that's not the case!
sprite.LayerSetSprite(0, new SpriteSpecifier.Rsi(PlantRsi, "seed"));