Core/Spells: Implemented SPELL_ATTR5_NOT_AVAILABLE_WHILE_CHARMED

Port From (https://github.com/TrinityCore/TrinityCore/commit/076c63c766d10697cea17da8bd5194862a682cbe)
2022-06-01 15:40:38 -04:00
parent 68d8f664d7
commit 812d98f5b5
4 changed files with 15 additions and 3 deletions
@@ -4703,6 +4703,9 @@ namespace Game.Spells
            Unit unitCaster = m_caster.ToUnit();
            if (unitCaster != null)
            {
+                if (m_spellInfo.HasAttribute(SpellAttr5.NotAvailableWhileCharmed) && unitCaster.IsCharmed())
+                    return SpellCastResult.Charmed;
+
                // only check at first call, Stealth auras are already removed at second call
                // for now, ignore triggered spells
                if (strict && !_triggeredCastFlags.HasFlag(TriggerCastFlags.IgnoreShapeshift))
@@ -5659,7 +5662,7 @@ namespace Game.Spells
                            return SpellCastResult.NoPet;

                        if (!pet.GetCharmerGUID().IsEmpty())
-                            return SpellCastResult.Charmed;
+                            return SpellCastResult.AlreadyHaveCharm;
                        break;
                    }
                    case AuraType.ModPossess:
@@ -5671,7 +5674,7 @@ namespace Game.Spells
                            return SpellCastResult.BadTargets;

                        if (!unitCaster1.GetCharmerGUID().IsEmpty())
-                            return SpellCastResult.Charmed;
+                            return SpellCastResult.AlreadyHaveCharm;

                        if (spellEffectInfo.ApplyAuraName == AuraType.ModCharm || spellEffectInfo.ApplyAuraName == AuraType.ModPossess)
                        {