Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

src/server/scripts/CMakeLists.txt

@@ -151,6 +151,8 @@ include_directories(
   ${VALGRIND_INCLUDE_DIR}
 )
 
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
 add_library(scripts STATIC
   ${scripts_STAT_SRCS}
   ${scripts_STAT_PCH_SRC}

src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp

@@ -34,6 +34,7 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "PassiveAI.h"
+#include "CellImpl.h"
 
 /*######
 ## npc_webbed_creature