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

Fix decal placer crashing when placing/removing in space

Browse Source
This commit is contained in:
Kara D
2022-02-08 15:29:23 -07:00
parent a3061fd855
commit 49007d68e7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Decals/DecalSystem.cs
View File

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