From 6a931b6be207681f834b14370bec07a35a23ffa7 Mon Sep 17 00:00:00 2001 From: Nefertumm Date: Wed, 13 Apr 2022 08:55:06 -0300 Subject: [PATCH] fix(Core/BWL): Orb of Command areatrigger (#11385) --- .../rev_1649799370491572700.sql | 5 ++++ .../BlackwingLair/instance_blackwing_lair.cpp | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1649799370491572700.sql diff --git a/data/sql/updates/pending_db_world/rev_1649799370491572700.sql b/data/sql/updates/pending_db_world/rev_1649799370491572700.sql new file mode 100644 index 000000000..c44be1190 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1649799370491572700.sql @@ -0,0 +1,5 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1649799370491572700'); + +DELETE FROM `areatrigger_scripts` WHERE `entry` = 3847; +INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES +(3847, 'at_orb_of_command'); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index 1ee8c63f4..778575711 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -644,8 +644,33 @@ public: } }; +enum orb_of_command_misc +{ + QUEST_BLACKHANDS_COMMAND = 7761, + MAP_BWL = 469 +}; + +const Position orbOfCommandTP = { -7672.46f, -1107.19f, 396.65f, 0.59f }; + +class at_orb_of_command : public AreaTriggerScript +{ +public: + at_orb_of_command() : AreaTriggerScript("at_orb_of_command") { } + + bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override + { + if (!player->IsAlive() && player->GetQuestRewardStatus(QUEST_BLACKHANDS_COMMAND)) + { + player->TeleportTo(MAP_BWL, orbOfCommandTP.m_positionX, orbOfCommandTP.m_positionY, orbOfCommandTP.m_positionZ, orbOfCommandTP.m_orientation); + return true; + } + return false; + } +}; + void AddSC_instance_blackwing_lair() { new instance_blackwing_lair(); new spell_bwl_shadowflame(); + new at_orb_of_command(); }