From 748d925a37c5902e236871f30911101a16ad606f Mon Sep 17 00:00:00 2001 From: Maelthyr <100411212+Maelthyrr@users.noreply.github.com> Date: Wed, 31 Aug 2022 11:40:03 +0200 Subject: [PATCH 1/5] fix(Core/Scripts): Rajaxx should drop aggro after Thundercrash (#12900) Co-authored-by: greyminder@outlook.com --- src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index c5131c4a3..53738c203 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -113,6 +113,7 @@ struct boss_rajaxx : public BossAI break; case EVENT_THUNDERCRASH: DoCastSelf(SPELL_THUNDERCRASH); + me->GetThreatMgr().ResetAllThreat(); events.ScheduleEvent(EVENT_THUNDERCRASH, 21s); break; default: From 406f2bcd026741a44958692e400473ab35f4cea0 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Wed, 31 Aug 2022 11:40:32 +0200 Subject: [PATCH 2/5] =?UTF-8?q?fix(Core/Battlegrounds):=20Fixed=20setting?= =?UTF-8?q?=20proper=20winner=20team=20at=20the=20end=20=E2=80=A6=20(#1286?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Core/Battlegrounds): Fixed setting proper winner team at the end of battleground. Fixes #11717 Fixes #12688 --- src/server/game/Battlegrounds/Battleground.h | 1 + src/server/game/Spells/SpellEffects.cpp | 1 + src/server/shared/SharedDefines.h | 24 ++++++++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 7e2331f2f..a6a10145c 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -99,6 +99,7 @@ enum BattlegroundMarks { SPELL_WS_MARK_LOSER = 24950, SPELL_WS_MARK_WINNER = 24951, + SPELL_WS_MARK_TIE = 66126, SPELL_AB_MARK_LOSER = 24952, SPELL_AB_MARK_WINNER = 24953, SPELL_AV_MARK_LOSER = 24954, diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index bf087abac..26b2cb27b 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1668,6 +1668,7 @@ void Spell::DoCreateItem(uint8 /*effIndex*/, uint32 itemId) case SPELL_AV_MARK_LOSER: case SPELL_WS_MARK_WINNER: case SPELL_WS_MARK_LOSER: + case SPELL_WS_MARK_TIE: case SPELL_AB_MARK_WINNER: case SPELL_AB_MARK_LOSER: SelfCast = true; diff --git a/src/server/shared/SharedDefines.h b/src/server/shared/SharedDefines.h index 37c91c9e4..584e0c3f8 100644 --- a/src/server/shared/SharedDefines.h +++ b/src/server/shared/SharedDefines.h @@ -3418,12 +3418,32 @@ uint8 constexpr PVP_TEAMS_COUNT = 2; inline PvPTeamId GetPvPTeamId(TeamId teamId) { - return teamId == TEAM_ALLIANCE ? PVP_TEAM_ALLIANCE : PVP_TEAM_HORDE; + if (teamId == TEAM_ALLIANCE) + { + return PVP_TEAM_ALLIANCE; + } + + if (teamId == TEAM_HORDE) + { + return PVP_TEAM_HORDE; + } + + return PVP_TEAM_NEUTRAL; } inline TeamId GetTeamId(PvPTeamId teamId) { - return teamId == PVP_TEAM_ALLIANCE ? TEAM_ALLIANCE : TEAM_HORDE; + if (teamId == PVP_TEAM_ALLIANCE) + { + return TEAM_ALLIANCE; + } + + if (teamId == PVP_TEAM_HORDE) + { + return TEAM_HORDE; + } + + return TEAM_NEUTRAL; } // indexes of BattlemasterList.dbc From 03266f0ddc05be9c6d6dc1d3b8719e20e182e417 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Wed, 31 Aug 2022 23:42:14 -0300 Subject: [PATCH 3/5] fix(DB/creature_formation): Link AQ40 trash packs near Princess Huhuran. (#12872) * Create rev_1661639722871846800.sql * also link vekniss warrior packs --- .../updates/pending_db_world/rev_1661639722871846800.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1661639722871846800.sql diff --git a/data/sql/updates/pending_db_world/rev_1661639722871846800.sql b/data/sql/updates/pending_db_world/rev_1661639722871846800.sql new file mode 100644 index 000000000..8a5694677 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1661639722871846800.sql @@ -0,0 +1,9 @@ +-- Update Vekniss Hive Crawler formations. +UPDATE `creature_formations` SET `dist`=9 WHERE `memberGUID` IN (87940, 87942, 87944); +UPDATE `creature_formations` SET `groupAI`=515 WHERE `memberGUID` BETWEEN 87939 AND 87944; + +-- Update GroupAI in Stinger packs +UPDATE `creature_formations` SET `groupAI`=515 WHERE `memberGUID` BETWEEN 87962 AND 87998; + +-- Update GroupAI in Vekniss Warrior packs +UPDATE `creature_formations` SET `groupAI`=515 WHERE `memberGUID` BETWEEN 87672 AND 87677; From ba4911142b3dc89150899c093734cf02007fd694 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Thu, 1 Sep 2022 04:42:36 +0200 Subject: [PATCH 4/5] =?UTF-8?q?fix(Core/SmartAI):=20Mind-controlled=20crea?= =?UTF-8?q?tures=20can=20auto-attack=20its=20vict=E2=80=A6=20(#12863)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Core/SmartAI): Mind-controlled creatures can auto-attack its victims. Fixes #12624 --- src/server/game/AI/SmartScripts/SmartAI.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 00d1fbb9f..8706ebe4c 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -524,7 +524,17 @@ void SmartAI::UpdateAI(uint32 diff) } if (!IsAIControlled()) + { + if (CharmInfo* charmInfo = me->GetCharmInfo()) + { + if (charmInfo->IsCommandAttack() && mCanAutoAttack) + { + DoMeleeAttackIfReady(); + } + } + return; + } if (!UpdateVictim()) return; From 753d531f220b906b19a659ac2560f5b6f61507f2 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 1 Sep 2022 02:44:38 +0000 Subject: [PATCH 5/5] chore(DB): import pending files Referenced commit(s): ba4911142b3dc89150899c093734cf02007fd694 --- .../rev_1661639722871846800.sql => db_world/2022_09_01_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1661639722871846800.sql => db_world/2022_09_01_00.sql} (91%) diff --git a/data/sql/updates/pending_db_world/rev_1661639722871846800.sql b/data/sql/updates/db_world/2022_09_01_00.sql similarity index 91% rename from data/sql/updates/pending_db_world/rev_1661639722871846800.sql rename to data/sql/updates/db_world/2022_09_01_00.sql index 8a5694677..cb681f349 100644 --- a/data/sql/updates/pending_db_world/rev_1661639722871846800.sql +++ b/data/sql/updates/db_world/2022_09_01_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_08_30_01 -> 2022_09_01_00 -- Update Vekniss Hive Crawler formations. UPDATE `creature_formations` SET `dist`=9 WHERE `memberGUID` IN (87940, 87942, 87944); UPDATE `creature_formations` SET `groupAI`=515 WHERE `memberGUID` BETWEEN 87939 AND 87944;