From 132f6c3c190f239b1a3f0deec31e565104830e2f Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Mon, 13 Sep 2021 16:10:31 +0200 Subject: [PATCH] fix(DB/Spells): define Dust Field as a positive spell (#7798) - Closes #5392 - Closes #6285 --- .../sql/updates/pending_db_world/rev_1631201007246764700.sql | 5 +++++ src/server/game/Entities/Unit/Unit.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 data/sql/updates/pending_db_world/rev_1631201007246764700.sql diff --git a/data/sql/updates/pending_db_world/rev_1631201007246764700.sql b/data/sql/updates/pending_db_world/rev_1631201007246764700.sql new file mode 100644 index 000000000..ea25710cf --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1631201007246764700.sql @@ -0,0 +1,5 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1631201007246764700'); + +DELETE FROM `spell_custom_attr` WHERE `spell_id`=21909; +INSERT INTO `spell_custom_attr` VALUES +(21909,0x06000000); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6caeb9c87..1b7a661b7 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12119,7 +12119,7 @@ bool Unit::IsImmunedToSpell(SpellInfo const* spellInfo) { SpellInfo const* immuneSpellInfo = sSpellMgr->GetSpellInfo(itr->spellId); if (((itr->type & spellInfo->GetSchoolMask()) == spellInfo->GetSchoolMask()) - && !(immuneSpellInfo && immuneSpellInfo->IsPositive() && spellInfo->IsPositive()) + && !(immuneSpellInfo && immuneSpellInfo->IsPositive()) && !spellInfo->IsPositive() && !spellInfo->CanPierceImmuneAura(immuneSpellInfo)) return true; }