*Use std::map instead of UNORDERED_MAP for storing aura applications of an aura.
--HG-- branch : trunk
This commit is contained in:
@@ -78,7 +78,7 @@ class AuraApplication
|
|||||||
class TRINITY_DLL_SPEC Aura
|
class TRINITY_DLL_SPEC Aura
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef UNORDERED_MAP<uint64, AuraApplication *> ApplicationMap;
|
typedef std::map<uint64, AuraApplication *> ApplicationMap;
|
||||||
|
|
||||||
static Aura * TryCreate(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0);
|
static Aura * TryCreate(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0);
|
||||||
static Aura * TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0);
|
static Aura * TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0);
|
||||||
|
|||||||
@@ -899,7 +899,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
|
|||||||
// part of positive spell if casted at self
|
// part of positive spell if casted at self
|
||||||
if(spellproto->EffectImplicitTargetA[effIndex] != TARGET_UNIT_CASTER)
|
if(spellproto->EffectImplicitTargetA[effIndex] != TARGET_UNIT_CASTER)
|
||||||
return false;
|
return false;
|
||||||
// but not this if this first effect (didn't find batter check)
|
// but not this if this first effect (didn't find better check)
|
||||||
if(spellproto->Attributes & 0x4000000 && effIndex==0)
|
if(spellproto->Attributes & 0x4000000 && effIndex==0)
|
||||||
return false;
|
return false;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -3755,6 +3755,7 @@ void Unit::_UnapplyAura(AuraApplication * aurApp, AuraRemoveMode removeMode)
|
|||||||
else
|
else
|
||||||
++iter;
|
++iter;
|
||||||
}
|
}
|
||||||
|
assert(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Unit::_RemoveNoStackAuraApplicationsDueToAura(Aura * aura)
|
void Unit::_RemoveNoStackAuraApplicationsDueToAura(Aura * aura)
|
||||||
|
|||||||
Reference in New Issue
Block a user