diff options
| -rw-r--r-- | data/sql/updates/db_world/2025_11_24_01.sql | 3 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_24_02.sql | 5 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_24_03.sql | 3 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_25_00.sql | 3 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_25_01.sql | 3 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_25_02.sql | 3 | ||||
| -rw-r--r-- | modules/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 2 |
8 files changed, 27 insertions, 0 deletions
diff --git a/data/sql/updates/db_world/2025_11_24_01.sql b/data/sql/updates/db_world/2025_11_24_01.sql new file mode 100644 index 0000000000..3811b0c7dc --- /dev/null +++ b/data/sql/updates/db_world/2025_11_24_01.sql @@ -0,0 +1,3 @@ +-- DB update 2025_11_24_00 -> 2025_11_24_01 +-- +UPDATE `quest_template_addon` SET `PrevQuestID` = 0 WHERE (`ID` = 11311); diff --git a/data/sql/updates/db_world/2025_11_24_02.sql b/data/sql/updates/db_world/2025_11_24_02.sql new file mode 100644 index 0000000000..751231a409 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_24_02.sql @@ -0,0 +1,5 @@ +-- DB update 2025_11_24_01 -> 2025_11_24_02 +-- Alliance +UPDATE `conditions` SET `ConditionValue1` = 11248, `Comment` = 'Vrykul Scroll of Ascension - Requires quest Operation: Skornful Wrath completed' WHERE `SourceTypeOrReferenceId` = 1 AND `SourceEntry` = 33314 AND `ConditionTypeOrReference` = 8 AND `ConditionValue1` = 11247; +-- Horde +UPDATE `conditions` SET `ConditionValue1` = 11256, `Comment` = 'Vrykul Scroll of Ascension - Requires quest Skorn Must Fall! completed' WHERE `SourceTypeOrReferenceId` = 1 AND `SourceEntry` = 33345 AND `ConditionTypeOrReference` = 8 AND `ConditionValue1` = 11258; diff --git a/data/sql/updates/db_world/2025_11_24_03.sql b/data/sql/updates/db_world/2025_11_24_03.sql new file mode 100644 index 0000000000..2a8f48c4f3 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_24_03.sql @@ -0,0 +1,3 @@ +-- DB update 2025_11_24_02 -> 2025_11_24_03 +-- +UPDATE `quest_template_addon` SET `PrevQuestID` = 0 WHERE (`ID` = 12487); diff --git a/data/sql/updates/db_world/2025_11_25_00.sql b/data/sql/updates/db_world/2025_11_25_00.sql new file mode 100644 index 0000000000..6579ab65db --- /dev/null +++ b/data/sql/updates/db_world/2025_11_25_00.sql @@ -0,0 +1,3 @@ +-- DB update 2025_11_24_03 -> 2025_11_25_00 +-- Light Won't Grant Me Vengeance requires Crusader Forward Camp +UPDATE `quest_template_addon` SET `PrevQuestID` = 12894 WHERE `ID` = 12904; diff --git a/data/sql/updates/db_world/2025_11_25_01.sql b/data/sql/updates/db_world/2025_11_25_01.sql new file mode 100644 index 0000000000..6ef704bb95 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_25_01.sql @@ -0,0 +1,3 @@ +-- DB update 2025_11_25_00 -> 2025_11_25_01 +-- Makes the quest "Remember Everfrost" repetable +UPDATE `quest_template_addon` SET `SpecialFlags` = `SpecialFlags` | 1 WHERE `ID` = 13421; diff --git a/data/sql/updates/db_world/2025_11_25_02.sql b/data/sql/updates/db_world/2025_11_25_02.sql new file mode 100644 index 0000000000..49dd261649 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_25_02.sql @@ -0,0 +1,3 @@ +-- DB update 2025_11_25_01 -> 2025_11_25_02 +-- Removes the pre-quest for Elixir of Pain [502] for Elixir of Agony +UPDATE `quest_template_addon` SET `PrevQuestID` = 0 WHERE (`ID` = 509); diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 13d123bf4b..fd36c5068a 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -279,6 +279,11 @@ add_library(modules STATIC if (MOD_ALE_FOUND) target_link_libraries(modules PUBLIC lualib) + # Also ensure include directories are propagated for modules that include sol.hpp + get_target_property(LUALIB_INCLUDE_DIRS lualib INTERFACE_INCLUDE_DIRECTORIES) + if(LUALIB_INCLUDE_DIRS) + list(APPEND PUBLIC_INCLUDES ${LUALIB_INCLUDE_DIRS}) + endif() endif() target_link_libraries(modules diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index a9b42edeb4..e7a5c4fd84 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2696,6 +2696,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (me && me->FindMap()) me->FindMap()->LoadGrid(e.target.x, e.target.y); + else if (go && go->FindMap()) + go->FindMap()->LoadGrid(e.target.x, e.target.y); break; } case SMART_ACTION_PLAYER_TALK: |