diff options
| author | Spp <spp@jorge.gr> | 2012-11-08 11:25:38 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-08 11:25:38 +0100 |
| commit | 35d63a97990528d5496598cc5893be141649f308 (patch) | |
| tree | e175744f31bf962527bd6e005557f6000a90a9dd /src/server/game/Handlers/PetHandler.cpp | |
| parent | 9659f0335f3dad4cf84dca70fa436cb4b214ba39 (diff) | |
| parent | fcc524d5985b9a7f5b30dd600aa99a184654a0bb (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
sql/base/characters_database.sql
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 598205fbceb..978797911f4 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -732,7 +732,7 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket) SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellid); // do not add not learned spells/ passive spells - if (!pet->HasSpell(spellid) || spellInfo->IsAutocastable()) + if (!pet->HasSpell(spellid) || !spellInfo->IsAutocastable()) return; CharmInfo* charmInfo = pet->GetCharmInfo(); |