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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ namespace Content.Server.Objectives.Conditions
if(Target.CharacterName != null)
targetName = Target.CharacterName;
else if (Target.OwnedEntity != null)
targetName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Target.OwnedEntity.Uid).EntityName;
targetName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Target.OwnedEntity).EntityName;
return Loc.GetString("objective-condition-kill-person-title", ("targetName", targetName));
}

2
Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Server.Objectives.Conditions
if (entity == null)
return false;
return (IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(entity.Uid)?.IsAlive() ?? false) && mc.Mind != mind;
return (IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(entity)?.IsAlive() ?? false) && mc.Mind != mind;
}).Select(mc => mc.Mind).ToList();
return new KillRandomPersonCondition {Target = IoCManager.Resolve<IRobustRandom>().Pick(allHumans)};
}

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

@@ -58,7 +58,7 @@ namespace Content.Server.Objectives.Conditions
get
{
if (_mind?.OwnedEntity == null) return 0f;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ContainerManagerComponent?>(_mind.OwnedEntity.Uid, out var containerManagerComponent)) return 0f;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ContainerManagerComponent?>(_mind.OwnedEntity, out var containerManagerComponent)) return 0f;
float count = containerManagerComponent.CountPrototypeOccurencesRecursive(_prototypeId);
return count/_amount;