From 9d7f6eed577fdf3ea4750a51d7fbb1df5fb6ea56 Mon Sep 17 00:00:00 2001 From: Harmenszoon <25753539+Harmenszoon@users.noreply.github.com> Date: Mon, 11 May 2026 15:28:12 -0400 Subject: [PATCH 1/2] [Player] guard pet.any expression parsing --- engine/player/player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/player/player.cpp b/engine/player/player.cpp index c4cc379832c..bf764cf68fb 100644 --- a/engine/player/player.cpp +++ b/engine/player/player.cpp @@ -12611,7 +12611,7 @@ std::unique_ptr player_t::create_expression( util::string_view expressio // pet if ( splits.size() >= 2 && splits[ 0 ] == "pet" ) { - if ( splits[ 1 ] == "any" && splits[ 2 ] == "active" ) + if ( splits.size() == 3 && splits[ 1 ] == "any" && splits[ 2 ] == "active" ) { return make_fn_expr( expression_str, [ this ] { From 1b4d2755ab2cf2bc2e1c1bb70196dfac26958d24 Mon Sep 17 00:00:00 2001 From: Harmenszoon <25753539+Harmenszoon@users.noreply.github.com> Date: Mon, 11 May 2026 15:29:32 -0400 Subject: [PATCH 2/2] [Sim] guard missing actors expressions --- engine/sim/sim.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/sim/sim.cpp b/engine/sim/sim.cpp index 32bb5d859c1..5360f0e3e8a 100644 --- a/engine/sim/sim.cpp +++ b/engine/sim/sim.cpp @@ -3609,7 +3609,7 @@ std::unique_ptr sim_t::create_expression( util::string_view name_str ) if ( splits.size() >= 3 && splits[ 0 ] == "actors" ) { player_t* actor = sim_t::find_player( splits[ 1 ] ); - if ( !target ) + if ( !actor ) return nullptr; auto rest = std::string( splits[ 2 ] );