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

Unrevert "Remove references to obsolete GridId" (#11531) (#11801)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-10 10:41:32 +13:00
committed by GitHub
parent e17e08f344
commit 41b1044ddb
7 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Cargo/Systems/PricingSystem.cs
View File

@@ -45,17 +45,15 @@ public sealed class PricingSystem : EntitySystem
foreach (var gid in args)
{
if (!int.TryParse(gid, out var i) || i <= 0)
if (!EntityUid.TryParse(gid, out var gridId) || !gridId.IsValid())
{
shell.WriteError($"Invalid grid ID \"{gid}\".");
continue;
}
var gridId = new GridId(i);
if (!_mapManager.TryGetGrid(gridId, out var mapGrid))
{
shell.WriteError($"Grid \"{i}\" doesn't exist.");
shell.WriteError($"Grid \"{gridId}\" doesn't exist.");
continue;
}