diff options
| author | Brian <runningnak3d@gmail.com> | 2010-02-17 02:17:17 -0700 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-02-17 02:17:17 -0700 |
| commit | 8ba75526b5fb7f497384cfcd36edf7d6df77df94 (patch) | |
| tree | 3369bb1d940ff56fcb0716f3a75662e5e784b48d /src/game/Creature.cpp | |
| parent | d2acbbd616540df0dcbcab8ec8d4d63d116480ac (diff) | |
* Properly fix bogus pet trainers error message
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index cd9f8d8f009..3e834f4aca0 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -810,12 +810,12 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const { - if(!isTrainer() || GetCreatureInfo()->trainer_type == TRAINER_TYPE_PETS) + if(!isTrainer()) return false; TrainerSpellData const* trainer_spells = GetTrainerSpells(); - if(!trainer_spells || trainer_spells->spellList.empty()) + if((!trainer_spells || trainer_spells->spellList.empty()) && GetCreatureInfo()->trainer_type != TRAINER_TYPE_PETS) { sLog.outErrorDb("Creature %u (Entry: %u) have UNIT_NPC_FLAG_TRAINER but have empty trainer spell list.", GetGUIDLow(),GetEntry()); |