josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Make sure that aura is applied on unit before trying to remove it.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-01-10 20:09:44 +01:00
parent 4bd6d06e26
commit ef24d90472
4 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/BattleGround.cpp
+6 -5
View File
@@ -428,16 +428,17 @@ void BattleGround::Update(uint32 diff)
{
plr->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION);
// remove auras with duration lower than 30s
Unit::AuraMap & auraMap = plr->GetOwnedAuras();
for (Unit::AuraMap::iterator iter = auraMap.begin(); iter != auraMap.end();)
Unit::AuraApplicationMap & auraMap = plr->GetAppliedAuras();
for (Unit::AuraApplicationMap::iterator iter = auraMap.begin(); iter != auraMap.end();)
{
Aura * aura = iter->second;
AuraApplication * aurApp = iter->second;
Aura * aura = aurApp->GetBase();
if (!aura->IsPermanent()
&& aura->GetDuration() <= 30*IN_MILISECONDS
&& aura->IsPositive(plr)
&& aurApp->IsPositive()
&& (!(aura->GetSpellProto()->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
&& (!aura->HasEffectType(SPELL_AURA_MOD_INVISIBILITY)))
plr->RemoveOwnedAura(iter);
plr->RemoveAura(iter);
else
++iter;
}