From 0869d837d62bfdc0ba63ba35215bc1436df4809e Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sun, 26 Sep 2021 15:43:38 +0200 Subject: [PATCH] Replace ComponentManager with EntityManager in StackSystem. Stacks are the most advanced piece of code in this codebase... --- Content.Server/Stack/StackSystem.cs | 4 ++-- Content.Shared/Stacks/SharedStackSystem.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index 930cfa75ef..11b2becad5 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -49,7 +49,7 @@ namespace Content.Server.Stack // Set the output parameter in the event instance to the newly split stack. var entity = EntityManager.SpawnEntity(prototype, spawnPosition); - if (ComponentManager.TryGetComponent(entity.Uid, out SharedStackComponent? stackComp)) + if (EntityManager.TryGetComponent(entity.Uid, out SharedStackComponent? stackComp)) { // Set the split stack's count. SetCount(entity.Uid, amount, stackComp); @@ -65,7 +65,7 @@ namespace Content.Server.Stack { // Set the output result parameter to the new stack entity... var entity = EntityManager.SpawnEntity(prototype.Spawn, spawnPosition); - var stack = ComponentManager.GetComponent(entity.Uid); + var stack = EntityManager.GetComponent(entity.Uid); // And finally, set the correct amount! SetCount(entity.Uid, amount, stack); diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs index 6092b5afcf..3b4ebc8dcd 100644 --- a/Content.Shared/Stacks/SharedStackSystem.cs +++ b/Content.Shared/Stacks/SharedStackSystem.cs @@ -51,7 +51,7 @@ namespace Content.Shared.Stacks EntityManager.QueueDeleteEntity(uid); // Change appearance data. - if (ComponentManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) appearance.SetData(StackVisuals.Actual, component.Count); RaiseLocalEvent(uid, new StackCountChangedEvent(old, component.Count), false); @@ -79,7 +79,7 @@ namespace Content.Shared.Stacks private void OnStackStarted(EntityUid uid, SharedStackComponent component, ComponentStartup args) { - if (!ComponentManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (!EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) return; appearance.SetData(StackVisuals.Actual, component.Count);