Changeset 135 for trunk/src/game/PetHandler.cpp

Timestamp:

11/19/08 13:39:16 (17 years ago)

Author:

yumileroy

Message:

[svn] Merge from mangos.
Wed Oct 29 15:06:00 http://github.com/mangos/mangos/commit/034b8a34a9b621443e97d0ac4b667b603ba31ef1
Mon Oct 27 14:36:42 http://github.com/mangos/mangos/commit/fa072d15107b44344af8c9ef686839984e241a1b

Original author: megamage
Date: 2008-10-29 18:06:01-05:00

Files:

• trunk/src/game/PetHandler.cpp (modified) (2 diffs)

trunk/src/game/PetHandler.cpp

@@ -167 +167 @@
                 unit_target = NULL;
 
+            if (((Creature*)pet)->GetGlobalCooldown() > 0)
+                return;
+
             // do not cast unknown spells
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
@@ -602 +605 @@
     }
 
+    if (pet->GetGlobalCooldown() > 0)
+        return;
+
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
     if(!spellInfo)