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

*Fix petAi::Update crash.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-01-19 22:15:04 +01:00
parent 7ef6842cf3
commit 6e76e67253
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/PetAI.cpp
+2 -4
View File
@@ -115,8 +115,6 @@ void PetAI::UpdateAI(const uint32 diff)
if(!me->GetCharmInfo()) if(!me->GetCharmInfo())
return; return;
bool inCombat = me->getVictim();
// Autocast (casted only in combat or persistent spells in any state) // Autocast (casted only in combat or persistent spells in any state)
if (m_creature->GetGlobalCooldown() == 0 && !m_creature->hasUnitState(UNIT_STAT_CASTING)) if (m_creature->GetGlobalCooldown() == 0 && !m_creature->hasUnitState(UNIT_STAT_CASTING))
{ {
@@ -134,7 +132,7 @@ void PetAI::UpdateAI(const uint32 diff)
continue; continue;
// ignore some combinations of combat state and combat/noncombat spells // ignore some combinations of combat state and combat/noncombat spells
if (!inCombat) if (!me->getVictim())
{ {
// ignore attacking spells, and allow only self/around spells // ignore attacking spells, and allow only self/around spells
if (!IsPositiveSpell(spellInfo->Id)) if (!IsPositiveSpell(spellInfo->Id))
@@ -166,7 +164,7 @@ void PetAI::UpdateAI(const uint32 diff)
Spell *spell = new Spell(m_creature, spellInfo, false, 0); Spell *spell = new Spell(m_creature, spellInfo, false, 0);
// Fix to allow pets on STAY to autocast // Fix to allow pets on STAY to autocast
if (inCombat && _CanAttack(me->getVictim()) && spell->CanAutoCast(me->getVictim())) if (me->getVictim() && _CanAttack(me->getVictim()) && spell->CanAutoCast(me->getVictim()))
{ {
targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(m_creature->getVictim(), spell)); targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(m_creature->getVictim(), spell));
continue; continue;