diff options
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/areatrigger_scripts.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 26 |
2 files changed, 18 insertions, 14 deletions
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 3ab9a1511af..2f8d5fa2ce4 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -210,7 +210,11 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f); break; case 5340: - pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f, 0.0f); + if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || + player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE) + pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f); + else + pPosition = WorldLocation(571, 3739.38f, 3567.09f, 341.58f); break; default: return false; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 023dd416483..0f2a984860d 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -157,7 +157,7 @@ public: SpawnAssociation* SpawnAssoc; uint64 SpawnedGUID; - void Reset() OVERRIDE {} + void Reset() OVERRIDE { } Creature* SummonGuard() { @@ -341,7 +341,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE { @@ -458,7 +458,7 @@ public: } } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { @@ -687,7 +687,7 @@ public: void UpdateAI(uint32 diff) OVERRIDE; - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE @@ -753,7 +753,7 @@ public: } } - void EnterCombat(Unit* /*who*/)OVERRIDE {} + void EnterCombat(Unit* /*who*/)OVERRIDE { } void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { @@ -936,7 +936,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { @@ -1494,8 +1494,8 @@ public: { npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) OVERRIDE { } void OnPossess(bool apply) { @@ -1542,9 +1542,9 @@ public: ExplosionTimer = 3000; } - void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } void UpdateAI(uint32 diff) OVERRIDE @@ -1673,7 +1673,7 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } }; CreatureAI* GetAI(Creature* creature) const OVERRIDE @@ -2387,7 +2387,7 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void DoAction(int32 /*param*/) OVERRIDE { |