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

Account for graph actions being able to delete the entity in ChangeNode.

Browse Source 
Fixes an exception that occurs if a node action deletes a construction.
This commit is contained in:
Vera Aguilera Puerto
2022-03-05 10:58:30 +01:00
parent 34385d467e
commit c76414362d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,10 @@ namespace Content.Server.Construction
if(performActions) if(performActions)
PerformActions(uid, userUid, node.Actions); PerformActions(uid, userUid, node.Actions);
// An action might have deleted the entity... Account for this.
if (!Exists(uid))
return false;
// ChangeEntity will handle the pathfinding update. // ChangeEntity will handle the pathfinding update.
if (node.Entity is {} newEntity && ChangeEntity(uid, userUid, newEntity, construction) != null) if (node.Entity is {} newEntity && ChangeEntity(uid, userUid, newEntity, construction) != null)
return true; return true;

2
Content.Server/Construction/ConstructionSystem.Interactions.cs
View File

@@ -403,7 +403,7 @@ namespace Content.Server.Construction
foreach (var action in actions) foreach (var action in actions)
{ {
// If an action deletes the entity, we stop performing actions. // If an action deletes the entity, we stop performing actions.
if (!EntityManager.EntityExists(uid)) if (!Exists(uid))
break; break;
action.PerformAction(uid, userUid, EntityManager); action.PerformAction(uid, userUid, EntityManager);