summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Handlers/TaxiHandler.cpp7
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp5
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: