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

Fix incorrect logic in PetAI. Solve #3155.

Browse Source
This commit is contained in:
megamage
2011-09-21 12:53:29 -04:00
parent 562f528f87
commit 738f94eed3
1 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/PetAI.cpp
+13 -25
View File
@@ -141,13 +141,8 @@ void PetAI::UpdateAI(const uint32 diff)
if (me->GetCharmInfo() && me->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo)) if (me->GetCharmInfo() && me->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
continue; continue;
// ignore some combinations of combat state and combat/noncombat spells if (spellInfo->IsPositive())
if (!me->getVictim())
{ {
// ignore attacking spells, and allow only self/around spells
if (!spellInfo->IsPositive())
continue;
// non combat spells allowed // non combat spells allowed
// only pet spells have IsNonCombatSpell and not fit this reqs: // only pet spells have IsNonCombatSpell and not fit this reqs:
// Consume Shadows, Lesser Invisibility, so ignore checks for its // Consume Shadows, Lesser Invisibility, so ignore checks for its
@@ -163,36 +158,21 @@ void PetAI::UpdateAI(const uint32 diff)
if (cooldown >= 0 && duration >= 0 && cooldown > duration) if (cooldown >= 0 && duration >= 0 && cooldown > duration)
continue; continue;
} }
}
else
{
// just ignore non-combat spells
if (!spellInfo->CanBeUsedInCombat())
continue;
}
Spell* spell = new Spell(me, spellInfo, TRIGGERED_NONE, 0); Spell* spell = new Spell(me, spellInfo, TRIGGERED_NONE, 0);
// Fix to allow pets on STAY to autocast
if (me->getVictim() && _CanAttack(me->getVictim()) && spell->CanAutoCast(me->getVictim()))
{
targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(me->getVictim(), spell));
continue;
}
else
{
bool spellUsed = false; bool spellUsed = false;
for (std::set<uint64>::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar) for (std::set<uint64>::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar)
{ {
Unit* Target = ObjectAccessor::GetUnit(*me, *tar); Unit* target = ObjectAccessor::GetUnit(*me, *tar);
//only buff targets that are in combat, unless the spell can only be cast while out of combat //only buff targets that are in combat, unless the spell can only be cast while out of combat
if (!Target) if (!target)
continue; continue;
if (spell->CanAutoCast(Target)) if (spell->CanAutoCast(target))
{ {
targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(Target, spell)); targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(target, spell));
spellUsed = true; spellUsed = true;
break; break;
} }
@@ -200,6 +180,14 @@ void PetAI::UpdateAI(const uint32 diff)
if (!spellUsed) if (!spellUsed)
delete spell; delete spell;
} }
else if (me->getVictim() && _CanAttack(me->getVictim()) && spellInfo->CanBeUsedInCombat())
{
Spell* spell = new Spell(me, spellInfo, TRIGGERED_NONE, 0);
if (spell->CanAutoCast(me->getVictim()))
targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(me->getVictim(), spell));
else
delete spell;
}
} }
//found units to cast on to //found units to cast on to