瀏覽代碼

Merge pull request #77440 from KoBeWi/set_pattern_which_doesn't_exist

Check for null in `set_pattern()`
Rémi Verschelde 2 年之前
父節點
當前提交
4c677c88e9
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      scene/2d/tile_map.cpp

+ 2 - 1
scene/2d/tile_map.cpp

@@ -2334,7 +2334,8 @@ Vector2i TileMap::map_pattern(const Vector2i &p_position_in_tilemap, const Vecto
 
 
 void TileMap::set_pattern(int p_layer, const Vector2i &p_position, const Ref<TileMapPattern> p_pattern) {
 void TileMap::set_pattern(int p_layer, const Vector2i &p_position, const Ref<TileMapPattern> p_pattern) {
 	ERR_FAIL_INDEX(p_layer, (int)layers.size());
 	ERR_FAIL_INDEX(p_layer, (int)layers.size());
-	ERR_FAIL_COND(!tile_set.is_valid());
+	ERR_FAIL_COND(tile_set.is_null());
+	ERR_FAIL_COND(p_pattern.is_null());
 
 
 	TypedArray<Vector2i> used_cells = p_pattern->get_used_cells();
 	TypedArray<Vector2i> used_cells = p_pattern->get_used_cells();
 	for (int i = 0; i < used_cells.size(); i++) {
 	for (int i = 0; i < used_cells.size(); i++) {