*Merge

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 7dc138dcff4..f6b326b17d9 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -3684,6 +3684,12 @@ uint8 Spell::CanCast(bool strict)
                     if(m_targets.getUnitTarget() && !m_caster->IsFriendlyTo(m_targets.getUnitTarget()) && !m_caster->HasInArc( M_PI, target ))
                         return SPELL_FAILED_UNIT_NOT_INFRONT;
                 }
+                else if (m_spellInfo->Id == 19938)          // Awaken Peon
+                {
+                    Unit *unit = m_targets.getUnitTarget();
+                    if(!unit || !unit->HasAura(17743, 0))
+                        return SPELL_FAILED_BAD_TARGETS;
+                }
                 break;
             }
             case SPELL_EFFECT_SCHOOL_DAMAGE: