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

5
Content.Server/Medical/Components/HealingComponent.cs
View File

@@ -2,7 +2,6 @@ using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.Stack;
using Content.Shared.ActionBlocker;
using Content.Shared.Administration.Logs;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.Database;
@@ -41,7 +40,7 @@ namespace Content.Server.Medical.Components
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Target, out DamageableComponent? targetDamage))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Target.Value, out DamageableComponent? targetDamage))
{
return true;
}
@@ -66,7 +65,7 @@ namespace Content.Server.Medical.Components
return true;
}
var healed = EntitySystem.Get<DamageableSystem>().TryChangeDamage(eventArgs.Target, Damage, true);
var healed = EntitySystem.Get<DamageableSystem>().TryChangeDamage(eventArgs.Target.Value, Damage, true);
if (healed == null)
return true;

17
Content.Server/Medical/Components/MedicalScannerComponent.cs
View File

@@ -79,7 +79,7 @@ namespace Content.Server.Medical.Components
return EmptyUIState;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(body, out DamageableComponent? damageable))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(body.Value, out DamageableComponent? damageable))
{
return EmptyUIState;
}
@@ -90,7 +90,7 @@ namespace Content.Server.Medical.Components
}
var cloningSystem = EntitySystem.Get<CloningSystem>();
var scanned = IoCManager.Resolve<IEntityManager>().TryGetComponent(_bodyContainer.ContainedEntity, out MindComponent? mindComponent) &&
var scanned = IoCManager.Resolve<IEntityManager>().TryGetComponent(_bodyContainer.ContainedEntity.Value, out MindComponent? mindComponent) &&
mindComponent.Mind != null &&
cloningSystem.HasDnaScan(mindComponent.Mind);
@@ -136,7 +136,7 @@ namespace Content.Server.Medical.Components
if (body == null)
return MedicalScannerStatus.Open;
var state = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(body);
var state = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(body.Value);
return state == null ? MedicalScannerStatus.Open : GetStatusFromDamageState(state);
}
@@ -165,7 +165,7 @@ namespace Content.Server.Medical.Components
UserInterface?.Open(actor.PlayerSession);
}
public void InsertBody(EntityUiduser)
public void InsertBody(EntityUid user)
{
_bodyContainer.Insert(user);
UpdateUserInterface();
@@ -174,12 +174,11 @@ namespace Content.Server.Medical.Components
public void EjectBody()
{
var containedEntity = _bodyContainer.ContainedEntity;
if (containedEntity == null) return;
_bodyContainer.Remove(containedEntity);
if (_bodyContainer.ContainedEntity is not {Valid: true} contained) return;
_bodyContainer.Remove(contained);
UpdateUserInterface();
UpdateAppearance();
EntitySystem.Get<ClimbSystem>().ForciblySetClimbing(containedEntity);
EntitySystem.Get<ClimbSystem>().ForciblySetClimbing(contained);
}
public void Update(float frameTime)
@@ -199,7 +198,7 @@ namespace Content.Server.Medical.Components
{
var cloningSystem = EntitySystem.Get<CloningSystem>();
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(_bodyContainer.ContainedEntity, out MindComponent? mindComp) || mindComp.Mind == null)
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(_bodyContainer.ContainedEntity.Value, out MindComponent? mindComp) || mindComp.Mind == null)
{
obj.Session.AttachedEntity?.PopupMessageCursor(Loc.GetString("medical-scanner-component-msg-no-soul"));
break;