From 5f33bfb9254f490efc2cc53285f686644b102928 Mon Sep 17 00:00:00 2001
From: w1sht0l1v3 <w1sht0l1v3@gmail.com>
Date: Sun, 9 Jun 2013 22:14:20 +0300
Subject: Core/Scripts: Fix Drake Hunt, closes #2005

---
 src/server/scripts/Northrend/zone_borean_tundra.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 6fb1079d94c..16965b83d25 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -820,7 +820,6 @@ public:
         void Reset()
         {
            WithRedDragonBlood = false;
-           HarpoonerGUID = 0;
         }
 
         void EnterCombat(Unit* who)
@@ -879,6 +878,12 @@ public:
                 }
             }
 
+            if ((me->getFaction() == 35) && (!me->HasAura(SPELL_SUBDUED)))
+            {
+                HarpoonerGUID = 0;
+                me->DisappearAndDie();
+            }
+
             if (!UpdateVictim())
                 return;
 
-- 
cgit v1.2.3