Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix mime wall intersecting with adjacent wall (#16701)

Browse Source
This commit is contained in:
themias
2023-05-22 17:58:04 -04:00
committed by GitHub
parent ab6edecdf7
commit cd7213243e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Abilities/Mime/MimePowersSystem.cs
View File

@@ -18,6 +18,7 @@ namespace Content.Server.Abilities.Mime
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly AlertsSystem _alertsSystem = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!;
[Dependency] private readonly EntityLookupSystem _lookupSystem = default!; [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
[Dependency] private readonly TurfSystem _turf = default!;
[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IGameTiming _timing = default!;
@@ -69,13 +70,17 @@ namespace Content.Server.Abilities.Mime
if (tile == null) if (tile == null)
return; return;
// Check there are no walls or mobs there // Check there are no walls there
foreach (var entity in _lookupSystem.GetEntitiesIntersecting(tile.Value, flags: LookupFlags.Static)) if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable))
{ {
PhysicsComponent? physics = null; // We use this to check if it's impassable _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-failed"), uid, uid);
if (HasComp<MobStateComponent>(entity) && entity != uid // Is it a mob? return;
|| Resolve(entity, ref physics, false) && (physics.CollisionLayer & (int) CollisionGroup.Impassable) != 0 // Is it impassable? }
&& !(TryComp<DoorComponent>(entity, out var door) && door.State != DoorState.Closed)) // Is it a door that's open and so not actually impassable?
// Check there are no mobs there
foreach (var entity in _lookupSystem.GetEntitiesIntersecting(tile.Value))
{
if (HasComp<MobStateComponent>(entity) && entity != uid)
{ {
_popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-failed"), uid, uid); _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-failed"), uid, uid);
return; return;