From dbe02645f176f67b980edcac0edb0ef2a571f87e Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 24 Sep 2019 12:21:12 +0200 Subject: [PATCH] some tiled sanity checks --- MLEM.Extended/Tiled/TiledExtensions.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MLEM.Extended/Tiled/TiledExtensions.cs b/MLEM.Extended/Tiled/TiledExtensions.cs index bcc5375..a8c09cb 100644 --- a/MLEM.Extended/Tiled/TiledExtensions.cs +++ b/MLEM.Extended/Tiled/TiledExtensions.cs @@ -39,18 +39,22 @@ namespace MLEM.Extended.Tiled { } public static TiledMapTilesetTile GetTilesetTile(this TiledMapTileset tileset, TiledMapTile tile, TiledMap map) { + if (tile.IsBlank) + return null; var localId = tile.GetLocalIdentifier(tileset, map); return tileset.Tiles.FirstOrDefault(t => t.LocalTileIdentifier == localId); } public static TiledMapTilesetTile GetTilesetTile(this TiledMapTile tile, TiledMap map) { + if (tile.IsBlank) + return null; var tileset = tile.GetTileset(map); - return tileset.GetTilesetTile(tile, map); + return tileset?.GetTilesetTile(tile, map); } public static TiledMapTile GetTile(this TiledMap map, string layerName, int x, int y) { var layer = map.GetLayer(layerName); - return layer != null ? layer.GetTile((ushort) x, (ushort) y) : new TiledMapTile(0, (ushort) x, (ushort) y); + return layer != null ? layer.GetTile((ushort) x, (ushort) y) : default; } public static RectangleF GetArea(this TiledMapObject obj, TiledMap map, Vector2 position) {