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

Organ fixes (#20488)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-30 01:01:47 +10:00
committed by GitHub
parent 4313a6ee66
commit 290c2fd502
5 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Body/Systems/SharedBodySystem.Body.cs
View File

@@ -74,7 +74,7 @@ public partial class SharedBodySystem
if (TryComp(entity, out OrganComponent? organ))
{
RemoveOrgan(entity, uid, uid, organ);
RemoveOrgan(entity, uid, organ);
}
}

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

@@ -12,7 +12,7 @@ public partial class SharedBodySystem
private void AddOrgan(EntityUid uid, EntityUid bodyUid, EntityUid parentPartUid, OrganComponent component)
{
component.Body = bodyUid;
RaiseLocalEvent(uid, new AddedToPartEvent(bodyUid));
RaiseLocalEvent(uid, new AddedToPartEvent(parentPartUid));
if (component.Body != null)
RaiseLocalEvent(uid, new AddedToPartInBodyEvent(component.Body.Value, parentPartUid));
@@ -20,12 +20,14 @@ public partial class SharedBodySystem
Dirty(uid, component);
}
private void RemoveOrgan(EntityUid uid, EntityUid bodyUid, EntityUid parentPartUid, OrganComponent component)
private void RemoveOrgan(EntityUid uid, EntityUid parentPartUid, OrganComponent component)
{
RaiseLocalEvent(uid, new RemovedFromPartEvent(bodyUid));
RaiseLocalEvent(uid, new RemovedFromPartEvent(parentPartUid));
if (component.Body != null)
{
RaiseLocalEvent(uid, new RemovedFromPartInBodyEvent(component.Body.Value, parentPartUid));
}
component.Body = null;
Dirty(uid, component);

16
Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
View File

@@ -1,6 +1,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.Body.Components;
using Content.Shared.Body.Events;
using Content.Shared.Body.Organ;
using Content.Shared.Body.Part;
using Content.Shared.Damage;
@@ -61,7 +62,7 @@ public partial class SharedBodySystem
if (TryComp(entity, out OrganComponent? organ))
{
RemoveOrgan(entity, organ);
RemoveOrgan(entity, uid, organ);
}
}
@@ -85,7 +86,20 @@ public partial class SharedBodySystem
{
if (TryComp(organ, out OrganComponent? organComp))
{
var oldBody = organComp.Body;
organComp.Body = bodyUid;
if (bodyUid != null)
{
var ev = new AddedToPartInBodyEvent(bodyUid.Value, children.Id);
RaiseLocalEvent(organ, ev);
}
else if (oldBody != null)
{
var ev = new RemovedFromPartInBodyEvent(oldBody.Value, children.Id);
RaiseLocalEvent(organ, ev);
}
Dirty(organ, organComp);
}
}