diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index e06f4cbfe9f..20c4bd379d9 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2935,7 +2935,7 @@ void Spell::cast(bool skipCheck) } // Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells - if (m_spellInfo->speed > 0.0f && !IsChanneledSpell(m_spellInfo)) + if (m_spellInfo->speed > 0.0f && !IsChanneledSpell(m_spellInfo) || m_spellInfo->Id == 14157) { // 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 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 935bd136724..74580d45f9b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7769,6 +7769,9 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig case 14189: // Seal Fate (Netherblade set) case 14157: // Ruthlessness { + if (!pVictim || pVictim == this) + return false; + // Need add combopoint AFTER finish movie (or they dropped in finish phase) break; } |