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

[10519] Fix delaying spell with 2 or more persistent area auras and store ObjectGuid instead of Unit* on DynamicObject affected set

Browse source
This commit is contained in:
Laise 2010-09-23 10:08:32 +02:00
parent 14127b4d08
commit 5d8cd04f97
3 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/game/DynamicObject.cpp
View file

@ -147,9 +147,40 @@ void DynamicObject::Delete()
void DynamicObject::Delay(int32 delaytime) void DynamicObject::Delay(int32 delaytime)
{ {
m_aliveDuration -= delaytime; m_aliveDuration -= delaytime;
for(AffectedSet::iterator iunit= m_affected.begin(); iunit != m_affected.end(); ++iunit) for(AffectedSet::iterator iter = m_affected.begin(); iter != m_affected.end(); )
if (*iunit) {
(*iunit)->DelaySpellAuraHolder(m_spellId, delaytime, GetCasterGUID()); Unit *target = GetMap()->GetUnit((*iter));
if (target)
{
SpellAuraHolder *holder = target->GetSpellAuraHolder(m_spellId, GetCasterGUID());
if (!holder)
{
++iter;
continue;
}
bool foundAura = false;
for (int32 i = m_effIndex + 1; i < MAX_EFFECT_INDEX; ++i)
{
if ((holder->GetSpellProto()->Effect[i] == SPELL_EFFECT_PERSISTENT_AREA_AURA || holder->GetSpellProto()->Effect[i] == SPELL_EFFECT_ADD_FARSIGHT) && holder->m_auras[i])
{
foundAura = true;
break;
}
}
if (foundAura)
{
++iter;
continue;
}
target->DelaySpellAuraHolder(m_spellId, delaytime, GetCasterGUID());
++iter;
}
else
m_affected.erase(iter);
}
} }
bool DynamicObject::isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const bool DynamicObject::isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const

8
src/game/DynamicObject.h
View file

@ -28,7 +28,7 @@ struct SpellEntry;
class DynamicObject : public WorldObject class DynamicObject : public WorldObject
{ {
public: public:
typedef std::set<Unit*> AffectedSet; typedef std::set<ObjectGuid> AffectedSet;
explicit DynamicObject(); explicit DynamicObject();
void AddToWorld(); void AddToWorld();
@ -43,9 +43,9 @@ class DynamicObject : public WorldObject
uint64 GetCasterGUID() const { return GetUInt64Value(DYNAMICOBJECT_CASTER); } uint64 GetCasterGUID() const { return GetUInt64Value(DYNAMICOBJECT_CASTER); }
Unit* GetCaster() const; Unit* GetCaster() const;
float GetRadius() const { return m_radius; } float GetRadius() const { return m_radius; }
bool IsAffecting(Unit *unit) const { return m_affected.find(unit) != m_affected.end(); } bool IsAffecting(Unit *unit) const { return m_affected.find(unit->GetObjectGuid()) != m_affected.end(); }
void AddAffected(Unit *unit) { m_affected.insert(unit); } void AddAffected(Unit *unit) { m_affected.insert(unit->GetObjectGuid()); }
void RemoveAffected(Unit *unit) { m_affected.erase(unit); } void RemoveAffected(Unit *unit) { m_affected.erase(unit->GetObjectGuid()); }
void Delay(int32 delaytime); void Delay(int32 delaytime);
bool IsHostileTo(Unit const* unit) const; bool IsHostileTo(Unit const* unit) const;

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 "10518" #define REVISION_NR "10519"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__