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

Construction graph improvements (#17960)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2023-07-13 12:23:52 +02:00
committed by GitHub
parent fbf1d476f2
commit 9243050e1a
20 changed files with 236 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Construction/ConstructionSystem.Graph.cs
View File

@@ -256,7 +256,8 @@ namespace Content.Server.Construction
$"{ToPrettyString(userUid.Value):player} changed {ToPrettyString(uid):entity}'s node from \"{oldNode}\" to \"{id}\"");
// ChangeEntity will handle the pathfinding update.
if (node.Entity is {} newEntity && ChangeEntity(uid, userUid, newEntity, construction) != null)
if (node.Entity.GetId(uid, userUid, new(EntityManager)) is {} newEntity
&& ChangeEntity(uid, userUid, newEntity, construction) != null)
return true;
if(performActions)
@@ -323,8 +324,6 @@ namespace Content.Server.Construction
}
}
EntityManager.InitializeAndStartEntity(newUid);
// We set the graph and node accordingly.
ChangeGraph(newUid, userUid, construction.Graph, construction.Node, false, newConstruction);
@@ -374,6 +373,13 @@ namespace Content.Server.Construction
RaiseLocalEvent(uid, entChangeEv);
RaiseLocalEvent(newUid, entChangeEv, broadcast: true);
foreach (var logic in GetCurrentNode(newUid, newConstruction)!.TransformLogic)
{
logic.Transform(uid, newUid, userUid, new(EntityManager));
}
EntityManager.InitializeAndStartEntity(newUid);
QueueDel(uid);
return newUid;