aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorGiuseppe Montesanto <montesanto.giuseppe@live.it>2012-02-04 14:59:17 +0100
committerGiuseppe Montesanto <montesanto.giuseppe@live.it>2012-02-04 14:59:17 +0100
commit14bc551862d95d9827b1a17c0c16dcbc15691893 (patch)
tree359c3d630caf606af52f8fc48f984aaec3bda032 /src/server/scripts
parent1ca8c63e4c25b09cd3aae5600bc34299582d8247 (diff)
Fix pet/guardian 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