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

Fix errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 21:02:04 +01:00
parent 2a3b7d809d
commit ab9d0cc6d8
94 changed files with 568 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Cloning/CloningSystem.cs
View File

@@ -34,9 +34,9 @@ namespace Content.Server.Cloning
internal void TransferMindToClone(Mind.Mind mind)
{
if (!ClonesWaitingForMind.TryGetValue(mind, out var entityUid) ||
!EntityManager.EntityExists(entityUid) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out MindComponent? mindComp) ||
if (!ClonesWaitingForMind.TryGetValue(mind, out var entity) ||
!EntityManager.EntityExists(entity) ||
!EntityManager.TryGetComponent(entity, out MindComponent? mindComp) ||
mindComp.Mind != null)
return;
@@ -48,7 +48,7 @@ namespace Content.Server.Cloning
private void HandleActivate(EntityUid uid, CloningPodComponent component, ActivateInWorldEvent args)
{
if (!component.Powered ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
{
return;
}
@@ -60,10 +60,10 @@ namespace Content.Server.Cloning
{
if (component.Parent == EntityUid.Invalid ||
!EntityManager.EntityExists(component.Parent) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent<CloningPodComponent?>(parent, out var cloningPodComponent) ||
!EntityManager.TryGetComponent<CloningPodComponent?>(component.Parent, out var cloningPodComponent) ||
component.Owner != cloningPodComponent.BodyContainer?.ContainedEntity)
{
IoCManager.Resolve<IEntityManager>().RemoveComponent<BeingClonedComponent>(component.Owner);
EntityManager.RemoveComponent<BeingClonedComponent>(component.Owner);
return;
}

29
Content.Server/Cloning/Components/CloningPodComponent.cs
View File

@@ -23,10 +23,12 @@ namespace Content.Server.Cloning.Components
public class CloningPodComponent : SharedCloningPodComponent
{
[Dependency] private readonly IPlayerManager _playerManager = null!;
[Dependency] private readonly IEntityManager _entities = default!;
[Dependency] private readonly EuiManager _euiManager = null!;
[ViewVariables]
public bool Powered => !IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
public bool Powered => !_entities.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
[ViewVariables]
public BoundUserInterface? UserInterface =>
@@ -70,7 +72,7 @@ namespace Content.Server.Cloning.Components
private void UpdateAppearance()
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (_entities.TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(CloningPodVisuals.Status, Status);
}
@@ -105,12 +107,12 @@ namespace Content.Server.Cloning.Components
var mind = dna.Mind;
if (cloningSystem.ClonesWaitingForMind.TryGetValue(mind, out var cloneUid))
if (cloningSystem.ClonesWaitingForMind.TryGetValue(mind, out var clone))
{
if (IoCManager.Resolve<IEntityManager>().EntityExists(cloneUid) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<MobStateComponent?>(clone, out var cloneState) &&
if (_entities.EntityExists(clone) &&
_entities.TryGetComponent<MobStateComponent?>(clone, out var cloneState) &&
!cloneState.IsDead() &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(clone, out MindComponent? cloneMindComp) &&
_entities.TryGetComponent(clone, out MindComponent? cloneMindComp) &&
(cloneMindComp.Mind == null || cloneMindComp.Mind == mind))
{
obj.Session.AttachedEntity?.PopupMessageCursor(Loc.GetString("cloning-pod-component-msg-already-cloning"));
@@ -121,7 +123,7 @@ namespace Content.Server.Cloning.Components
}
if (mind.OwnedEntity != null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<MobStateComponent?>(mind.OwnedEntity, out var state) &&
_entities.TryGetComponent<MobStateComponent?>(mind.OwnedEntity.Value, out var state) &&
!state.IsDead())
{
obj.Session.AttachedEntity?.PopupMessageCursor(Loc.GetString("cloning-pod-component-msg-already-alive"));
@@ -135,13 +137,13 @@ namespace Content.Server.Cloning.Components
return; // If we can't track down the client, we can't offer transfer. That'd be quite bad.
}
var mob = IoCManager.Resolve<IEntityManager>().SpawnEntity("MobHuman", IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).MapPosition);
var mob = _entities.SpawnEntity("MobHuman", _entities.GetComponent<TransformComponent>(Owner).MapPosition);
EntitySystem.Get<SharedHumanoidAppearanceSystem>().UpdateFromProfile(mob, dna.Profile);
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(mob).EntityName = dna.Profile.Name;
_entities.GetComponent<MetaDataComponent>(mob).EntityName = dna.Profile.Name;
var cloneMindReturn = IoCManager.Resolve<IEntityManager>().AddComponent<BeingClonedComponent>(mob);
var cloneMindReturn = _entities.AddComponent<BeingClonedComponent>(mob);
cloneMindReturn.Mind = mind;
cloneMindReturn.Parent = Owner;
@@ -167,12 +169,11 @@ namespace Content.Server.Cloning.Components
public void Eject()
{
var entity = BodyContainer.ContainedEntity;
if (entity == null || CloningProgress < CloningTime)
if (BodyContainer.ContainedEntity is not {Valid: true} entity || CloningProgress < CloningTime)
return;
IoCManager.Resolve<IEntityManager>().RemoveComponent<BeingClonedComponent>(entity);
BodyContainer.Remove(entity!);
_entities.RemoveComponent<BeingClonedComponent>(entity);
BodyContainer.Remove(entity);
CapturedMind = null;
CloningProgress = 0f;
UpdateStatus(CloningPodStatus.Idle);