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

Remove plural BaseTurfs as a thing in favour of BaseTurf (#16560)

Browse Source
This commit is contained in:
20kdc
2023-05-19 08:10:56 +01:00
committed by GitHub
parent 4efb41aa58
commit ea64b86331
8 changed files with 105 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Maps/TileSystem.cs
View File

@@ -79,13 +79,19 @@ public sealed class TileSystem : EntitySystem
private bool DeconstructTile(TileRef tileRef)
{
var indices = tileRef.GridIndices;
if (tileRef.Tile.IsEmpty)
return false;
var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileRef.Tile.TypeId];
if (string.IsNullOrEmpty(tileDef.BaseTurf))
return false;
var mapGrid = _mapManager.GetGrid(tileRef.GridUid);
const float margin = 0.1f;
var bounds = mapGrid.TileSize - margin * 2;
var indices = tileRef.GridIndices;
var coordinates = mapGrid.GridTileToLocal(indices)
.Offset(new Vector2(
(_robustRandom.NextFloat() - 0.5f) * bounds,
@@ -102,7 +108,7 @@ public sealed class TileSystem : EntitySystem
_decal.RemoveDecal(tileRef.GridUid, id);
}
var plating = _tileDefinitionManager[tileDef.BaseTurfs[^1]];
var plating = _tileDefinitionManager[tileDef.BaseTurf];
mapGrid.SetTile(tileRef.GridIndices, new Tile(plating.TileId));