aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/Pet.cpp7
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