From 6e7e5ebf7015558aed69866940e9f7ef9166815a Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Fri, 21 Aug 2009 05:08:27 +0200 Subject: Some optimization to salanar the horseman. Now player shouldn't stuck in realm of shadow --HG-- branch : trunk --- .../eastern_kingdoms/scarlet_enclave/chapter1.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'src/bindings/scripts') diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index 57c1ed8cd86..7564d6821ff 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -604,20 +604,13 @@ struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI { if (charmer->GetTypeId() == TYPEID_PLAYER) { - switch(me->GetEntry()) - { - // for quest Into the Realm of Shadows(12687) - case 28788: - if (CAST_PLR(charmer)->GetQuestStatus(12687) == QUEST_STATUS_INCOMPLETE) - { - if (CAST_PLR(charmer)->HasAura(REALM_OF_SHADOWS)) - charmer->RemoveAurasDueToSpell(REALM_OF_SHADOWS); - CAST_PLR(charmer)->GroupEventHappens(12687, me); - } - break; - default: - return; - } + // for quest Into the Realm of Shadows(12687) + if(me->GetEntry() == 28788 && CAST_PLR(charmer)->GetQuestStatus(12687) == QUEST_STATUS_INCOMPLETE) + CAST_PLR(charmer)->GroupEventHappens(12687, me); + + if (CAST_PLR(charmer)->HasAura(REALM_OF_SHADOWS)) + charmer->RemoveAurasDueToSpell(REALM_OF_SHADOWS); + CAST_PLR(charmer)->ExitVehicle(); CAST_CRE(who)->Respawn(true); } -- cgit v1.2.3