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

Fix magnet re-parenting (#23680)

Browse Source 
Me when I test at default position and forgor to store localposition.
This commit is contained in:
metalgearsloth
2024-01-07 23:57:54 +11:00
committed by GitHub
parent c05a458de2
commit 5d1fcf9dff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Salvage/SalvageSystem.Magnet.cs
View File

@@ -18,7 +18,7 @@ public sealed partial class SalvageSystem
private EntityQuery<SalvageMobRestrictionsComponent> _salvMobQuery; private EntityQuery<SalvageMobRestrictionsComponent> _salvMobQuery;
private List<(Entity<TransformComponent> Entity, EntityUid MapUid)> _detachEnts = new(); private List<(Entity<TransformComponent> Entity, EntityUid MapUid, Vector2 LocalPosition)> _detachEnts = new();
private void InitializeMagnet() private void InitializeMagnet()
{ {
@@ -144,7 +144,7 @@ public sealed partial class SalvageSystem
continue; continue;
// Can't parent directly to map as it runs grid traversal. // Can't parent directly to map as it runs grid traversal.
_detachEnts.Add(((mobUid, xform), xform.MapUid.Value)); _detachEnts.Add(((mobUid, xform), xform.MapUid.Value, _transform.GetWorldPosition(xform)));
_transform.DetachParentToNull(mobUid, xform); _transform.DetachParentToNull(mobUid, xform);
} }
@@ -156,7 +156,7 @@ public sealed partial class SalvageSystem
foreach (var entity in _detachEnts) foreach (var entity in _detachEnts)
{ {
_transform.SetParent(entity.Entity.Owner, entity.Entity.Comp, entity.MapUid); _transform.SetCoordinates(entity.Entity.Owner, new EntityCoordinates(entity.MapUid, entity.LocalPosition));
} }
data.Comp.ActiveEntities = null; data.Comp.ActiveEntities = null;