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

Removes duplicate range check in InRangeUnobstructed(#6358)

Browse Source
This commit is contained in:
WlarusFromDaSpace
2022-01-30 00:49:43 +00:00
committed by GitHub
parent ee179762fd
commit 6fb492aae7
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -292,12 +292,11 @@ namespace Content.Shared.Interaction
Ignored? predicate = null, Ignored? predicate = null,
bool ignoreInsideBlocker = false) bool ignoreInsideBlocker = false)
{ {
if (!origin.InRange(other, range)) return false; if (range > 0f && !origin.InRange(other, range)) return false;
var dir = other.Position - origin.Position; var dir = other.Position - origin.Position;
if (dir.LengthSquared.Equals(0f)) return true; if (dir.LengthSquared.Equals(0f)) return true;
if (range > 0f && !(dir.LengthSquared <= range * range)) return false;
predicate ??= _ => false; predicate ??= _ => false;