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

6
Content.Server/Objectives/Conditions/KillPersonCondition.cs
View File

@@ -20,10 +20,10 @@ namespace Content.Server.Objectives.Conditions
if (Target == null)
return Loc.GetString("objective-condition-kill-person-title", ("targetName", targetName));
if(Target.CharacterName != null)
if (Target.CharacterName != null)
targetName = Target.CharacterName;
else if (Target.OwnedEntity != null)
targetName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Target.OwnedEntity).EntityName;
else if (Target.OwnedEntity is {Valid: true} owned)
targetName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(owned).EntityName;
return Loc.GetString("objective-condition-kill-person-title", ("targetName", targetName));
}

4
Content.Server/Objectives/Conditions/StealCondition.cs
View File

@@ -57,8 +57,8 @@ namespace Content.Server.Objectives.Conditions
{
get
{
if (_mind?.OwnedEntity == null) return 0f;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ContainerManagerComponent?>(_mind.OwnedEntity, out var containerManagerComponent)) return 0f;
if (_mind?.OwnedEntity is not {Valid: true} owned) return 0f;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ContainerManagerComponent?>(owned, out var containerManagerComponent)) return 0f;
float count = containerManagerComponent.CountPrototypeOccurencesRecursive(_prototypeId);
return count/_amount;