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

Fix maploading once and for all. (#7501)

Browse Source
This commit is contained in:
Moony
2022-04-15 16:35:58 -05:00
committed by GitHub
parent cdfde3edf1
commit 4d70395d11
8 changed files with 217 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Salvage/SalvageSystem.cs
View File

@@ -276,17 +276,22 @@ namespace Content.Server.Salvage
Report("salvage-system-announcement-spawn-no-debris-available");
return false;
}
var bp = _mapLoader.LoadBlueprint(spl.MapId, map.MapPath.ToString());
if (bp == null)
var opts = new MapLoadOptions
{
Offset = spl.Position
};
var (_, gridId) = _mapLoader.LoadBlueprint(spl.MapId, map.MapPath.ToString(), opts);
if (gridId == null)
{
Report("salvage-system-announcement-spawn-debris-disintegrated");
return false;
}
var salvageEntityId = bp.GridEntityId;
var salvageEntityId = _mapManager.GetGridEuid(gridId.Value);
component.AttachedEntity = salvageEntityId;
var pulledTransform = EntityManager.GetComponent<TransformComponent>(salvageEntityId);
pulledTransform.Coordinates = EntityCoordinates.FromMap(_mapManager, spl);
pulledTransform.WorldRotation = spAngle;
Report("salvage-system-announcement-arrived", ("timeLeft", HoldTime.TotalSeconds));