diff options
| author | megamage <none@none> | 2009-04-03 17:29:27 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-03 17:29:27 -0600 |
| commit | 837e15405df295701870381c48f26e810e8fe38f (patch) | |
| tree | 6b075c1080e870afc1cbd5fc4bb86430e25e09ff /src | |
| parent | ef3295d279e20d9f55eba50c2f59422dd0108b6f (diff) | |
*Fix a bug about pet talents.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Pet.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 9e75e13e7de..b33f948092b 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -150,9 +150,7 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool float px, py, pz; owner->GetClosePoint(px, py, pz, GetObjectSize(), PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); - Relocate(px, py, pz, owner->GetOrientation()); - if(!IsPositionValid()) { sLog.outError("Pet (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)", @@ -242,6 +240,8 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool map->Add((Creature*)this); owner->SetGuardian(this, true); + m_resetTalentsCost = fields[17].GetUInt32(); + m_resetTalentsTime = fields[18].GetUInt64(); learnLevelupSpells(); LearnPetPassives(); _LoadSpells(); @@ -293,9 +293,6 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool } } - m_resetTalentsCost = fields[17].GetUInt32(); - m_resetTalentsTime = fields[18].GetUInt64(); - delete result; //load spells/cooldowns/auras |