*Prevent item trade exploit - by Iskander.

*Do not set cooldown for triggered spells.
*Do not allow to kill unit twice.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 4655d91b148..0e6e9c580bd 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2583,8 +2583,8 @@ void Spell::SendSpellCooldown()
         return;
     }
 
-    // have infinity cooldown but set at aura apply
-    if(m_spellInfo->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE)
+    // have infinity cooldown but set at aura apply                  // do not set cooldown for triggered spells (needed by reincarnation)
+    if(m_spellInfo->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE || m_IsTriggeredSpell)
         return;
 
     _player->AddSpellAndCategoryCooldowns(m_spellInfo,m_CastItem ? m_CastItem->GetEntry() : 0, this);