Warning fixes + compile fix after the merge

src/server/game/Entities/Object/Object.cpp

@@ -814,6 +814,8 @@ void Object::GetUpdateFieldData(Player const* target, uint32*& flags, bool& isOw
             flags = CorpseUpdateFieldFlags;
             isOwner = ToCorpse()->GetOwnerGUID() == target->GetGUID();
             break;
+        case TYPEID_OBJECT:
+            break;
     }
 }
 

src/server/game/Spells/Spell.cpp

@@ -2576,6 +2576,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
     for (uint32 effectNumber = 0; effectNumber < MAX_SPELL_EFFECTS; ++effectNumber)
     {
         if (effectMask & (1 << effectNumber))
+        {
             if (unit->IsImmunedToSpellEffect(m_spellInfo, effectNumber))
                 effectMask &= ~(1 << effectNumber);
             else if (m_spellInfo->Effects[effectNumber].IsAura() && !m_spellInfo->IsPositiveEffect(effectNumber))
@@ -2591,6 +2592,8 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
                     }
             }
         }
+    }
+
     if (!effectMask)
         return returnVal;
 

src/server/game/Spells/SpellScript.cpp

@@ -247,10 +247,14 @@ bool SpellScript::TargetHook::CheckEffect(SpellInfo const* spellEntry, uint8 eff
                             return !area;
                         case TARGET_REFERENCE_TYPE_TARGET: // BOTH
                             return true;
+                        default:
+                            break;
                     }
                     break;
             }
             break;
+        default:
+            break;
     }
 
     return false;

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp

@@ -27,6 +27,7 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulaman.h"
 #include "GridNotifiers.h"
+#include "CellImpl.h"
 
 enum eEnums
 {

src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp

@@ -27,6 +27,7 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulaman.h"
 #include "GridNotifiers.h"
+#include "CellImpl.h"
 
 //Trash Waves
 float NalorakkWay[8][3] =

src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp

@@ -1336,6 +1336,7 @@ class npc_dark_nucleus : public CreatureScript
                 {
                     _targetAuraCheck = 1000;
                     if (Unit* victim = me->getVictim())
+                    {
                         if (me->GetDistance(victim) < 15.0f &&
                             !victim->HasAura(SPELL_SHADOW_RESONANCE_RESIST, me->GetGUID()))
                         {
@@ -1345,6 +1346,7 @@ class npc_dark_nucleus : public CreatureScript
                         else
                             MoveInLineOfSight(me->getVictim());
                     }
+                }
                 else
                     _targetAuraCheck -= diff;
             }

src/server/scripts/Spells/spell_holiday.cpp

@@ -25,6 +25,7 @@
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
 #include "GridNotifiers.h"
+#include "CellImpl.h"
 
 // 45102 Romantic Picnic
 enum SpellsPicnic