From 96fa91034f06a8a6a22c00639f71a5a6f9787020 Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Wed, 4 Aug 2010 20:34:08 +0200
Subject: Missing part of r7dd45a0182 :(

--HG--
branch : trunk
---
 src/server/game/Spells/Spell.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/server/game/Spells/Spell.cpp')

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 695f0c93333..00104e42fed 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -199,15 +199,21 @@ bool SpellCastTargets::read (WorldPacket * data, Unit *caster)
     if (m_targetMask == TARGET_FLAG_SELF)
         return true;
 
-    if(m_targetMask & ( TARGET_FLAG_OBJECT))
+    if (m_targetMask & (TARGET_FLAG_UNIT | TARGET_FLAG_UNK17))
+    {
+        if (!data->readPackGUID(m_unitTargetGUID))
+            return false;
+    }
+
+    if(m_targetMask & (TARGET_FLAG_OBJECT))
     {
         if (!data->readPackGUID(m_GOTargetGUID))
             return false;
     }
 
-    if(m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM))
+    if(m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM))
     {
-        if(caster->GetTypeId() == TYPEID_PLAYER)
+        if (caster->GetTypeId() != TYPEID_PLAYER)
             return false;
         if (!data->readPackGUID(m_itemTargetGUID))
             return false;
-- 
cgit v1.2.3