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

make EntityQuery.Resolve error not useless (#6320)

Browse Source 
* make EntityQuery.Resolve error not useless

* it actually wasnt that bad

* goida

* make EntityQuery constructor internal

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2025-12-16 13:23:47 +00:00
committed by GitHub
parent 3246ad2d92
commit d548bce347
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Robust.Shared/GameObjects/EntityManager.Components.cs
View File

@@ -1180,14 +1180,14 @@ namespace Robust.Shared.GameObjects
{
var comps = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
DebugTools.Assert(comps != null, $"Unknown component: {typeof(TComp1).Name}");
return new EntityQuery<TComp1>(comps, _resolveSawmill);
return new EntityQuery<TComp1>(this, comps);
}
public EntityQuery<IComponent> GetEntityQuery(Type type)
{
var comps = _entTraitDict[type];
DebugTools.Assert(comps != null, $"Unknown component: {type.Name}");
return new EntityQuery<IComponent>(comps, _resolveSawmill);
return new EntityQuery<IComponent>(this, comps);
}
/// <inheritdoc />
@@ -1789,13 +1789,13 @@ namespace Robust.Shared.GameObjects
/// <seealso cref="M:Robust.Shared.GameObjects.EntityManager.GetEntityQuery``1">EntityManager.GetEntityQuery()</seealso>
public readonly struct EntityQuery<TComp1> where TComp1 : IComponent
{
private readonly EntityManager _entMan;
private readonly Dictionary<EntityUid, IComponent> _traitDict;
private readonly ISawmill _sawmill;
public EntityQuery(Dictionary<EntityUid, IComponent> traitDict, ISawmill sawmill)
internal EntityQuery(EntityManager entMan, Dictionary<EntityUid, IComponent> traitDict)
{
_entMan = entMan;
_traitDict = traitDict;
_sawmill = sawmill;
}
/// <summary>
@@ -1947,9 +1947,7 @@ namespace Robust.Shared.GameObjects
}
if (logMissing)
{
_sawmill.Error($"Can't resolve \"{typeof(TComp1)}\" on entity {uid}!\n{Environment.StackTrace}");
}
_entMan.ResolveSawmill.Error($"Can't resolve \"{typeof(TComp1)}\" on entity {_entMan.ToPrettyString(uid)}!\n{Environment.StackTrace}");
return false;
}
@@ -2068,7 +2066,7 @@ namespace Robust.Shared.GameObjects
}
if (logMissing)
_sawmill.Error($"Can't resolve \"{typeof(TComp1)}\" on entity {uid}!\n{new StackTrace(1, true)}");
_entMan.ResolveSawmill.Error($"Can't resolve \"{typeof(TComp1)}\" on entity {_entMan.ToPrettyString(uid)}!\n{new StackTrace(1, true)}");
return false;
}

4
Robust.Shared/GameObjects/EntityManager.cs
View File

@@ -118,7 +118,7 @@ namespace Robust.Shared.GameObjects
private SharedMapSystem _mapSystem = default!;
private ISawmill _sawmill = default!;
private ISawmill _resolveSawmill = default!;
internal ISawmill ResolveSawmill = default!;
public bool Started { get; protected set; }
@@ -149,7 +149,7 @@ namespace Robust.Shared.GameObjects
_xformReg = _componentFactory.GetRegistration(typeof(TransformComponent));
_xformName = _xformReg.Name;
_sawmill = LogManager.GetSawmill("entity");
_resolveSawmill = LogManager.GetSawmill("resolve");
ResolveSawmill = LogManager.GetSawmill("resolve");
#if DEBUG
_mainThreadId = Environment.CurrentManagedThreadId;