diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs index 91a998cf3c..2b8b1efc1e 100644 --- a/Content.Server/Decals/DecalSystem.cs +++ b/Content.Server/Decals/DecalSystem.cs @@ -109,6 +109,9 @@ namespace Content.Server.Decals var gridId = ev.Coordinates.GetGridId(EntityManager); + if (!gridId.IsValid()) + return; + // remove all decals on the same tile foreach (var decal in GetDecalsInRange(gridId, ev.Coordinates.Position)) { @@ -141,6 +144,9 @@ namespace Content.Server.Decals return false; var gridId = coordinates.GetGridId(EntityManager); + if (!gridId.IsValid()) + return false; + if (MapManager.GetGrid(gridId).GetTileRef(coordinates).IsSpace()) return false;