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

Prevent crash in ShadowfiendAI.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
_manuel_
2010-01-02 02:22:47 -03:00
parent 64aa9b3a6f
commit ac340450e7
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/world/npcs_special.cpp
+11 -10
View File
@@ -1502,7 +1502,7 @@ struct TRINITY_DLL_DECL npc_brewfest_revelerAI : public ScriptedAI
{
if (!IsHolidayActive(HOLIDAY_BREWFEST))
return;
if (emote == TEXTEMOTE_DANCE)
m_creature->CastSpell(pPlayer, 41586, false);
}
@@ -1963,16 +1963,17 @@ CreatureAI* GetAI_npc_training_dummy(Creature* pCreature)
struct TRINITY_DLL_DECL npc_shadowfiendAI : public ScriptedAI
{
npc_shadowfiendAI(Creature *c) : ScriptedAI(c) {}
npc_shadowfiendAI(Creature* pCreature) : ScriptedAI(pCreature) {}
void DamageTaken(Unit *killer, uint32 &damage)
void DamageTaken(Unit* pKiller, uint32 &damage)
{
if (Unit * Owner = CAST_SUM(m_creature)->GetSummoner())
{
if (Owner->HasAura(GLYPH_OF_SHADOWFIEND))
if (damage >= m_creature->GetHealth())
Owner->CastSpell(Owner,GLYPH_OF_SHADOWFIEND_MANA,true);
}
if (m_creature->isSummon())
if (Unit* pOwner = CAST_SUM(m_creature)->GetSummoner())
{
if (pOwner->HasAura(GLYPH_OF_SHADOWFIEND))
if (damage >= m_creature->GetHealth())
pOwner->CastSpell(pOwner,GLYPH_OF_SHADOWFIEND_MANA,true);
}
}
void UpdateAI(const uint32 diff)
@@ -1994,7 +1995,7 @@ void AddSC_npcs_special()
newscript->Name = "npc_air_force_bots";
newscript->GetAI = &GetAI_npc_air_force_bots;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "npc_lunaclaw_spirit";
newscript->pGossipHello = &GossipHello_npc_lunaclaw_spirit;