From cd261fc7b29d725a77df5e2909cec7a3af101979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 16 Feb 2022 19:51:50 +0200
Subject: [PATCH] Use DukValue for scripted entity id_get

---
 src/openrct2/scripting/bindings/entity/ScEntity.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp
index 7b4d9b03ad..27002e7c11 100644
--- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp
+++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp
@@ -38,10 +38,15 @@ namespace OpenRCT2::Scripting
         }
 
     private:
-        int32_t id_get() const
+        DukValue id_get() const
         {
+            auto ctx = GetContext()->GetScriptEngine().GetContext();
+
             auto entity = GetEntity();
-            return entity != nullptr ? entity->sprite_index.ToUnderlying() : EntityId::GetNull().ToUnderlying();
+            if (entity == nullptr)
+                return ToDuk(ctx, nullptr);
+
+            return ToDuk(ctx, entity->sprite_index.ToUnderlying());
         }
 
         std::string type_get() const