From 3b004b2cfda73aec1b94bd13dca8d838f6616865 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sun, 18 Aug 2019 11:16:43 +0200
Subject: Nopch fix2

---
 src/server/game/Entities/GameObject/GameObjectData.h    |  1 +
 .../ShadowfangKeep/boss_apothecary_hummel.cpp           | 17 ++++++++++-------
 .../EasternKingdoms/ShadowfangKeep/shadowfang_keep.h    |  6 +++---
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/Entities/GameObject/GameObjectData.h b/src/server/game/Entities/GameObject/GameObjectData.h
index 0bc3dc7e454..6ab5c7360e1 100644
--- a/src/server/game/Entities/GameObject/GameObjectData.h
+++ b/src/server/game/Entities/GameObject/GameObjectData.h
@@ -22,6 +22,7 @@
 #include "DBCEnums.h"
 #include "QuaternionData.h"
 #include "SharedDefines.h"
+#include "WorldPacket.h"
 #include <string>
 #include <vector>
 
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index 53fa4f340c0..bb8b4bcf104 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -15,16 +15,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
+#include "shadowfang_keep.h"
+#include "GridNotifiersImpl.h"
+#include "Group.h"
+#include "InstanceScript.h"
 #include "LFGMgr.h"
+#include "Map.h"
+#include "MotionMaster.h"
 #include "Player.h"
-#include "Group.h"
-#include "SpellScript.h"
+#include "ScriptedCreature.h"
+#include "ScriptedGossip.h"
+#include "ScriptMgr.h"
 #include "SpellAuraEffects.h"
-#include "shadowfang_keep.h"
-#include "GridNotifiersImpl.h"
+#include "SpellScript.h"
 
 enum ApothecarySpells
 {
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index 37d2905a8fb..8ca22a4da5e 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -34,10 +34,10 @@ enum SKDataTypes
     DATA_APOTHECARY_HUMMEL      = 6
 };
 
-template<typename AI>
-inline AI* GetShadowfangKeepAI(Creature* creature)
+template<typename AI, typename T>
+inline AI* GetShadowfangKeepAI(T* obj)
 {
-    return GetInstanceAI<AI>(creature, SFKScriptName);
+    return GetInstanceAI<AI>(obj, SFKScriptName);
 }
 
 #endif
-- 
cgit v1.2.3