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

Timestamp:

11/22/08 01:55:20 (17 years ago)

Author:

yumileroy

Message:

Merge with 284 (54b0e67d97fe).

Original author: megamage
Date: 2008-11-21 19:49:54-06:00

Files:

• trunk/src/game/PetHandler.cpp (modified) (1 diff)

trunk/src/game/PetHandler.cpp

@@ -98 +98 @@
                 case COMMAND_ATTACK:                        //spellid=1792  //ATTACK
                 {
+                    // Can't attack if owner is pacified
+                    if (_player->HasAuraType(SPELL_AURA_MOD_PACIFY))
+                    {
+                        //pet->SendPetCastFail(spellid, SPELL_FAILED_PACIFIED);
+                        //TODO: Send proper error message to client
+                        return;
+                    }
                     // only place where pet can be player
                     pet->clearUnitState(UNIT_STAT_FOLLOW);