aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-05-24 22:54:13 +0200
committerQAston <none@none>2009-05-24 22:54:13 +0200
commit1c505261bc13585924e553eeea7b7a14232eb08f (patch)
tree5cadb31ffd26cab61782ae8beccbf3ac9c9ebacc /src/game/Player.cpp
parentdb834e7c7d10b7738830c2c732414da9933e0ae6 (diff)
*Remove auras with duration lower than 30 sec on arena start.
*Do not remove rougue poisons and dk runes on arena start. *Apply healing bonus for healing stream totem. *Do not duplicate damage bonus in code with the one in db for Seal of Vengenance/Corruption --HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index b73a49fb990..910a1bf70be 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -11717,7 +11717,7 @@ void Player::RemoveEnchantmentDurations(Item *item)
}
}
-void Player::RemoveAllEnchantments(EnchantmentSlot slot)
+void Player::RemoveArenaEnchantments(EnchantmentSlot slot)
{
// remove enchantments from equipped items first to clean up the m_enchantDuration list
for(EnchantDurationList::iterator itr = m_enchantDuration.begin(),next;itr != m_enchantDuration.end();itr=next)
@@ -11727,6 +11727,12 @@ void Player::RemoveAllEnchantments(EnchantmentSlot slot)
{
if(itr->item && itr->item->GetEnchantmentId(slot))
{
+ // Poisons and DK runes are enchants which are allowed on arenas
+ if (spellmgr.IsArenaAllowedEnchancment(itr->item->GetEnchantmentId(slot)))
+ {
+ ++next;
+ continue;
+ }
// remove from stats
ApplyEnchantment(itr->item,slot,false,false);
// remove visual