From 78a02c8fd1f3d5a84e64787b9d46505541c6c3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefano=20Borz=C3=AC?= <stefanoborzi32@gmail.com>
Date: Sun, 23 Aug 2020 15:49:18 +0200
Subject: [PATCH] fix(quest): improve quest force of neltharaku (#3203)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update AuctionHouseHandler.cpp

* chore(quest): improve quest force of neltharaku

Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
---
 .../scripts/Outland/zone_shadowmoon_valley.cpp       | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 756c513f6..951b07059 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -459,7 +459,7 @@ public:
             if (!Tapped)
                 me->setFaction(FACTION_DEFAULT);
 
-            FlyTimer = 10000;
+            FlyTimer = 1000;
             me->SetDisableGravity(false);
             me->SetVisible(true);
         }
@@ -475,7 +475,6 @@ public:
                 PlayerGUID = caster->GetGUID();
 
                 me->setFaction(FACTION_FRIENDLY);
-                DoCast(caster, SPELL_FORCE_OF_NELTHARAKU, true);
 
                 Unit* Dragonmaw = me->FindNearestCreature(NPC_DRAGONMAW_SUBJUGATOR, 50);
                 if (Dragonmaw)
@@ -497,19 +496,12 @@ public:
 
             if (id == 1)
             {
-                if (PlayerGUID)
-                {
-                    Unit* player = ObjectAccessor::GetUnit(*me, PlayerGUID);
-                    if (player)
-                        DoCast(player, SPELL_FORCE_OF_NELTHARAKU, true);
-
-                    PlayerGUID = 0;
-                }
                 me->SetVisible(false);
                 me->SetDisableGravity(false);
                 Unit::DealDamage(me, me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 me->RemoveCorpse();
             }
+            me->DespawnOrUnsummon(1);
         }
 
         void UpdateAI(uint32 diff)