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
This commit is contained in:
Yehonal
2016-07-12 10:39:42 +02:00
committed by GitHub
2 changed files with 12 additions and 0 deletions

View File

@@ -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
}

View File

@@ -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: