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

*Prevent possible crash.

Browse Source 
*Remove obsolete Judgement of Righteousness coefficient-by cccyril

--HG--
branch : trunk
This commit is contained in:
QAston
2009-03-15 18:02:10 +01:00
parent f9b14c221b
commit 7a1e7c4f73
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuras.cpp
+10 -8
View File
@@ -831,6 +831,8 @@ void Aura::_AddAura()
Unit::VisibleAuraMap const *visibleAuras = m_target->GetVisibleAuras();
if(visibleAuras->size() < MAX_AURAS || slot < MAX_AURAS) // got free slot
{
AuraSlotEntry * entry;
// Lookup free slot
if (!secondaura)
{
@@ -845,18 +847,18 @@ void Aura::_AddAura()
}
assert(slot < MAX_AURAS); // assert that we find a slot and it is valid
AuraSlotEntry t_entry;
t_entry.m_Flags=(IsPositive() ? AFLAG_POSITIVE : AFLAG_NEGATIVE) | ((GetCasterGUID() == m_target->GetGUID()) ? AFLAG_CASTER : AFLAG_NONE) | ((GetAuraMaxDuration() > 0) ? AFLAG_DURATION : AFLAG_NONE);
t_entry.m_Level=(caster ? caster->getLevel() : sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL));
t_entry.m_spellId = GetId();
entry = m_target->GetVisibleAuraSlot(slot);
entry->m_Flags=(IsPositive() ? AFLAG_POSITIVE : AFLAG_NEGATIVE) | ((GetCasterGUID() == m_target->GetGUID()) ? AFLAG_CASTER : AFLAG_NONE) | ((GetAuraMaxDuration() > 0) ? AFLAG_DURATION : AFLAG_NONE);
entry->m_Level=(caster ? caster->getLevel() : sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL));
entry->m_spellId = GetId();
//init pointers-prevent unexpected behaviour
for(uint8 i = 0; i < 3; i++)
t_entry.m_slotAuras[i]=NULL;
m_target->SetVisibleAura(slot, t_entry);
entry->m_slotAuras[i]=NULL;
}
else
entry = m_target->GetVisibleAura(slot);
if(AuraSlotEntry *entry = m_target->GetVisibleAura(slot))
if(entry)
{
entry->m_Flags |= (1 << GetEffIndex());
entry->m_slotAuras[GetEffIndex()]=this;