From 3faa0ebc4bd51e818e149966bdbe5275d95191cc Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 1 Jan 2022 15:07:55 +0100 Subject: [PATCH] Fix #16346: Crash in Staff::UpdateWatering() --- src/openrct2/entity/Staff.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index d3ddeeaa33..1b195b0a55 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -1209,9 +1209,9 @@ void Staff::UpdateWatering() if (abs(NextLoc.z - tile_element->GetBaseZ()) > 4 * COORDS_Z_STEP) continue; - auto* sceneryEntry = tile_element->AsSmallScenery()->GetEntry(); + const auto* sceneryEntry = tile_element->AsSmallScenery()->GetEntry(); - if (!sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_CAN_BE_WATERED)) + if (sceneryEntry == nullptr || !sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_CAN_BE_WATERED)) continue; tile_element->AsSmallScenery()->SetAge(0);