space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace IsMap and IsGrid calls with HasComp (#5866)

Browse Source
This commit is contained in:
Kyle Tyo
2025-04-19 22:21:19 -04:00
committed by GitHub
parent 077c91a54b
commit ee45a608b9
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Server/Physics/GridFixtureSystem.cs
View File

@@ -289,7 +289,7 @@ namespace Robust.Server.Physics
}
_maps.SetTiles(newGrid.Owner, newGrid.Comp, tileData);
DebugTools.Assert(_mapManager.IsGrid(newGridUid), "A split grid had no tiles?");
DebugTools.Assert(HasComp<MapGridComponent>(newGridUid), "A split grid had no tiles?");
// Set tiles on new grid + update anchored entities
foreach (var node in group)

5
Robust.Shared/ComponentTrees/RecursiveMoveSystem.cs
View File

@@ -1,6 +1,7 @@
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Utility;
namespace Robust.Shared.ComponentTrees;
@@ -52,8 +53,8 @@ internal sealed class RecursiveMoveSystem : EntitySystem
if (args.Component.MapUid == args.Sender || args.Component.GridUid == args.Sender)
return;
DebugTools.Assert(!_mapManager.IsMap(args.Sender));
DebugTools.Assert(!_mapManager.IsGrid(args.Sender));
DebugTools.Assert(!HasComp<MapComponent>(args.Sender));
DebugTools.Assert(!HasComp<MapGridComponent>(args.Sender));
AnythingMovedSubHandler(args.Sender, args.Component);
}

10
Robust.Shared/GameObjects/Systems/EntityLookupSystem.cs
View File

@@ -174,7 +174,7 @@ public sealed partial class EntityLookupSystem : EntitySystem
continue;
DebugTools.Assert(childXform.Broadphase.Value.Uid == component.Owner);
DebugTools.Assert(!_mapManager.IsGrid(child));
DebugTools.Assert(!HasComp<MapGridComponent>(child));
if (childXform.Broadphase.Value.CanCollide && _fixturesQuery.TryGetComponent(child, out var fixtures))
{
@@ -380,7 +380,7 @@ public sealed partial class EntityLookupSystem : EntitySystem
if (xform.GridUid == uid)
return;
DebugTools.Assert(!_mapManager.IsGrid(uid));
DebugTools.Assert(!HasComp<MapGridComponent>(uid));
if (xform.Broadphase is not { Valid: true } old)
return; // entity is not on any broadphase
@@ -525,7 +525,7 @@ public sealed partial class EntityLookupSystem : EntitySystem
private void OnEntityInit(Entity<MetaDataComponent> uid)
{
if (_container.IsEntityOrParentInContainer(uid, uid) || _mapManager.IsMap(uid) || _mapManager.IsGrid(uid))
if (_container.IsEntityOrParentInContainer(uid, uid) || HasComp<MapComponent>(uid) || HasComp<MapGridComponent>(uid))
return;
// TODO can this just be done implicitly via transform startup?
@@ -541,11 +541,11 @@ public sealed partial class EntityLookupSystem : EntitySystem
OnGridChangedMap(args);
return;
}
DebugTools.Assert(!_mapManager.IsGrid(args.Sender));
DebugTools.Assert(!HasComp<MapGridComponent>(args.Sender));
if (args.Component.MapUid == args.Sender)
return;
DebugTools.Assert(!_mapManager.IsMap(args.Sender));
DebugTools.Assert(!HasComp<MapComponent>(args.Sender));
if (args.ParentChanged)
UpdateParent(args.Sender, args.Component);

2
Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
View File

@@ -1361,7 +1361,7 @@ public abstract partial class SharedTransformSystem
}
else
{
if (!_mapManager.IsMap(uid))
if (!HasComp<MapComponent>(uid))
Log.Warning($"Failed to attach entity to map or grid. Entity: ({ToPrettyString(uid)}). Trace: {Environment.StackTrace}");
DetachEntity(uid, xform);

4
Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs
View File

@@ -133,7 +133,7 @@ namespace Robust.Shared.GameObjects
if (xform.GridUid == xform.ParentUid)
return xform.Coordinates;
DebugTools.Assert(!_mapManager.IsGrid(uid) && !_mapManager.IsMap(uid));
DebugTools.Assert(!HasComp<MapGridComponent>(uid) && !HasComp<MapComponent>(uid));
// Not parented to grid so convert their pos back to the grid.
var worldPos = GetWorldPosition(xform, XformQuery);
@@ -174,7 +174,7 @@ namespace Robust.Shared.GameObjects
if (mapId == parentUid)
return coordinates;
DebugTools.Assert(!_mapManager.IsGrid(parentUid) && !_mapManager.IsMap(parentUid));
DebugTools.Assert(!HasComp<MapGridComponent>(parentUid) && !HasComp<MapComponent>(parentUid));
// Not parented to grid so convert their pos back to the grid.
var worldPos = Vector2.Transform(coordinates.Position, GetWorldMatrix(parentXform, XformQuery));

5
Robust.Shared/Physics/Systems/SharedPhysicsSystem.Components.cs
View File

@@ -30,6 +30,7 @@ using Robust.Shared.Collections;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Maths;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Dynamics;
@@ -581,13 +582,13 @@ public partial class SharedPhysicsSystem
if (_containerSystem.IsEntityOrParentInContainer(uid))
return false;
if (!_fixturesQuery.Resolve(uid, ref manager) || manager.FixtureCount == 0 && !_mapManager.IsGrid(uid))
if (!_fixturesQuery.Resolve(uid, ref manager) || manager.FixtureCount == 0 && !HasComp<MapGridComponent>(uid))
return false;
}
else
{
DebugTools.Assert(!_containerSystem.IsEntityOrParentInContainer(uid));
DebugTools.Assert((Resolve(uid, ref manager) && manager.FixtureCount > 0) || _mapManager.IsGrid(uid));
DebugTools.Assert((Resolve(uid, ref manager) && manager.FixtureCount > 0) || HasComp<MapGridComponent>(uid));
}
}