mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10335] Make sure DynamicObjectUpdater::VisitHelper does not overwrite existing PersistentAreaAura and leave orphaned aura in m_modAuras.

Browse source
This commit is contained in:
Lynx3d 2010-08-09 23:54:22 +02:00
parent 344dff303e
commit 7e251dd408
2 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/game/GridNotifiersImpl.h
View file

@ -172,28 +172,37 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
return; return;
// Apply PersistentAreaAura on target // Apply PersistentAreaAura on target
// in case 2 dynobject overlap areas for same spell, same holder is selected, so dynobjects share holder
SpellAuraHolder *holder = target->GetSpellAuraHolder(spellInfo->Id, i_dynobject.GetCaster()->GetGUID()); SpellAuraHolder *holder = target->GetSpellAuraHolder(spellInfo->Id, i_dynobject.GetCaster()->GetGUID());
bool addedToExisting = true;
if (!holder)
{
holder = CreateSpellAuraHolder(spellInfo, target, i_dynobject.GetCaster());
addedToExisting = false;
}
PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, holder, target, i_dynobject.GetCaster());
holder->AddAura(Aur, eff_index);
if (addedToExisting) if (holder)
{ {
target->AddAuraToModList(Aur); if (Aura* aura = holder->GetAuraByEffectIndex(eff_index))
holder->SetInUse(true); {
Aur->ApplyModifier(true,true); // already exists, refresh duration
holder->SetInUse(false); if (aura->GetAuraDuration() < i_dynobject.GetDuration())
{
aura->SetAuraDuration(i_dynobject.GetDuration());
holder->SendAuraUpdate(false);
}
}
else
{
PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, holder, target, i_dynobject.GetCaster());
holder->AddAura(Aur, eff_index);
target->AddAuraToModList(Aur);
holder->SetInUse(true);
Aur->ApplyModifier(true,true);
holder->SetInUse(false);
}
} }
else else
{
holder = CreateSpellAuraHolder(spellInfo, target, i_dynobject.GetCaster());
PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, holder, target, i_dynobject.GetCaster());
holder->AddAura(Aur, eff_index);
target->AddSpellAuraHolder(holder); target->AddSpellAuraHolder(holder);
}
i_dynobject.AddAffected(target); i_dynobject.AddAffected(target);
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10334" #define REVISION_NR "10335"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__