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

Use TurfSystem.IsTileBlocked instead of TurfHelpers (#32174)

Browse Source 
* Use TurfSystem.IsTileBlocked instead of TurfHelpers

* !
This commit is contained in:
Winkarst
2024-09-18 04:49:37 +03:00
committed by GitHub
parent 974c08596b
commit 2bceaad785
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Coordinates.Helpers;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Maps; using Content.Shared.Maps;
using Content.Shared.Physics;
using Content.Shared.Stacks; using Content.Shared.Stacks;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
@@ -15,6 +16,7 @@ namespace Content.Server.Engineering.EntitySystems
{ {
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly StackSystem _stackSystem = default!; [Dependency] private readonly StackSystem _stackSystem = default!;
[Dependency] private readonly TurfSystem _turfSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -36,7 +38,7 @@ namespace Content.Server.Engineering.EntitySystems
bool IsTileClear() bool IsTileClear()
{ {
return tileRef.Tile.IsEmpty == false && !tileRef.IsBlockedTurf(true); return tileRef.Tile.IsEmpty == false && !_turfSystem.IsTileBlocked(tileRef, CollisionGroup.MobMask);
} }
if (!IsTileClear()) if (!IsTileClear())

7
Content.Server/Respawn/SpecialRespawnSystem.cs
View File

@@ -2,16 +2,15 @@ using Content.Server.Administration.Logs;
using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.EntitySystems;
using Content.Server.Chat.Managers; using Content.Server.Chat.Managers;
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Shared.Station.Components;
using Content.Server.Station.Systems;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Maps; using Content.Shared.Maps;
using Content.Shared.Physics; using Content.Shared.Physics;
using Content.Shared.Respawn; using Content.Shared.Respawn;
using Content.Shared.Station.Components;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
using Robust.Shared.Random;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Random;
namespace Content.Server.Respawn; namespace Content.Server.Respawn;
@@ -179,7 +178,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
foreach (var newTileRef in grid.GetTilesIntersecting(circle)) foreach (var newTileRef in grid.GetTilesIntersecting(circle))
{ {
if (newTileRef.IsSpace(_tileDefinitionManager) || newTileRef.IsBlockedTurf(true) || !_atmosphere.IsTileMixtureProbablySafe(targetGrid, targetMap, mapTarget)) if (newTileRef.IsSpace(_tileDefinitionManager) || _turf.IsTileBlocked(newTileRef, CollisionGroup.MobMask) || !_atmosphere.IsTileMixtureProbablySafe(targetGrid, targetMap, mapTarget))
continue; continue;
found = true; found = true;