diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-09-09 16:35:22 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-09-09 16:35:22 -0500 |
| commit | 271e9cb9e628177d37d45effbd39e7a31f8c9910 (patch) | |
| tree | 6bf94b3576f23850970973cbd10741e09afacfd2 /src/server/game/Handlers/PetHandler.cpp | |
| parent | ca7bab19e0b05952be494ee1efd7b0ab9aebfa1b (diff) | |
Core/Entities: Fixed the "Move To" command for pets.
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 85d4ce83990..db077011ee0 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -102,7 +102,7 @@ void WorldSession::HandlePetAction(WorldPacket & recvData) return; if (GetPlayer()->m_Controlled.size() == 1) - HandlePetActionHelper(pet, guid1, spellid, flag, guid2); + HandlePetActionHelper(pet, guid1, spellid, flag, guid2, x, y, z); else { //If a pet is dismissed, m_Controlled will change @@ -111,7 +111,7 @@ void WorldSession::HandlePetAction(WorldPacket & recvData) if ((*itr)->GetEntry() == pet->GetEntry() && (*itr)->isAlive()) controlled.push_back(*itr); for (std::vector<Unit*>::iterator itr = controlled.begin(); itr != controlled.end(); ++itr) - HandlePetActionHelper(*itr, guid1, spellid, flag, guid2); + HandlePetActionHelper(*itr, guid1, spellid, flag, guid2, x, y, z); } } @@ -142,7 +142,7 @@ void WorldSession::HandlePetStopAttack(WorldPacket &recvData) pet->AttackStop(); } -void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid, uint16 flag, uint64 guid2) +void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid, uint16 flag, uint64 guid2, float x, float y, float z) { CharmInfo* charmInfo = pet->GetCharmInfo(); if (!charmInfo) @@ -267,6 +267,18 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid } } break; + case COMMAND_MOVE_TO: + pet->StopMoving(); + pet->GetMotionMaster()->Clear(false); + pet->GetMotionMaster()->MovePoint(0, x, y, z); + charmInfo->SetCommandState(COMMAND_MOVE_TO); + + charmInfo->SetIsCommandAttack(false); + charmInfo->SetIsAtStay(true); + charmInfo->SetIsFollowing(false); + charmInfo->SetIsReturning(false); + charmInfo->SaveStayPosition(); + break; default: sLog->outError(LOG_FILTER_NETWORKIO, "WORLD: unknown PET flag Action %i and spellid %i.", uint32(flag), spellid); } |