Skip to content

Commit 392fd38

Browse files
Fix a few obsolete ToMap calls in EntityLookup.Queries
1 parent 4f1b018 commit 392fd38

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Robust.Shared/GameObjects/Systems/EntityLookup.Queries.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ public IEnumerable<EntityUid> GetEntitiesInArc(
429429
float arcWidth,
430430
LookupFlags flags = DefaultFlags)
431431
{
432-
var position = coordinates.ToMap(EntityManager, _transform);
432+
var position = _transform.ToMapCoordinates(coordinates);
433433

434434
return GetEntitiesInArc(position, range, direction, arcWidth, flags);
435435
}
@@ -632,7 +632,7 @@ public bool AnyEntitiesIntersecting(EntityCoordinates coordinates, LookupFlags f
632632
if (!coordinates.IsValid(EntityManager))
633633
return false;
634634

635-
var mapPos = coordinates.ToMap(EntityManager, _transform);
635+
var mapPos = _transform.ToMapCoordinates(coordinates);
636636
return AnyEntitiesIntersecting(mapPos, flags);
637637
}
638638

@@ -641,13 +641,13 @@ public bool AnyEntitiesInRange(EntityCoordinates coordinates, float range, Looku
641641
if (!coordinates.IsValid(EntityManager))
642642
return false;
643643

644-
var mapPos = coordinates.ToMap(EntityManager, _transform);
644+
var mapPos = _transform.ToMapCoordinates(coordinates);
645645
return AnyEntitiesInRange(mapPos, range, flags);
646646
}
647647

648648
public HashSet<EntityUid> GetEntitiesIntersecting(EntityCoordinates coordinates, LookupFlags flags = DefaultFlags)
649649
{
650-
var mapPos = coordinates.ToMap(EntityManager, _transform);
650+
var mapPos = _transform.ToMapCoordinates(coordinates);
651651
return GetEntitiesIntersecting(mapPos, flags);
652652
}
653653

@@ -660,7 +660,7 @@ public HashSet<EntityUid> GetEntitiesInRange(EntityCoordinates coordinates, floa
660660

661661
public void GetEntitiesInRange(EntityCoordinates coordinates, float range, HashSet<EntityUid> entities, LookupFlags flags = DefaultFlags)
662662
{
663-
var mapPos = coordinates.ToMap(EntityManager, _transform);
663+
var mapPos = _transform.ToMapCoordinates(coordinates);
664664

665665
if (mapPos.MapId == MapId.Nullspace)
666666
return;

0 commit comments

Comments
 (0)