*Do not proc anything when aura is removed by cancel.

*Remove aura by cancel when duel complete. This fix a crash.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-23 16:34:30 -06:00
parent e9fb303e36
commit a8105dcff6
3 changed files with 8 additions and 26 deletions
+2 -2
View File
@@ -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())