From e0751d707f7e226d6aed32252dc88a8eeb98b248 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Sat, 28 Aug 2021 17:43:11 +0200 Subject: [PATCH] Fix #15298: Crash on map.getAllEntities from in-game console (#15301) --- src/openrct2/scripting/ScriptEngine.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index e5e132ceb1..caf284513b 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -1433,7 +1433,16 @@ int32_t OpenRCT2::Scripting::GetTargetAPIVersion() { auto& scriptEngine = GetContext()->GetScriptEngine(); auto& execInfo = scriptEngine.GetExecInfo(); - return execInfo.GetCurrentPlugin()->GetTargetAPIVersion(); + + // Commands from the in-game console do not have a plug-in set + auto plugin = execInfo.GetCurrentPlugin(); + if (plugin == nullptr) + { + // For in-game console, default to the current API version + return OPENRCT2_PLUGIN_API_VERSION; + } + + return plugin->GetTargetAPIVersion(); } #endif