tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BorgChassis transfer their mind to a dropped BorgBrain fix (#34464)

Browse Source 
Fix
This commit is contained in:
ScarKy0
2025-01-16 15:08:08 +01:00
committed by GitHub
parent 4e7c21fba3
commit cec5816acf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Silicons/Borgs/BorgSystem.cs
View File

@@ -154,7 +154,7 @@ public sealed partial class BorgSystem : SharedBorgSystem
{ {
base.OnInserted(uid, component, args); base.OnInserted(uid, component, args);
if (HasComp<BorgBrainComponent>(args.Entity) && _mind.TryGetMind(args.Entity, out var mindId, out var mind)) if (HasComp<BorgBrainComponent>(args.Entity) && _mind.TryGetMind(args.Entity, out var mindId, out var mind) && args.Container == component.BrainContainer)
{ {
_mind.TransferTo(mindId, uid, mind: mind); _mind.TransferTo(mindId, uid, mind: mind);
} }
@@ -164,8 +164,7 @@ public sealed partial class BorgSystem : SharedBorgSystem
{ {
base.OnRemoved(uid, component, args); base.OnRemoved(uid, component, args);
if (HasComp<BorgBrainComponent>(args.Entity) & if (HasComp<BorgBrainComponent>(args.Entity) && _mind.TryGetMind(uid, out var mindId, out var mind) && args.Container == component.BrainContainer)
_mind.TryGetMind(uid, out var mindId, out var mind))
{ {
_mind.TransferTo(mindId, args.Entity, mind: mind); _mind.TransferTo(mindId, args.Entity, mind: mind);
} }