Merge branch 'master' into Playerbot

src/server/game/Entities/Creature/Creature.cpp

@@ -2193,6 +2193,11 @@ bool Creature::IsImmunedToSpell(SpellInfo const* spellInfo, Spell const* spell)
     if (!spellInfo)
         return false;
 
+    if (spellInfo->HasAttribute(SPELL_ATTR0_CU_BYPASS_MECHANIC_IMMUNITY))
+    {
+        return false;
+    }
+
     // Xinef: this should exclude self casts...
     // Spells that don't have effectMechanics.
     if (spellInfo->Mechanic > MECHANIC_NONE && HasMechanicTemplateImmunity(1 << (spellInfo->Mechanic - 1)))

src/server/game/Globals/ObjectMgr.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "ObjectMgr.h"
-#include "AccountMgr.h"
 #include "AchievementMgr.h"
 #include "ArenaTeamMgr.h"
 #include "CharacterCache.h"

src/server/game/Grids/Notifiers/GridNotifiers.cpp

@@ -18,7 +18,6 @@
 #include "GridNotifiers.h"
 #include "Map.h"
 #include "ObjectAccessor.h"
-#include "SpellInfo.h"
 #include "SpellMgr.h"
 #include "Transport.h"
 #include "UpdateData.h"

src/server/game/Maps/MapInstanced.cpp

@@ -19,7 +19,6 @@
 #include "Battleground.h"
 #include "Group.h"
 #include "InstanceSaveMgr.h"
-#include "MMapFactory.h"
 #include "MapMgr.h"
 #include "ObjectMgr.h"
 #include "Player.h"

src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp

@@ -22,7 +22,6 @@
 #include "MoveSpline.h"
 #include "MoveSplineInit.h"
 #include "Player.h"
-#include "World.h"
 
 template<class T>
 void EscortMovementGenerator<T>::DoInitialize(T* unit)

src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp

@@ -20,7 +20,6 @@
 #include "CreatureAI.h"
 #include "DisableMgr.h"
 #include "MoveSplineInit.h"
-#include "WorldPacket.h"
 
 void HomeMovementGenerator<Creature>::DoInitialize(Creature* owner)
 {

src/server/game/Spells/Auras/SpellAuraEffects.cpp

@@ -22,7 +22,6 @@
 #include "Common.h"
 #include "GameTime.h"
 #include "GridNotifiers.h"
-#include "InstanceScript.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"

src/server/game/Spells/SpellInfo.h

@@ -204,6 +204,7 @@ enum SpellCustomAttributes
     SPELL_ATTR0_CU_FORCE_SEND_CATEGORY_COOLDOWNS = 0x10000000,
     SPELL_ATTR0_CU_FORCE_AURA_SAVING             = 0x20000800,
     SPELL_ATTR0_CU_ENCOUNTER_REWARD              = 0x40000000, // pussywizard
+    SPELL_ATTR0_CU_BYPASS_MECHANIC_IMMUNITY      = 0x80000000,
 
     SPELL_ATTR0_CU_NEGATIVE                      = SPELL_ATTR0_CU_NEGATIVE_EFF0 | SPELL_ATTR0_CU_NEGATIVE_EFF1 | SPELL_ATTR0_CU_NEGATIVE_EFF2,
     SPELL_ATTR0_CU_POSITIVE                      = SPELL_ATTR0_CU_POSITIVE_EFF0 | SPELL_ATTR0_CU_POSITIVE_EFF1 | SPELL_ATTR0_CU_POSITIVE_EFF2,

src/server/game/Tools/CharacterDatabaseCleaner.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "CharacterDatabaseCleaner.h"
-#include "Common.h"
 #include "DBCStores.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"