diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 5d7d966c5f..07b57abc42 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -123,7 +123,7 @@ namespace Content.Server.GameTicking if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}")) { - IoCManager.Resolve().AddComponent(mob); + EntityManager.AddComponent(mob); } AddManifestEntry(character.Name, jobId); @@ -190,8 +190,8 @@ namespace Content.Server.GameTicking newMind.AddRole(new ObserverRole(newMind)); var mob = SpawnObserverMob(); - IoCManager.Resolve().GetComponent(mob).EntityName = name; - var ghost = IoCManager.Resolve().GetComponent(mob); + EntityManager.GetComponent(mob).EntityName = name; + var ghost = EntityManager.GetComponent(mob); EntitySystem.Get().SetCanReturnToBody(ghost, false); newMind.TransferTo(mob); @@ -230,14 +230,14 @@ namespace Content.Server.GameTicking #region Equip Helpers public void EquipStartingGear(EntityUid entity, StartingGearPrototype startingGear, HumanoidCharacterProfile? profile) { - if (IoCManager.Resolve().TryGetComponent(entity, out InventoryComponent? inventory)) + if (EntityManager.TryGetComponent(entity, out InventoryComponent? inventory)) { foreach (var slot in EquipmentSlotDefines.AllSlots) { var equipmentStr = startingGear.GetGear(slot, profile); if (!string.IsNullOrEmpty(equipmentStr)) { - var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, IoCManager.Resolve().GetComponent(entity).Coordinates); + var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, EntityManager.GetComponent(entity).Coordinates); inventory.Equip(slot, EntityManager.GetComponent(equipmentEntity)); } } @@ -266,14 +266,14 @@ namespace Content.Server.GameTicking var itemEntity = item.Owner; - if (!IoCManager.Resolve().TryGetComponent(itemEntity, out PDAComponent? pdaComponent) || pdaComponent.ContainedID == null) + if (!EntityManager.TryGetComponent(itemEntity, out PDAComponent? pdaComponent) || pdaComponent.ContainedID == null) return; var card = pdaComponent.ContainedID; _cardSystem.TryChangeFullName(card.Owner, characterName, card); _cardSystem.TryChangeJobTitle(card.Owner, jobPrototype.Name, card); - var access = IoCManager.Resolve().GetComponent(card.Owner); + var access = EntityManager.GetComponent(card.Owner); var accessTags = access.Tags; accessTags.UnionWith(jobPrototype.Access); _pdaSystem.SetOwner(pdaComponent, characterName);