*Change typecasts to use build in functions/macros in scripts to prevent possible access violation.
*Remove no longer needed hack from netherspite script. --HG-- branch : trunk
This commit is contained in:
@@ -116,7 +116,7 @@ struct boss_balindaAI : public ScriptedAI
|
|||||||
|
|
||||||
void JustSummoned(Creature* summoned)
|
void JustSummoned(Creature* summoned)
|
||||||
{
|
{
|
||||||
((mob_water_elementalAI*)summoned->AI())->uiBalindaGUID = me->GetGUID();
|
CAST_AI(mob_water_elementalAI, summoned->AI())->uiBalindaGUID = me->GetGUID();
|
||||||
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true));
|
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true));
|
||||||
summoned->setFaction(me->getFaction());
|
summoned->setFaction(me->getFaction());
|
||||||
Summons.Summon(summoned);
|
Summons.Summon(summoned);
|
||||||
|
|||||||
@@ -70,12 +70,6 @@ struct boss_netherspiteAI : public ScriptedAI
|
|||||||
BeamTarget[i] = 0;
|
BeamTarget[i] = 0;
|
||||||
BeamerGUID[i] = 0;
|
BeamerGUID[i] = 0;
|
||||||
}
|
}
|
||||||
// need core fix
|
|
||||||
for (int i=0; i<3; ++i)
|
|
||||||
{
|
|
||||||
if (SpellEntry *spell = (SpellEntry*)GetSpellStore()->LookupEntry(PlayerBuff[i]))
|
|
||||||
spell->AttributesEx |= SPELL_ATTR_EX_NEGATIVE;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ScriptedInstance* pInstance;
|
ScriptedInstance* pInstance;
|
||||||
|
|||||||
@@ -1284,12 +1284,12 @@ struct mob_acolyte_of_shadronAI : public ScriptedAI
|
|||||||
//if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT
|
//if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT
|
||||||
if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
|
if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
|
||||||
{
|
{
|
||||||
if(pTarget = ((Creature*)Unit::GetUnit((*me), pInstance->GetData64(DATA_SARTHARION))))
|
if(pTarget = (Unit::GetCreature((*me), pInstance->GetData64(DATA_SARTHARION))))
|
||||||
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, pTarget);
|
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, pTarget);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(pTarget = ((Creature*)Unit::GetUnit((*me), pInstance->GetData64(DATA_SHADRON))))
|
if(pTarget = (Unit::GetCreature((*me), pInstance->GetData64(DATA_SHADRON))))
|
||||||
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget);
|
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1303,7 +1303,7 @@ struct mob_acolyte_of_shadronAI : public ScriptedAI
|
|||||||
Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON));
|
Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON));
|
||||||
if(Shadron)
|
if(Shadron)
|
||||||
{
|
{
|
||||||
((mob_shadronAI*)Shadron->AI())->m_bHasPortalOpen = false;
|
(CAST_AI(mob_shadronAI,Shadron->AI()))->m_bHasPortalOpen = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Creature* pDebuffTarget = NULL;
|
Creature* pDebuffTarget = NULL;
|
||||||
@@ -1394,7 +1394,7 @@ struct mob_acolyte_of_vesperonAI : public ScriptedAI
|
|||||||
{
|
{
|
||||||
Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON));
|
Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON));
|
||||||
if (pVesperon)
|
if (pVesperon)
|
||||||
((mob_vesperonAI*)pVesperon->AI())->m_bHasPortalOpen = false;
|
(CAST_AI(mob_vesperonAI,pVesperon->AI()))->m_bHasPortalOpen = false;
|
||||||
|
|
||||||
if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP))
|
if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP))
|
||||||
pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP);
|
pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP);
|
||||||
|
|||||||
Reference in New Issue
Block a user