space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rootUid returning all loaded entities (#3540)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-29 17:20:23 +13:00
committed by GitHub
parent 3a05a82934
commit ada056dcdf
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Robust.Server/GameObjects/EntitySystems/MapLoaderSystem.cs
View File

@@ -128,12 +128,12 @@ public sealed class MapLoaderSystem : EntitySystem
MapLoadOptions? options = null)
{
options ??= DefaultLoadOptions;
rootUids = new List<EntityUid>();
var resPath = new ResourcePath(path).ToRootedPath();
if (!TryGetReader(resPath, out var reader))
{
rootUids = new List<EntityUid>();
return false;
}
@@ -149,8 +149,17 @@ public sealed class MapLoaderSystem : EntitySystem
var sw = new Stopwatch();
sw.Start();
result = Deserialize(data);
rootUids = data.Entities;
_logLoader.Debug($"Loaded map in {sw.Elapsed}");
var mapEnt = _mapManager.GetMapEntityId(mapId);
var xformQuery = _serverEntityManager.GetEntityQuery<TransformComponent>();
var rootEnts = new List<EntityUid>();
foreach (var ent in data.Entities)
{
if (xformQuery.GetComponent(ent).ParentUid == mapEnt)
rootEnts.Add(ent);
}
rootUids = rootEnts;
}
_context.Clear();