Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

src/server/game/Entities/Unit/Unit.cpp

@@ -2893,7 +2893,7 @@ void Unit::SetCurrentCastedSpell(Spell* pSpell)
                     InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
                 m_AutoRepeatFirstCast = true;
             }
-            if ((pSpell->m_spellInfo->CalcCastTime(this) > 0) && IsNonMeleeSpellCasted(false, false, true))
+            if (pSpell->m_spellInfo->CalcCastTime(this) > 0)
                 AddUnitState(UNIT_STATE_CASTING);
 
             break;

src/server/game/Server/Protocol/PacketLog.cpp

@@ -18,6 +18,7 @@
 #include "PacketLog.h"
 #include "Config.h"
 #include "ByteBuffer.h"
+#include "WorldPacket.h"
 
 PacketLog::PacketLog() : _file(NULL)
 {

src/server/scripts/Outland/netherstorm.cpp

@@ -777,10 +777,10 @@ public:
                 PlayerGUID = who->GetGUID();
         }
 
-        void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/)
-        {
-            DoCast(me, SPELL_DE_MATERIALIZE);
-        }
+        //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/)
+        //{
+        //    DoCast(me, SPELL_DE_MATERIALIZE);
+        //}
 
         void UpdateAI(const uint32 diff)
         {