aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-23 16:34:30 -0600
committermegamage <none@none>2009-03-23 16:34:30 -0600
commita8105dcff636226fbcc1c9c6ece3e8a5d65f0011 (patch)
treebb865464098bdfac413846a4e9d93fcae07f5b0a /src/game/Player.cpp
parente9fb303e362717b848b3cda10e69f44eb9791399 (diff)
*Do not proc anything when aura is removed by cancel.
*Remove aura by cancel when duel complete. This fix a crash. --HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 4f338cd4823..364fea07cce 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -6730,7 +6730,7 @@ void Player::DuelComplete(DuelCompleteType type)
}
for(size_t i=0; i<auras2remove.size(); i++)
- duel->opponent->RemoveAurasDueToSpell(auras2remove[i]);
+ duel->opponent->RemoveAurasDueToSpellByCancel(auras2remove[i]);
auras2remove.clear();
AuraMap const& auras = GetAuras();
@@ -6740,7 +6740,7 @@ void Player::DuelComplete(DuelCompleteType type)
auras2remove.push_back(i->second->GetId());
}
for(size_t i=0; i<auras2remove.size(); i++)
- RemoveAurasDueToSpell(auras2remove[i]);
+ RemoveAurasDueToSpellByCancel(auras2remove[i]);
// cleanup combo points
if(GetComboTarget()==duel->opponent->GetGUID())