From 8bedbc13110e34500d4f89cd7aeda5a5018eece4 Mon Sep 17 00:00:00 2001 From: devbox Date: Fri, 14 Aug 2026 13:01:08 +1000 Subject: [PATCH] Define TRINITY_PLAYERBOT_V2 for the scripts command target cs_playerbot_v2.cpp is compiled into the scripts_commands shared lib, whose body is gated on #if TRINITY_PLAYERBOT_V2. That macro only ever reached the module sub-libs linked into worldserver, so the command script compiled to an empty stub and .playerbot was never registered. Propagate the define to every SCRIPT_MODULE target when BUILD_PLAYERBOT_V2 is on so GM commands/live PBC listener register. --- src/modules/PlayerbotV2/playerbotv2_core_hooks.patch | 7 ++++++- .../PlayerbotV2/playerbotv2_core_hooks.thordekk.patch | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/modules/PlayerbotV2/playerbotv2_core_hooks.patch b/src/modules/PlayerbotV2/playerbotv2_core_hooks.patch index 6ebc95c852..ab6749d84d 100644 --- a/src/modules/PlayerbotV2/playerbotv2_core_hooks.patch +++ b/src/modules/PlayerbotV2/playerbotv2_core_hooks.patch @@ -4168,7 +4168,7 @@ diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.t index 3356fd9402..ecec635c89 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt -@@ -166,6 +166,14 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) +@@ -166,6 +166,19 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) PUBLIC game) @@ -4178,6 +4178,11 @@ index 3356fd9402..ecec635c89 100644 + ${CMAKE_SOURCE_DIR}/src/plugins/playerbot/strategy + ${CMAKE_SOURCE_DIR}/src/modules/PlayerbotV2) + ++ if(BUILD_PLAYERBOT_V2) ++ target_compile_definitions(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE ++ TRINITY_PLAYERBOT_V2=1) ++ endif() ++ + + set_target_properties(${SCRIPT_MODULE_PROJECT_NAME} diff --git a/src/modules/PlayerbotV2/playerbotv2_core_hooks.thordekk.patch b/src/modules/PlayerbotV2/playerbotv2_core_hooks.thordekk.patch index 7b5afc7ca3..9422ee0bf5 100644 --- a/src/modules/PlayerbotV2/playerbotv2_core_hooks.thordekk.patch +++ b/src/modules/PlayerbotV2/playerbotv2_core_hooks.thordekk.patch @@ -3926,13 +3926,18 @@ diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.t index 691ede0315..72e2133e83 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt -@@ -166,6 +166,10 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) +@@ -166,6 +166,15 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) PUBLIC game) + target_include_directories(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE + ${CMAKE_SOURCE_DIR}/src/modules/PlayerbotV2) + ++ if(BUILD_PLAYERBOT_V2) ++ target_compile_definitions(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE ++ TRINITY_PLAYERBOT_V2=1) ++ endif() ++ + set_target_properties(${SCRIPT_MODULE_PROJECT_NAME} PROPERTIES