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

*Fix a crash in boss_svala.cpp + fix build

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-29 01:36:01 -07:00
parent aa5e2d3b28
commit 21f08bff8e
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
+2 -5
View File
@@ -286,12 +286,9 @@ struct TRINITY_DLL_DECL boss_svala_sorrowgraveAI : public ScriptedAI
Phase = SACRIFICING;
for (uint8 i = 0; i < 3; ++i)
{
if (pRitualChanneler[i] = m_creature->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerLocations[i].x, RitualChannelerLocations[i].y, RitualChannelerLocations[i].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000))
{
CAST_AI(mob_ritual_channelerAI,pRitualChanneler[i])->AttackStartNoMove(pSacrificeTarget);
}
}
if (mob_ritual_channelerAI *pChannelerAI = CAST_AI(mob_ritual_channelerAI,pRitualChanneler[i]))
pChannelerAI->AttackStartNoMove(pSacrificeTarget);
}
uiRitualOfSwordTimer = 18000 + rand()%4000;
} else uiRitualOfSwordTimer -= diff;
src/game/Creature.cpp
+1 -1
View File
@@ -1690,7 +1690,7 @@ bool Creature::canStartAttack(Unit const* who, bool force) const
if(!force)
{
// if victim(1) has a victim(2), and victim(2) is a non-friendly player, don't attack victim(1) unless forced
if(who->getVictim() && who->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() && !IsFriendlyTo(who->getVictim())
if(who->getVictim() && who->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() && !IsFriendlyTo(who->getVictim()))
return false;
if(who->isInCombat())
src/game/Unit.cpp
+2 -2
View File
@@ -11344,7 +11344,7 @@ Unit* Creature::SelectVictim()
else
return NULL;
if(target && (!target->getVictim() || IsFriendlyTo(target->getVictim())) // if victim(1) has a victim(2), only attack victim(1) if we are friendly with victim(2)
if(target && (!target->getVictim() || IsFriendlyTo(target->getVictim()))) // if victim(1) has a victim(2), only attack victim(1) if we are friendly with victim(2)
{
SetInFront(target);
return target;
@@ -11357,7 +11357,7 @@ Unit* Creature::SelectVictim()
for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr)
{
if((*itr) && canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER
&& !((Creature*)(*itr))->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)
&& !((Creature*)(*itr))->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN))
// && (!(*itr)->getVictim() || IsFriendlyTo((*itr)->getVictim()))) // if victim(1) has a victim(2), only attack victim(1) if we are friendly with victim(2)
return NULL;
}