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

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-08-23 01:51:47 +02:00
parent 85b0e50b1e 5af6d18b89
commit 0a45059351
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+7 -4
View File
@@ -567,8 +567,10 @@ CreatureAI* GetAI_npc_dark_rider_of_acherus(Creature* pCreature)
enum enum
{ {
REALM_OF_SHADOWS = 52693, REALM_OF_SHADOWS = 52693,
EFFECT_STOLEN_HORSE = 52263,
DELIVER_STOLEN_HORSE = 52264, DELIVER_STOLEN_HORSE = 52264,
CALL_DARK_RIDER = 52266 CALL_DARK_RIDER = 52266,
SPELL_EFFECT_OVERTAKE = 52349
}; };
struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI
@@ -583,7 +585,7 @@ struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI
{ {
if (Unit *charmer = caster->GetCharmer()) if (Unit *charmer = caster->GetCharmer())
{ {
charmer->ExitVehicle(); charmer->RemoveAurasDueToSpell(EFFECT_STOLEN_HORSE);
caster->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK); caster->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
caster->setFaction(35); caster->setFaction(35);
DoCast(caster, CALL_DARK_RIDER, true); DoCast(caster, CALL_DARK_RIDER, true);
@@ -608,8 +610,9 @@ struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI
if(me->GetEntry() == 28788 && CAST_PLR(charmer)->GetQuestStatus(12687) == QUEST_STATUS_INCOMPLETE) if(me->GetEntry() == 28788 && CAST_PLR(charmer)->GetQuestStatus(12687) == QUEST_STATUS_INCOMPLETE)
{ {
CAST_PLR(charmer)->GroupEventHappens(12687, me); CAST_PLR(charmer)->GroupEventHappens(12687, me);
CAST_PLR(charmer)->ExitVehicle(); charmer->RemoveAurasDueToSpell(SPELL_EFFECT_OVERTAKE);
CAST_CRE(who)->Respawn(true); CAST_CRE(who)->ForcedDespawn();
//CAST_CRE(who)->Respawn(true);
} }
if (CAST_PLR(charmer)->HasAura(REALM_OF_SHADOWS)) if (CAST_PLR(charmer)->HasAura(REALM_OF_SHADOWS))