diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
| commit | c51380690ffeb82c1c75d3981c424612c0f2bc9f (patch) | |
| tree | 9b2b90379ceac9d6c0bdb97a744d10a49959a445 /src/server/game/Handlers/PetHandler.cpp | |
| parent | ccf593c6738ad1073381f1c2d404664e8d4ea187 (diff) | |
| parent | 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Server/WorldSession.h
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 978797911f4..2d3af13597a 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -143,7 +143,7 @@ void WorldSession::HandlePetStopAttack(WorldPacket &recvData) pet->AttackStop(); } -void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid, uint16 flag, uint64 guid2, float x, float y, float z) +void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid, uint16 flag, uint64 guid2, float x, float y, float z) { CharmInfo* charmInfo = pet->GetCharmInfo(); if (!charmInfo) |