*Some update of summon effect code.

--HG--
branch : trunk

1 files changed, 1 insertions, 13 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 07a70f6bc17..01a41f7f51c 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4214,24 +4214,12 @@ SpellCastResult Spell::CheckCast(bool strict)
             // This is generic summon effect
             case SPELL_EFFECT_SUMMON:
             {
-                switch(m_spellInfo->EffectMiscValueB[i])
-                {
-                    case SUMMON_TYPE_DEMON:
-                    case SUMMON_TYPE_SUMMON:
-                    {
-                        if(m_caster->GetPetGUID())
-                            return SPELL_FAILED_ALREADY_HAVE_SUMMON;
-
-                        if(m_caster->GetCharmGUID())
-                            return SPELL_FAILED_ALREADY_HAVE_CHARM;
-                        break;
-                    }
-                }
                 SummonPropertiesEntry const *SummonProperties = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[i]);
                 if(!SummonProperties)
                     break;
                 switch(SummonProperties->Category)
                 {
+                    case SUMMON_CATEGORY_PET:
                     case SUMMON_CATEGORY_POSSESSED:
                     {
                         if(m_caster->GetPetGUID())