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

Slight construction cleanup. (#12614)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2022-11-16 12:10:27 +01:00
committed by GitHub
parent baa54dc5fe
commit 4e3246d278
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ using Content.Server.Containers;
using Content.Shared.Construction; using Content.Shared.Construction;
using Content.Shared.Construction.Prototypes; using Content.Shared.Construction.Prototypes;
using Content.Shared.Construction.Steps; using Content.Shared.Construction.Steps;
using Content.Shared.Database;
using Robust.Server.Containers; using Robust.Server.Containers;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
@@ -229,8 +230,13 @@ namespace Content.Server.Construction
|| GetNodeFromGraph(graph, id) is not {} node) || GetNodeFromGraph(graph, id) is not {} node)
return false; return false;
var oldNode = construction.Node;
construction.Node = id; construction.Node = id;
if (userUid != null)
_adminLogger.Add(LogType.Construction, LogImpact.Low,
$"{ToPrettyString(userUid.Value):player} changed {ToPrettyString(uid):entity}'s node from \"{oldNode}\" to \"{id}\"");
// 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;

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

@@ -48,7 +48,7 @@ namespace Content.Server.Construction
/// <remarks>When <see cref="validation"/> is true, this method will simply return whether the interaction /// <remarks>When <see cref="validation"/> is true, this method will simply return whether the interaction
/// would be handled by the entity or not. It essentially becomes a pure method that modifies nothing.</remarks> /// would be handled by the entity or not. It essentially becomes a pure method that modifies nothing.</remarks>
/// <returns>The result of this interaction with the entity.</returns> /// <returns>The result of this interaction with the entity.</returns>
private HandleResult HandleEvent(EntityUid uid, object ev, bool validation, ConstructionComponent? construction = null, InteractUsingEvent? args = null) private HandleResult HandleEvent(EntityUid uid, object ev, bool validation, ConstructionComponent? construction = null)
{ {
if (!Resolve(uid, ref construction)) if (!Resolve(uid, ref construction))
return HandleResult.False; return HandleResult.False;
@@ -170,9 +170,6 @@ namespace Content.Server.Construction
// We change the node now. // We change the node now.
ChangeNode(uid, user, edge.Target, true, construction); ChangeNode(uid, user, edge.Target, true, construction);
if (ev is ConstructionDoAfterComplete event1 && event1.WrappedEvent is InteractUsingEvent event2)
_adminLogger.Add(LogType.Construction, LogImpact.Low, $"{ToPrettyString(event2.User):player} changed {ToPrettyString(uid):entity}'s node to {edge.Target}");
} }
return HandleResult.True; return HandleResult.True;