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

Obsolete Logger cleanup for EntitySystems part 2 (#26159)

Browse Source 
* Kill the static InRangeUnOccluded

* Adjusted 4 more EntitySystems that were missed.
This commit is contained in:
LordCarve
2024-03-17 08:31:09 +01:00
committed by GitHub
parent 90be67e679
commit 7d275a4b5e
14 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -144,7 +144,7 @@ namespace Content.Shared.Examine
return TryComp<EyeComponent>(uid, out var eye) && eye.DrawFov;
}
public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
{
// No, rider. This is better.
// ReSharper disable once ConvertToLocalFunction
@@ -154,7 +154,7 @@ namespace Content.Shared.Examine
return InRangeUnOccluded(origin, other, range, predicate, wrapped, ignoreInsideBlocker, entMan);
}
public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
TState state, Func<EntityUid, TState, bool> predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
{
if (other.MapId != origin.MapId ||
@@ -171,7 +171,7 @@ namespace Content.Shared.Examine
if (length > MaxRaycastRange)
{
Logger.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
Log.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
length = MaxRaycastRange;
}
@@ -207,7 +207,7 @@ namespace Content.Shared.Examine
return true;
}
public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
{
var entMan = IoCManager.Resolve<IEntityManager>();
var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -216,7 +216,7 @@ namespace Content.Shared.Examine
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
{
var entMan = IoCManager.Resolve<IEntityManager>();
var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -225,7 +225,7 @@ namespace Content.Shared.Examine
return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
}
public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
{
var entMan = IoCManager.Resolve<IEntityManager>();
var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;