diff options
author | Shauren <shauren.trinity@gmail.com> | 2015-10-20 17:31:21 +0200 |
---|---|---|
committer | Carbenium <carbenium@outlook.com> | 2015-11-07 00:42:41 +0100 |
commit | 949c0b58a9d8bba3873b851883e8739a0c7cac5d (patch) | |
tree | 6ca57ee77ecae32a8f1df96d04b9bceff5c430b2 /src/server/game/Spells/SpellEffects.cpp | |
parent | bf7175ee836e667db5802311bfe0229d7f7dfefa (diff) |
Merge pull request #15746 from Rushor/Venom
Core/Spells: Reduce Duration for EffectEnchantHeldItem-Spells
(cherry picked from commit c04c409f41b2c459aba2b8a2c0c705123d1217d6)
Conflicts:
src/server/game/Spells/SpellEffects.cpp
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
-rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 77f3d2b905e..a00db8cbd68 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4114,11 +4114,14 @@ void Spell::EffectEnchantHeldItem(SpellEffIndex /*effIndex*/) if (effectInfo->MiscValue) { uint32 enchant_id = effectInfo->MiscValue; - int32 duration = m_spellInfo->GetDuration(); //Try duration index first .. + int32 duration = m_spellInfo->GetDuration(); //Try duration index first .. if (!duration) - duration = damage;//+1; //Base points after .. + duration = damage;//+1; //Base points after .. if (!duration) - duration = 10; //10 seconds for enchants which don't have listed duration + duration = 10 * IN_MILLISECONDS; //10 seconds for enchants which don't have listed duration + + if (m_spellInfo->Id == 14792) // Venomhide Poison + duration = 5 * MINUTE * IN_MILLISECONDS; SpellItemEnchantmentEntry const* pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); if (!pEnchant) @@ -4132,7 +4135,7 @@ void Spell::EffectEnchantHeldItem(SpellEffIndex /*effIndex*/) return; // Apply the temporary enchantment - item->SetEnchantment(slot, enchant_id, duration*IN_MILLISECONDS, 0, m_caster->GetGUID()); + item->SetEnchantment(slot, enchant_id, duration, 0, m_caster->GetGUID()); item_owner->ApplyEnchantment(item, slot, true); } } |