diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2016-07-12 10:39:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-12 10:39:42 +0200 |
| commit | 0d275e8e388d2bc80c04d24cd767eb87d9cd652e (patch) | |
| tree | 25666114559243b74d4bb50568fa942c10daad02 | |
| parent | b1e9ba9994beb26c5f7e507e9ded045f0da4702f (diff) | |
| parent | 9220456edb9d2c962b859d58ca8e6d7a1c4ff97e (diff) | |
Merge pull request #7 from lellonicole/gunship_mage
[Core/Script] Gunship battle, fix evade for battlemage & [Core/script] Quest, fix complete quest and remove morph on movementSpline complete
| -rw-r--r-- | src/server/game/Handlers/TaxiHandler.cpp | 7 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp index 9e74ec864c..4c8af81283 100644 --- a/src/server/game/Handlers/TaxiHandler.cpp +++ b/src/server/game/Handlers/TaxiHandler.cpp @@ -213,6 +213,13 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recvData) movementInfo.guid = guid; ReadMovementInfo(recvData, &movementInfo); + // Fix quest "As the crow flies" - Remove morph and complete quest + if(GetPlayer()->GetQuestStatus(9718) == QUEST_STATUS_INCOMPLETE) + { + GetPlayer()->CompleteQuest(9718); + GetPlayer()->RemoveAurasDueToSpell(38776); + } + recvData.read_skip<uint32>(); // spline id } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 9d7df5d9ea..ea56eb634d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1759,6 +1759,11 @@ class npc_gunship_mage : public CreatureScript switch (Index) { case SLOT_FREEZE_MAGE: + if (Player* player = me->SelectNearestPlayer(50.0f)) + { + me->SetInCombatWithZone(); + me->AddThreat(player, 1.0f); + } me->CastSpell((Unit*)NULL, SPELL_BELOW_ZERO, false); break; case SLOT_MAGE_1: |