Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix Freeze

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-06 22:43:52 +02:00
parent bf8877342d
commit 81ef5e632f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/Unit.cpp
View File

@@ -3899,7 +3899,7 @@ void Unit::RemoveAura(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode)
{
for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
{
if (!caster || iter->second->GetCasterGUID()==caster)
if ((!caster || iter->second->GetCasterGUID()==caster) && !iter->second->IsDuringUpdate())
{
RemoveAura(iter, removeMode);
return;
@@ -3913,7 +3913,7 @@ void Unit::RemoveAurasDueToSpell(uint32 spellId, uint64 caster ,AuraRemoveMode r
{
for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
{
if (!caster || iter->second->GetCasterGUID()==caster)
if ((!caster || iter->second->GetCasterGUID()==caster) && !iter->second->IsDuringUpdate())
{
RemoveAura(iter, removeMode);
iter = m_Auras.lower_bound(spellId);
@@ -4007,7 +4007,7 @@ void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId)
{
for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
{
if (iter->second->GetCastItemGUID() == castItem->GetGUID())
if ((!castItem || iter->second->GetCastItemGUID()==castItem->GetGUID()) && !iter->second->IsDuringUpdate())
{
RemoveAura(iter);
iter = m_Auras.upper_bound(spellId); // overwrite by more appropriate
@@ -4078,6 +4078,7 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
if (Aur->IsDuringUpdate())
{
Aur->RemoveAura();
i++;
return;
}