aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorQAston <qaston@gmail.com>2012-02-05 00:13:56 -0800
committerQAston <qaston@gmail.com>2012-02-05 00:13:56 -0800
commit7be73a0667f29c857511e9989d10a15969d2f96a (patch)
treef373304970053f8379df9b1769e41bbca7fdd145 /src/server/scripts
parent3b10122c1324a48bacca06771df378b2c1ea953a (diff)
parent14bc551862d95d9827b1a17c0c16dcbc15691893 (diff)
Merge pull request #5075 from devilcoredev/fix_004
Core/AI: Fix pet and other types of minion pet attack on targets with Crowd Controls.
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/World/npcs_special.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index fcf5f56c539..04e9c05e02d 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1738,6 +1738,12 @@ public:
if (!UpdateVictim())
return;
+ if (me->getVictim()->HasBreakableByDamageCrowdControlAura())
+ {
+ me->InterruptNonMeleeSpells(false);
+ return;
+ }
+
if (SpellTimer <= diff)
{
if (IsViper) //Viper