juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete code from Food, Drink and Respirator systems. (#30560)

Browse Source 
* Remove obsolete code from Food, Drink and Respirator systems

* remove obsolete comment
This commit is contained in:
Mervill
2024-08-02 00:30:45 -07:00
committed by GitHub
parent ac4086f984
commit af75258601
4 changed files with 34 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
View File

@@ -157,32 +157,6 @@ public partial class SharedBodySystem
return false;
}
/// <summary>
/// Returns a list of ValueTuples of <see cref="T"/> and OrganComponent on each organ
/// in the given body.
/// </summary>
/// <param name="uid">The body entity id to check on.</param>
/// <param name="body">The body to check for organs on.</param>
/// <typeparam name="T">The component to check for.</typeparam>
public List<(T Comp, OrganComponent Organ)> GetBodyOrganComponents<T>(
EntityUid uid,
BodyComponent? body = null)
where T : IComponent
{
if (!Resolve(uid, ref body))
return new List<(T Comp, OrganComponent Organ)>();
var query = GetEntityQuery<T>();
var list = new List<(T Comp, OrganComponent Organ)>(3);
foreach (var organ in GetBodyOrgans(uid, body))
{
if (query.TryGetComponent(organ.Id, out var comp))
list.Add((comp, organ.Component));
}
return list;
}
/// <summary>
/// Returns a list of Entity<<see cref="T"/>, <see cref="OrganComponent"/>>
/// for each organ of the body
@@ -216,19 +190,18 @@ public partial class SharedBodySystem
/// <param name="body">The body to check for organs on.</param>
/// <typeparam name="T">The component to check for.</typeparam>
/// <returns>Whether any were found.</returns>
public bool TryGetBodyOrganComponents<T>(
EntityUid uid,
[NotNullWhen(true)] out List<(T Comp, OrganComponent Organ)>? comps,
BodyComponent? body = null)
public bool TryGetBodyOrganEntityComps<T>(
Entity<BodyComponent?> entity,
[NotNullWhen(true)] out List<Entity<T, OrganComponent>>? comps)
where T : IComponent
{
if (!Resolve(uid, ref body))
if (!Resolve(entity.Owner, ref entity.Comp))
{
comps = null;
return false;
}
comps = GetBodyOrganComponents<T>(uid, body);
comps = GetBodyOrganEntityComps<T>(entity);
if (comps.Count != 0)
return true;