Backout 8f186e3cc3 (Remove unnecesary checks)
--HG-- branch : trunk
This commit is contained in:
@@ -475,7 +475,6 @@ struct TRINITY_DLL_DECL npc_orinoko_tuskbreakerAI : public ScriptedAI
|
|||||||
|
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -548,7 +547,6 @@ struct TRINITY_DLL_DECL npc_orinoko_tuskbreakerAI : public ScriptedAI
|
|||||||
|
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -596,7 +594,6 @@ struct TRINITY_DLL_DECL npc_korrak_bloodragerAI : public npc_escortAI
|
|||||||
{
|
{
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -653,7 +650,6 @@ struct TRINITY_DLL_DECL npc_korrak_bloodragerAI : public npc_escortAI
|
|||||||
|
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -691,7 +687,6 @@ struct TRINITY_DLL_DECL npc_yggdrasAI : public ScriptedAI
|
|||||||
{
|
{
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -733,7 +728,6 @@ struct TRINITY_DLL_DECL npc_yggdrasAI : public ScriptedAI
|
|||||||
|
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -785,7 +779,6 @@ struct TRINITY_DLL_DECL npc_stinkbeardAI : public npc_escortAI
|
|||||||
{
|
{
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -846,7 +839,6 @@ struct TRINITY_DLL_DECL npc_stinkbeardAI : public npc_escortAI
|
|||||||
{
|
{
|
||||||
if (m_creature->isSummon())
|
if (m_creature->isSummon())
|
||||||
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner())
|
||||||
if (pSummoner)
|
|
||||||
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false;
|
||||||
|
|
||||||
if (pKiller->GetTypeId() == TYPEID_PLAYER)
|
if (pKiller->GetTypeId() == TYPEID_PLAYER)
|
||||||
|
|||||||
Reference in New Issue
Block a user