aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-01-14 00:06:36 +0100
committerShauren <shauren.trinity@gmail.com>2024-01-14 00:06:36 +0100
commitc5f7e6cbd7354f8e0f0e732f3d1e1093a0640a7a (patch)
tree11ea3a3a40fc11c9aabaf33dcf97076c303487b7
parent151dd67e2eb22e49ce84c2eb28b08985bcce7602 (diff)
Core/Spells: Kill incorrect attribute implementation
(cherry picked from commit 8b183ddac3b77eea47eae578226ce8b928d262b8)
-rw-r--r--sql/updates/world/master/2024_01_13_00_world.sql1
-rw-r--r--src/server/game/Spells/Spell.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/updates/world/master/2024_01_13_00_world.sql b/sql/updates/world/master/2024_01_13_00_world.sql
new file mode 100644
index 00000000000..f932d763f1d
--- /dev/null
+++ b/sql/updates/world/master/2024_01_13_00_world.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `SpellPhaseMask`=0x4 WHERE `SpellId`=70803;
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 4873e420c23..3d95e2890d1 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3847,7 +3847,7 @@ void Spell::_cast(bool skipCheck)
creatureCaster->ReleaseSpellFocus(this);
// Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells
- if ((m_spellInfo->HasHitDelay() && !m_spellInfo->IsChanneled()) || m_spellInfo->HasAttribute(SPELL_ATTR4_NO_HARMFUL_THREAT))
+ if (m_spellInfo->HasHitDelay() && !m_spellInfo->IsChanneled())
{
// Remove used for cast item if need (it can be already NULL after TakeReagents call
// in case delayed spell remove item at cast delay start