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

Conflicts:
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Instances/InstanceScript.h

1 files changed, 20 insertions, 2 deletions

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index aad66a45d17..fd0530e171f 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3866,7 +3866,7 @@ void Spell::SendSpellStart()
         data << uint32(0);
     }
 
-    if (castFlags & CAST_FLAG_UNKNOWN_31)
+    if (castFlags & CAST_FLAG_HEAL_PREDICTION)
     {
         data << uint32(0);
         data << uint8(0); // unkByte
@@ -4183,7 +4183,25 @@ void Spell::SendChannelStart(uint32 duration)
     data.append(m_caster->GetPackGUID());
     data << uint32(m_spellInfo->Id);
     data << uint32(duration);
-
+    data << uint8(0);                           // immunity (castflag & 0x04000000)
+    /*
+    if (immunity)
+    {
+        data << uint32();                       // CastSchoolImmunities
+        data << uint32();                       // CastImmunities
+    }
+    */
+    data << uint8(0);                           // healPrediction (castflag & 0x40000000)
+    /*
+    if (healPrediction)
+    {
+        data.appendPackGUID(channelTarget);     // target packguid
+        data << uint32();                       // spellid
+        data << uint8(0);                       // unk3
+        if (unk3 == 2)
+            data.append();                      // unk packed guid (unused ?)
+    }
+    */
     m_caster->SendMessageToSet(&data, true);
 
     m_timer = duration;