Merge pull request #56046 from timothyqiu/map-pattern

Fix crash when executing `TileMap.map_pattern`
This commit is contained in:
Rémi Verschelde 2021-12-18 11:29:14 +01:00 committed by GitHub
commit aef799f1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2104,6 +2104,7 @@ Ref<TileMapPattern> TileMap::get_pattern(int p_layer, TypedArray<Vector2i> p_coo
}
Vector2i TileMap::map_pattern(Vector2i p_position_in_tilemap, Vector2i p_coords_in_pattern, Ref<TileMapPattern> p_pattern) {
ERR_FAIL_COND_V(p_pattern.is_null(), Vector2i());
ERR_FAIL_COND_V(!p_pattern->has_cell(p_coords_in_pattern), Vector2i());
Vector2i output = p_position_in_tilemap + p_coords_in_pattern;