tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup warnings in SharedPortalSystem (#36747)

Browse Source 
* Cleanup warnings in SharedPortalSystem

* Formatting while we're here

* Replace uses of !Any() with Count == 0

* AnyEntitiesIntersecting
This commit is contained in:
Tayrtahn
2025-04-20 20:32:34 -04:00
committed by GitHub
parent 915f8cca8c
commit d4dfbcc853
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
View File

@@ -112,7 +112,7 @@ public abstract class SharedPortalSystem : EntitySystem
if (TryComp<LinkedEntityComponent>(uid, out var link)) if (TryComp<LinkedEntityComponent>(uid, out var link))
{ {
if (!link.LinkedEntities.Any()) if (link.LinkedEntities.Count == 0)
return; return;
// client can't predict outside of simple portal-to-portal interactions due to randomness involved // client can't predict outside of simple portal-to-portal interactions due to randomness involved
@@ -150,7 +150,7 @@ public abstract class SharedPortalSystem : EntitySystem
private void OnEndCollide(EntityUid uid, PortalComponent component, ref EndCollideEvent args) private void OnEndCollide(EntityUid uid, PortalComponent component, ref EndCollideEvent args)
{ {
if (!ShouldCollide(args.OurFixtureId, args.OtherFixtureId,args.OurFixture, args.OtherFixture)) if (!ShouldCollide(args.OurFixtureId, args.OtherFixtureId, args.OurFixture, args.OtherFixture))
return; return;
var subject = args.OtherEntity; var subject = args.OtherEntity;
@@ -162,14 +162,14 @@ public abstract class SharedPortalSystem : EntitySystem
} }
} }
private void TeleportEntity(EntityUid portal, EntityUid subject, EntityCoordinates target, EntityUid? targetEntity=null, bool playSound=true, private void TeleportEntity(EntityUid portal, EntityUid subject, EntityCoordinates target, EntityUid? targetEntity = null, bool playSound = true,
PortalComponent? portalComponent = null) PortalComponent? portalComponent = null)
{ {
if (!Resolve(portal, ref portalComponent)) if (!Resolve(portal, ref portalComponent))
return; return;
var ourCoords = Transform(portal).Coordinates; var ourCoords = Transform(portal).Coordinates;
var onSameMap = ourCoords.GetMapId(EntityManager) == target.GetMapId(EntityManager); var onSameMap = _transform.GetMapId(ourCoords) == _transform.GetMapId(target);
var distanceInvalid = portalComponent.MaxTeleportRadius != null var distanceInvalid = portalComponent.MaxTeleportRadius != null
&& ourCoords.TryDistance(EntityManager, target, out var distance) && ourCoords.TryDistance(EntityManager, target, out var distance)
&& distance > portalComponent.MaxTeleportRadius; && distance > portalComponent.MaxTeleportRadius;
@@ -228,7 +228,7 @@ public abstract class SharedPortalSystem : EntitySystem
{ {
var randVector = _random.NextVector2(component.MaxRandomRadius); var randVector = _random.NextVector2(component.MaxRandomRadius);
newCoords = coords.Offset(randVector); newCoords = coords.Offset(randVector);
if (!_lookup.GetEntitiesIntersecting(newCoords.ToMap(EntityManager, _transform), LookupFlags.Static).Any()) if (!_lookup.AnyEntitiesIntersecting(_transform.ToMapCoordinates(newCoords), LookupFlags.Static))
{ {
break; break;
} }