From 5e9b88a9a9ddf510ee2e7a95861988a1fb3e54ca Mon Sep 17 00:00:00 2001 From: Axel Cocat Date: Thu, 23 Mar 2023 22:56:48 +0100 Subject: [PATCH 01/16] feat(Core/Mail): call CanSendMail() when returning to sender (#15553) --- src/server/game/Handlers/MailHandler.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index d09c1d816..626991967 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -415,6 +415,25 @@ void WorldSession::HandleMailReturnToSender(WorldPacket& recvData) player->SendMailResult(mailId, MAIL_RETURNED_TO_SENDER, MAIL_ERR_INTERNAL_ERROR); return; } + + if (m->HasItems()) + { + for (MailItemInfoVec::iterator itr = m->items.begin(); itr != m->items.end(); ++itr) + { + Item* item = player->GetMItem(itr->item_guid); + if (item && !sScriptMgr->CanSendMail(player, ObjectGuid(HighGuid::Player, m->sender), mailbox, m->subject, m->body, m->money, m->COD, item)) + { + player->SendMailResult(mailId, MAIL_RETURNED_TO_SENDER, MAIL_ERR_INTERNAL_ERROR); + return; + } + } + } + else if (!sScriptMgr->CanSendMail(player, ObjectGuid(HighGuid::Player, m->sender), mailbox, m->subject, m->body, m->money, m->COD, nullptr)) + { + player->SendMailResult(mailId, MAIL_RETURNED_TO_SENDER, MAIL_ERR_INTERNAL_ERROR); + return; + } + //we can return mail now //so firstly delete the old one CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); From 9e6dcb9e081cb5033fe1305b87ff4c41063b462d Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 24 Mar 2023 06:23:29 -0300 Subject: [PATCH 02/16] chore(Core/Players): Fix typo (#15552) Update Player.cpp --- src/server/game/Entities/Player/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 253ae58a8..6067344bf 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -824,7 +824,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer) { if (!IsAlive()) return DISABLED_MIRROR_TIMER; - return 2002; + return 2020; } default: return 0; @@ -920,7 +920,7 @@ void Player::HandleDrowning(uint32 time_diff) m_MirrorTimer[FIRE_TIMER] -= time_diff; if (m_MirrorTimer[FIRE_TIMER] < 0) { - m_MirrorTimer[FIRE_TIMER] += 2002; + m_MirrorTimer[FIRE_TIMER] += 2020; // Calculate and deal damage /// @todo: Check this formula uint32 damage = urand(600, 700); From a90c3c387dedd6819a251e03cacb2f408123fb40 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Fri, 24 Mar 2023 10:25:12 +0100 Subject: [PATCH 03/16] fix(Core/Spells): Seed of Corruption cannot be reflected. (#15473) * fix(Core/Spells): Seed of Corruption cannot be reflected. Fixes #15458 * Update. --- src/server/game/Spells/SpellInfoCorrections.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index 8d21dce2c..ffed7a496 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4495,6 +4495,12 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->CastTimeEntry = sSpellCastTimesStore.LookupEntry(1); // 0s }); + // Seed of Corruption + ApplySpellFix({ 27285, 47833, 47834 }, [](SpellInfo* spellInfo) + { + spellInfo->AttributesEx |= SPELL_ATTR1_NO_REFLECTION; + }); + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i]; From 825d0dc2bb4b4af43dccf75e0b9e5f880568830c Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Fri, 24 Mar 2023 08:03:20 -0300 Subject: [PATCH 04/16] =?UTF-8?q?fix(Scripts/IcecrownCitadel):=20Prevent?= =?UTF-8?q?=20the=20LK=20from=20despawning=20Tirion=20F=E2=80=A6=20(#15561?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Scripts/IcecrownCitadel): Prevent the LK from despawning Tirion Forddring --- .../scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 85ceb9d3d..66c5d987f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -844,6 +844,11 @@ public: void JustSummoned(Creature* summon) override { + if (summon->GetEntry() == NPC_HIGHLORD_TIRION_FORDRING_LK) + { + return; + } + switch (summon->GetEntry()) { case NPC_SHAMBLING_HORROR: From 593c16f83824065b07db06f2321cd4d6e08301d4 Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:34:42 +0000 Subject: [PATCH 05/16] fix(DB/SAI): Unstable Voidwrath explosion (#15105) * fix(DB/SAI): Unstable Voidwrath explosion * Update Unstable Voidwrath.sql * Update Unstable Voidwrath.sql * Update Unstable Voidwrath.sql * Update Unstable Voidwrath.sql * Update Unstable Voidwrath.sql * New File * Update data/sql/updates/pending_db_world/rev_1676756599180523200.sql * Update data/sql/updates/pending_db_world/rev_1676756599180523200.sql * Update data/sql/updates/pending_db_world/rev_1676756599180523200.sql --- .../updates/pending_db_world/rev_1676756599180523200.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676756599180523200.sql diff --git a/data/sql/updates/pending_db_world/rev_1676756599180523200.sql b/data/sql/updates/pending_db_world/rev_1676756599180523200.sql new file mode 100644 index 000000000..cf861e1e5 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676756599180523200.sql @@ -0,0 +1,6 @@ +SET @ENTRY := 18869; +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@ENTRY, 0, 0, 0, 11, 0, 100, 1, 0, 0, 0, 0, 11, 34302, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On respawn - Self: Cast spell Coalesce (34302) with flags interrupt previous on Self'), +(@ENTRY, 0, 1, 0, 6, 0, 8, 1, 0, 0, 0, 0, 11, 36463, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On death - Self: Cast spell Unstable Rift (36463) with flags interrupt previous on Self'); From 1d969fe8af9ae029dda07a5ad1b25f4987650c7e Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:35:05 +0100 Subject: [PATCH 06/16] =?UTF-8?q?fix(DB/SAI):=20Shadowmoon=20Warlock's=20F?= =?UTF-8?q?el=20Power=20should=20be=20used=20out=20of=20com=E2=80=A6=20(#1?= =?UTF-8?q?5104)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(DB/SAI): Shadowmoon Warlock's Fel Power shoudl be used out of combat on nearby Felguard Brute or Felguard Annihilator. Fixes #13819 * Update --- data/sql/updates/pending_db_world/rev_1676743728527320400.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676743728527320400.sql diff --git a/data/sql/updates/pending_db_world/rev_1676743728527320400.sql b/data/sql/updates/pending_db_world/rev_1676743728527320400.sql new file mode 100644 index 000000000..f644454cd --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676743728527320400.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `event_type`=1, `event_flags`=6, `event_param1`=2000, `event_param2`=6000, `event_param3`=18000, `event_param4`=24000, `action_param2`=0, `target_type`=1 WHERE `entryorguid`=17371 AND `source_type`=0 AND `id`=5; From ac45b552b256bbc058bef68990806281a28ea82a Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:35:22 +0200 Subject: [PATCH 07/16] fix(DB/SAI): Thule Ravenclaw - remove ranged movement (#15187) * fix(DB/SAI): Thule Ravenclaw - remove ranged movement * remove overwrite existing ainame * Update data/sql/updates/pending_db_world/rev_1677249657204460100.sql --- .../updates/pending_db_world/rev_1677249657204460100.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1677249657204460100.sql diff --git a/data/sql/updates/pending_db_world/rev_1677249657204460100.sql b/data/sql/updates/pending_db_world/rev_1677249657204460100.sql new file mode 100644 index 000000000..3479eac54 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1677249657204460100.sql @@ -0,0 +1,7 @@ +-- Thule Ravenclaw - remove ranged movement +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 1947; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1947, 0, 0, 0, 0, 0, 85, 0, 5000, 5000, 20000, 30000, 0, 11, 7655, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Thule Ravenclaw - In Combat - Cast \'Hex of Ravenclaw\''), +(1947, 0, 1, 0, 0, 0, 85, 0, 1000, 1000, 7000, 12000, 0, 11, 20800, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Thule Ravenclaw - In Combat - Cast \'Immolate\''), +(1947, 0, 2, 0, 1, 0, 100, 1, 0, 0, 1000, 1000, 0, 11, 11939, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Thule Ravenclaw - Out of Combat - Cast \'Summon Imp\''), +(1947, 0, 3, 0, 4, 0, 85, 1, 0, 0, 0, 0, 0, 11, 13787, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Thule Ravenclaw - On Aggro - Cast \'Demon Armor\''); From 648d54fa195447c25cb65b4f1f1fffb28fec22d3 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:35:35 +0200 Subject: [PATCH 08/16] fix(DB/SAI): Mosh'Ogg Spellcrafter spmming flamestrike. (#15380) * fix(DB/SAI): Mosh'Ogg Spellcrafter spmming flamestrike. * correct timers * use has_aura --- .../updates/pending_db_world/rev_1678786830366844800.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1678786830366844800.sql diff --git a/data/sql/updates/pending_db_world/rev_1678786830366844800.sql b/data/sql/updates/pending_db_world/rev_1678786830366844800.sql new file mode 100644 index 000000000..99999a1b7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1678786830366844800.sql @@ -0,0 +1,7 @@ +-- Mosh'Ogg Spellcrafter +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 710; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(710, 0, 0, 0, 4, 0, 15, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Mosh\'Ogg Spellcrafter - On Aggro - Say Line 0'), +(710, 0, 1, 0, 23, 0, 100, 0, 12544, 0, 10000, 10000, 0, 11, 12544, 64, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mosh\'Ogg Spellcrafter - On Aura \'Frost Armor\' Missing - Cast \'Frost Armor\''), +(710, 0, 2, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 11, 9053, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Mosh\'Ogg Spellcrafter - In Combat - Cast \'Fireball\''), +(710, 0, 3, 0, 0, 0, 100, 0, 5000, 9000, 12000, 15000, 0, 11, 11829, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Mosh\'Ogg Spellcrafter - In Combat - Cast \'Flamestrike\''); From da62ff127310a15f02f8308eba54c5f0f9cf03af Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:35:46 +0200 Subject: [PATCH 09/16] fix(DB/SAI): Ethereal Thief disarm timer. (#15413) --- data/sql/updates/pending_db_world/rev_1678972128182408900.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1678972128182408900.sql diff --git a/data/sql/updates/pending_db_world/rev_1678972128182408900.sql b/data/sql/updates/pending_db_world/rev_1678972128182408900.sql new file mode 100644 index 000000000..c0095e030 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1678972128182408900.sql @@ -0,0 +1,2 @@ +-- Ethereal Thief - Disarm timing +UPDATE `smart_scripts` SET `event_param1` = 9000, `event_param2` = 12000, `event_param3` = 15000, `event_param4` = 18000 WHERE `entryorguid` = 16544 AND `source_type` = 0 AND `id` = 4; From 192bea7a819fd097c8b269af23142e696507f247 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:35:58 +0200 Subject: [PATCH 10/16] fix(DB/Event): (Mulgore) DMF Building event GOs in Brewfest. (#15478) * fix(DB/Event): DMF Building event objects in Brewfest. * Update data/sql/updates/pending_db_world/rev_1679241095722302100.sql --- data/sql/updates/pending_db_world/rev_1679241095722302100.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1679241095722302100.sql diff --git a/data/sql/updates/pending_db_world/rev_1679241095722302100.sql b/data/sql/updates/pending_db_world/rev_1679241095722302100.sql new file mode 100644 index 000000000..4d3a9e7d8 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1679241095722302100.sql @@ -0,0 +1,2 @@ +-- Remove (71) Darkmoon Faire Building (Mulgore) gameobjects from (24) Brewfest +DELETE FROM `game_event_gameobject` WHERE `eventEntry` = 24 AND `guid` IN (31919,31918,31916,31915,31914,31913,31912,31879,31878,31877,31876,31875,31874,31872); From a094d0da44c297dbea96f234b254576473107223 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:36:17 +0200 Subject: [PATCH 11/16] fix(DB/Creature): All Violet Hold Guard having emote 333. (#15513) --- data/sql/updates/pending_db_world/rev_1679332103007906200.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1679332103007906200.sql diff --git a/data/sql/updates/pending_db_world/rev_1679332103007906200.sql b/data/sql/updates/pending_db_world/rev_1679332103007906200.sql new file mode 100644 index 000000000..fc0612178 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1679332103007906200.sql @@ -0,0 +1,2 @@ +-- Violet Hold Guard, only the 2 right in front of VH should have emote 333. +UPDATE `creature_template_addon` SET `emote` = 0 WHERE `entry` = 30659; From d782927931df3b5db2712ad9486847eab8b02336 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 24 Mar 2023 13:36:31 -0300 Subject: [PATCH 12/16] fix(DB/Creature): Use addon instead of SAI for Eyeless Watcher and Unseen Servant (#15551) Create rev_1679584531586420800.sql --- .../updates/pending_db_world/rev_1679584531586420800.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1679584531586420800.sql diff --git a/data/sql/updates/pending_db_world/rev_1679584531586420800.sql b/data/sql/updates/pending_db_world/rev_1679584531586420800.sql new file mode 100644 index 000000000..68a769a01 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1679584531586420800.sql @@ -0,0 +1,7 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` IN (8538, 8539)) AND (`source_type` = 0) AND (`id` IN (2)); + +DELETE FROM `creature_template_addon` WHERE (`entry` IN (8538, 8539)); +INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(8538, 0, 0, 0, 1, 0, 0, '16380'), +(8539, 0, 0, 0, 1, 0, 0, '16380'); From 3cfa908f108ce81165e7336d2c6c37af8aa69fcb Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Fri, 24 Mar 2023 11:38:01 -0500 Subject: [PATCH 13/16] =?UTF-8?q?fix(DB/SAI):=20Authentic=20delay=20on=20d?= =?UTF-8?q?ialog=20for=20Verna=20and=20Farmer=E2=80=A6=20(#15560)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(db/smart_scripts): Authentic delay on dialog for Verna and Farmer Furlbrow --- data/sql/updates/pending_db_world/rev_1679636920097451700.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1679636920097451700.sql diff --git a/data/sql/updates/pending_db_world/rev_1679636920097451700.sql b/data/sql/updates/pending_db_world/rev_1679636920097451700.sql new file mode 100644 index 000000000..da82c2597 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1679636920097451700.sql @@ -0,0 +1,4 @@ +-- +-- Slows the repeat behavior of NPCs 237 (Verna Furlbrow) and 238 (Farmer Furlbrow) dialogue to be authentic +UPDATE `smart_scripts` SET `event_param3`=1202000, `event_param4`=1202000 WHERE `entryorguid`=237 AND `source_type`=0 AND `id`=0 AND `link`=0; +UPDATE `smart_scripts` SET `event_param3`=1666000, `event_param4`=1666000 WHERE `entryorguid`=238 AND `source_type`=0 AND `id`=0 AND `link`=0; From 4ff81ebf221c0853df340133903a95e45f7736cc Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 24 Mar 2023 16:40:31 +0000 Subject: [PATCH 14/16] chore(DB): import pending files Referenced commit(s): 3cfa908f108ce81165e7336d2c6c37af8aa69fcb --- .../rev_1676743728527320400.sql => db_world/2023_03_24_00.sql} | 1 + .../rev_1676756599180523200.sql => db_world/2023_03_24_01.sql} | 1 + .../rev_1677249657204460100.sql => db_world/2023_03_24_02.sql} | 1 + .../rev_1678786830366844800.sql => db_world/2023_03_24_03.sql} | 1 + .../rev_1678972128182408900.sql => db_world/2023_03_24_04.sql} | 1 + .../rev_1679241095722302100.sql => db_world/2023_03_24_05.sql} | 1 + .../rev_1679332103007906200.sql => db_world/2023_03_24_06.sql} | 1 + .../rev_1679584531586420800.sql => db_world/2023_03_24_07.sql} | 1 + .../rev_1679636920097451700.sql => db_world/2023_03_24_08.sql} | 1 + 9 files changed, 9 insertions(+) rename data/sql/updates/{pending_db_world/rev_1676743728527320400.sql => db_world/2023_03_24_00.sql} (84%) rename data/sql/updates/{pending_db_world/rev_1676756599180523200.sql => db_world/2023_03_24_01.sql} (95%) rename data/sql/updates/{pending_db_world/rev_1677249657204460100.sql => db_world/2023_03_24_02.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1678786830366844800.sql => db_world/2023_03_24_03.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1678972128182408900.sql => db_world/2023_03_24_04.sql} (83%) rename data/sql/updates/{pending_db_world/rev_1679241095722302100.sql => db_world/2023_03_24_05.sql} (84%) rename data/sql/updates/{pending_db_world/rev_1679332103007906200.sql => db_world/2023_03_24_06.sql} (77%) rename data/sql/updates/{pending_db_world/rev_1679584531586420800.sql => db_world/2023_03_24_07.sql} (89%) rename data/sql/updates/{pending_db_world/rev_1679636920097451700.sql => db_world/2023_03_24_08.sql} (90%) diff --git a/data/sql/updates/pending_db_world/rev_1676743728527320400.sql b/data/sql/updates/db_world/2023_03_24_00.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1676743728527320400.sql rename to data/sql/updates/db_world/2023_03_24_00.sql index f644454cd..f343d5ad0 100644 --- a/data/sql/updates/pending_db_world/rev_1676743728527320400.sql +++ b/data/sql/updates/db_world/2023_03_24_00.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_23_03 -> 2023_03_24_00 -- UPDATE `smart_scripts` SET `event_type`=1, `event_flags`=6, `event_param1`=2000, `event_param2`=6000, `event_param3`=18000, `event_param4`=24000, `action_param2`=0, `target_type`=1 WHERE `entryorguid`=17371 AND `source_type`=0 AND `id`=5; diff --git a/data/sql/updates/pending_db_world/rev_1676756599180523200.sql b/data/sql/updates/db_world/2023_03_24_01.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1676756599180523200.sql rename to data/sql/updates/db_world/2023_03_24_01.sql index cf861e1e5..493e105a6 100644 --- a/data/sql/updates/pending_db_world/rev_1676756599180523200.sql +++ b/data/sql/updates/db_world/2023_03_24_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_24_00 -> 2023_03_24_01 SET @ENTRY := 18869; DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY; UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY; diff --git a/data/sql/updates/pending_db_world/rev_1677249657204460100.sql b/data/sql/updates/db_world/2023_03_24_02.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1677249657204460100.sql rename to data/sql/updates/db_world/2023_03_24_02.sql index 3479eac54..b463b57e3 100644 --- a/data/sql/updates/pending_db_world/rev_1677249657204460100.sql +++ b/data/sql/updates/db_world/2023_03_24_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_24_01 -> 2023_03_24_02 -- Thule Ravenclaw - remove ranged movement DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 1947; INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1678786830366844800.sql b/data/sql/updates/db_world/2023_03_24_03.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1678786830366844800.sql rename to data/sql/updates/db_world/2023_03_24_03.sql index 99999a1b7..8cba36aa0 100644 --- a/data/sql/updates/pending_db_world/rev_1678786830366844800.sql +++ b/data/sql/updates/db_world/2023_03_24_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_24_02 -> 2023_03_24_03 -- Mosh'Ogg Spellcrafter DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 710; INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1678972128182408900.sql b/data/sql/updates/db_world/2023_03_24_04.sql similarity index 83% rename from data/sql/updates/pending_db_world/rev_1678972128182408900.sql rename to data/sql/updates/db_world/2023_03_24_04.sql index c0095e030..8eaebc693 100644 --- a/data/sql/updates/pending_db_world/rev_1678972128182408900.sql +++ b/data/sql/updates/db_world/2023_03_24_04.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_24_03 -> 2023_03_24_04 -- Ethereal Thief - Disarm timing UPDATE `smart_scripts` SET `event_param1` = 9000, `event_param2` = 12000, `event_param3` = 15000, `event_param4` = 18000 WHERE `entryorguid` = 16544 AND `source_type` = 0 AND `id` = 4; diff --git a/data/sql/updates/pending_db_world/rev_1679241095722302100.sql b/data/sql/updates/db_world/2023_03_24_05.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1679241095722302100.sql rename to data/sql/updates/db_world/2023_03_24_05.sql index 4d3a9e7d8..6303d7629 100644 --- a/data/sql/updates/pending_db_world/rev_1679241095722302100.sql +++ b/data/sql/updates/db_world/2023_03_24_05.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_24_04 -> 2023_03_24_05 -- Remove (71) Darkmoon Faire Building (Mulgore) gameobjects from (24) Brewfest DELETE FROM `game_event_gameobject` WHERE `eventEntry` = 24 AND `guid` IN (31919,31918,31916,31915,31914,31913,31912,31879,31878,31877,31876,31875,31874,31872); diff --git a/data/sql/updates/pending_db_world/rev_1679332103007906200.sql b/data/sql/updates/db_world/2023_03_24_06.sql similarity index 77% rename from data/sql/updates/pending_db_world/rev_1679332103007906200.sql rename to data/sql/updates/db_world/2023_03_24_06.sql index fc0612178..e86c5546d 100644 --- a/data/sql/updates/pending_db_world/rev_1679332103007906200.sql +++ b/data/sql/updates/db_world/2023_03_24_06.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_24_05 -> 2023_03_24_06 -- Violet Hold Guard, only the 2 right in front of VH should have emote 333. UPDATE `creature_template_addon` SET `emote` = 0 WHERE `entry` = 30659; diff --git a/data/sql/updates/pending_db_world/rev_1679584531586420800.sql b/data/sql/updates/db_world/2023_03_24_07.sql similarity index 89% rename from data/sql/updates/pending_db_world/rev_1679584531586420800.sql rename to data/sql/updates/db_world/2023_03_24_07.sql index 68a769a01..23b553c62 100644 --- a/data/sql/updates/pending_db_world/rev_1679584531586420800.sql +++ b/data/sql/updates/db_world/2023_03_24_07.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_24_06 -> 2023_03_24_07 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` IN (8538, 8539)) AND (`source_type` = 0) AND (`id` IN (2)); diff --git a/data/sql/updates/pending_db_world/rev_1679636920097451700.sql b/data/sql/updates/db_world/2023_03_24_08.sql similarity index 90% rename from data/sql/updates/pending_db_world/rev_1679636920097451700.sql rename to data/sql/updates/db_world/2023_03_24_08.sql index da82c2597..208ef4ec6 100644 --- a/data/sql/updates/pending_db_world/rev_1679636920097451700.sql +++ b/data/sql/updates/db_world/2023_03_24_08.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_24_07 -> 2023_03_24_08 -- -- Slows the repeat behavior of NPCs 237 (Verna Furlbrow) and 238 (Farmer Furlbrow) dialogue to be authentic UPDATE `smart_scripts` SET `event_param3`=1202000, `event_param4`=1202000 WHERE `entryorguid`=237 AND `source_type`=0 AND `id`=0 AND `link`=0; From 357a2a33ce42608514287b0aa846ab4d819373cf Mon Sep 17 00:00:00 2001 From: Axel Cocat Date: Sat, 25 Mar 2023 00:14:38 +0100 Subject: [PATCH 15/16] feat(Core/ChatHandler): ignore chat level requirement when whispering self (#15564) feat(Core/ChatHandler): ignore chat level requirement when whispering self --- src/server/game/Handlers/ChatHandler.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 3d1af0d8b..cc91c55a9 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -367,12 +367,6 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) break; case CHAT_MSG_WHISPER: { - if (sender->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)) - { - SendNotification(GetAcoreString(LANG_WHISPER_REQ), sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)); - return; - } - if (!normalizePlayerName(to)) { SendPlayerNotFoundNotice(to); @@ -382,6 +376,13 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) Player* receiver = ObjectAccessor::FindPlayerByName(to, false); bool senderIsPlayer = AccountMgr::IsPlayerAccount(GetSecurity()); bool receiverIsPlayer = AccountMgr::IsPlayerAccount(receiver ? receiver->GetSession()->GetSecurity() : SEC_PLAYER); + + if (sender->GetLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ) && receiver != sender) + { + SendNotification(GetAcoreString(LANG_WHISPER_REQ), sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)); + return; + } + if (!receiver || (senderIsPlayer && !receiverIsPlayer && !receiver->isAcceptWhispers() && !receiver->IsInWhisperWhiteList(sender->GetGUID()))) { SendPlayerNotFoundNotice(to); From dd43ea4849bf7147b4bba19212e92156547261c2 Mon Sep 17 00:00:00 2001 From: qwe900 Date: Sat, 25 Mar 2023 01:11:51 +0100 Subject: [PATCH 16/16] fix(Scripts/IcecrownCitadel): Lichking "Harvest Soul" Fix (#15573) Players now not stucking anymore in the strangulating vehicle and getting teleported --- .../scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 66c5d987f..17ce3995c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -3131,11 +3131,6 @@ public: if (!summoner) return; - if (summoner->GetTypeId() != TYPEID_UNIT) - { - return; - } - if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING))) { me->SetWalk(false);