From bd4db4a91b09243f37ab4d8223516d9372bea07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 20 Mar 2025 18:27:44 +0200
Subject: [PATCH] Use TryGetEntity for iterators as it handles null entities
 explicitly

---
 src/openrct2/entity/EntityList.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/entity/EntityList.h b/src/openrct2/entity/EntityList.h
index f8d52f85b7..4fa21bbe10 100644
--- a/src/openrct2/entity/EntityList.h
+++ b/src/openrct2/entity/EntityList.h
@@ -45,7 +45,7 @@ public:
 
         while (iter != end && Entity == nullptr)
         {
-            Entity = GetEntity<T>(*iter++);
+            Entity = TryGetEntity<T>(*iter++);
         }
         return *this;
     }
@@ -119,7 +119,7 @@ public:
 
         while (iter != end && Entity == nullptr)
         {
-            Entity = GetEntity<T>(*iter++);
+            Entity = TryGetEntity<T>(*iter++);
         }
         return *this;
     }