Merge 78f04d203ffbae005a5bb946c0f7a2ba5aafaefc into f6c4164765afe447476114e632ee3d70b04a1777

chore(CI): Add mod-costumes (#21548 )
fix(Core/Spells): Fixed misdirection triggering from mend pet
2025-02-20 15:21:00 +08:00 · 2025-02-20 06:29:46 +01:00 · 2025-02-19 11:05:32 +03:00
2 changed files with 5 additions and 1 deletions
--- a/apps/ci/ci-install-modules.sh
+++ b/apps/ci/ci-install-modules.sh
@ -28,3 +28,4 @@ git clone --depth=1 --branch=master https://github.com/azerothcore/mod-server-au
 git clone --depth=1 --branch=master https://github.com/azerothcore/mod-transmog.git modules/mod-transmog
 git clone --depth=1 --branch=main   https://github.com/azerothcore/mod-progression-system.git modules/mod-progression-system
 git clone --depth=1 --branch=master https://github.com/azerothcore/mod-arena-3v3-solo-queue.git modules/mod-arena-3v3-solo-queue
+git clone --depth=1 --branch=master https://github.com/azerothcore/mod-costumes.git modules/mod-costumes
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@ -887,8 +887,11 @@ class spell_hun_misdirection : public AuraScript
            GetTarget()->ResetRedirectThreat();
    }

-    bool CheckProc(ProcEventInfo& /*eventInfo*/)
+    bool CheckProc(ProcEventInfo& eventInfo)
    {
+        // Do not trigger from Mend Pet
+        if (eventInfo.GetProcSpell() && (eventInfo.GetProcSpell()->GetSpellInfo()->SpellFamilyFlags[0] & 0x800000))
+            return false;
        return GetTarget()->GetRedirectThreatTarget();
    }
Author	SHA1	Message	Date
Paul	9814078fb3	Merge 78f04d203ffbae005a5bb946c0f7a2ba5aafaefc into f6c4164765afe447476114e632ee3d70b04a1777	2025-02-20 15:21:00 +08:00
Andrew	f6c4164765	chore(CI): Add mod-costumes (#21548 )	2025-02-20 06:29:46 +01:00
pavel_k	78f04d203f	fix(Core/Spells): Fixed misdirection triggering from mend pet closes https://github.com/azerothcore/azerothcore-wotlk/issues/20824	2025-02-19 11:05:32 +03:00