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

Bug fix: Force cancellation of RCD constructions if the construction type is changed (#26935)

Browse Source 
Force cancellation of RCD constructions if the construction type is changed
This commit is contained in:
chromiumboy
2024-04-13 22:01:01 -05:00
committed by GitHub
parent ba9091ff59
commit 33e5e4e581
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/RCD/Systems/RCDSystem.cs
View File

@@ -230,13 +230,19 @@ public class RCDSystem : EntitySystem
// Exit if the RCD prototype has changed // Exit if the RCD prototype has changed
if (component.ProtoId != args.Event.StartingProtoId) if (component.ProtoId != args.Event.StartingProtoId)
{
args.Cancel();
return; return;
}
// Ensure the RCD operation is still valid // Ensure the RCD operation is still valid
var location = GetCoordinates(args.Event.Location); var location = GetCoordinates(args.Event.Location);
if (!TryGetMapGridData(location, out var mapGridData)) if (!TryGetMapGridData(location, out var mapGridData))
{
args.Cancel();
return; return;
}
if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Event.Target, args.Event.User)) if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Event.Target, args.Event.User))
args.Cancel(); args.Cancel();