Merge commit '61ba5e4f34211c2f0f286e70d8ace37714ca3c56' into 4.3.4
Conflicts: sql/updates/world/2015_02_23_00_world.sql src/server/game/Achievements/AchievementMgr.cpp src/server/game/Achievements/AchievementMgr.h
This commit is contained in:
commit
2bdcce17f8
11 files changed
+571
-57
No files matched your search
@@ -75,7 +75,7 @@ void WorldSession::HandlePetAction(WorldPacket& recvData)
|
||||
|
||||
// used also for charmed creature
|
||||
Unit* pet = ObjectAccessor::GetUnit(*_player, guid1);
|
||||
TC_LOG_INFO("network", "HandlePetAction: %s - flag: %u, spellid: %u, target: %s.", guid1.ToString().c_str(), uint32(flag), spellid, guid2.ToString().c_str());
|
||||
TC_LOG_DEBUG("network", "HandlePetAction: %s - flag: %u, spellid: %u, target: %s.", guid1.ToString().c_str(), uint32(flag), spellid, guid2.ToString().c_str());
|
||||
|
||||
if (!pet)
|
||||
{
|
||||
@@ -415,7 +415,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
|
||||
|
||||
void WorldSession::HandlePetNameQuery(WorldPacket& recvData)
|
||||
{
|
||||
TC_LOG_INFO("network", "HandlePetNameQuery. CMSG_PET_NAME_QUERY");
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PET_NAME_QUERY");
|
||||
|
||||
uint32 petnumber;
|
||||
ObjectGuid petguid;
|
||||
@@ -482,7 +482,7 @@ bool WorldSession::CheckStableMaster(ObjectGuid guid)
|
||||
|
||||
void WorldSession::HandlePetSetAction(WorldPacket& recvData)
|
||||
{
|
||||
TC_LOG_INFO("network", "HandlePetSetAction. CMSG_PET_SET_ACTION");
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PET_SET_ACTION");
|
||||
|
||||
ObjectGuid petguid;
|
||||
uint8 count;
|
||||
@@ -562,7 +562,7 @@ void WorldSession::HandlePetSetAction(WorldPacket& recvData)
|
||||
uint32 spell_id = UNIT_ACTION_BUTTON_ACTION(data[i]);
|
||||
uint8 act_state = UNIT_ACTION_BUTTON_TYPE(data[i]);
|
||||
|
||||
TC_LOG_INFO("network", "Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X",
|
||||
TC_LOG_DEBUG("network", "Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X",
|
||||
_player->GetName().c_str(), position[i], spell_id, uint32(act_state));
|
||||
|
||||
//if it's act for spell (en/disable/cast) and there is a spell given (0 = remove spell) which pet doesn't know, don't add
|
||||
@@ -599,7 +599,7 @@ void WorldSession::HandlePetSetAction(WorldPacket& recvData)
|
||||
|
||||
void WorldSession::HandlePetRename(WorldPacket& recvData)
|
||||
{
|
||||
TC_LOG_INFO("network", "HandlePetRename. CMSG_PET_RENAME");
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PET_RENAME");
|
||||
|
||||
ObjectGuid petguid;
|
||||
uint8 isdeclined;
|
||||
@@ -687,7 +687,7 @@ void WorldSession::HandlePetAbandon(WorldPacket& recvData)
|
||||
{
|
||||
ObjectGuid guid;
|
||||
recvData >> guid; //pet guid
|
||||
TC_LOG_INFO("network", "HandlePetAbandon. CMSG_PET_ABANDON %s", guid.ToString().c_str());
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PET_ABANDON %s", guid.ToString().c_str());
|
||||
|
||||
if (!_player->IsInWorld())
|
||||
return;
|
||||
@@ -705,7 +705,7 @@ void WorldSession::HandlePetAbandon(WorldPacket& recvData)
|
||||
|
||||
void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket)
|
||||
{
|
||||
TC_LOG_INFO("network", "CMSG_PET_SPELL_AUTOCAST");
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PET_SPELL_AUTOCAST");
|
||||
ObjectGuid guid;
|
||||
uint32 spellid;
|
||||
uint8 state; //1 for on, 0 for off
|
||||
@@ -753,7 +753,7 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket)
|
||||
|
||||
void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket)
|
||||
{
|
||||
TC_LOG_DEBUG("network", "WORLD: CMSG_PET_CAST_SPELL");
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PET_CAST_SPELL");
|
||||
|
||||
ObjectGuid guid;
|
||||
uint8 castCount;
|
||||
@@ -852,7 +852,7 @@ void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Dec
|
||||
|
||||
void WorldSession::HandlePetLearnTalent(WorldPacket& recvData)
|
||||
{
|
||||
TC_LOG_DEBUG("network", "WORLD: CMSG_PET_LEARN_TALENT");
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PET_LEARN_TALENT");
|
||||
|
||||
ObjectGuid guid;
|
||||
uint32 talentId, requestedRank;
|
||||
@@ -864,7 +864,7 @@ void WorldSession::HandlePetLearnTalent(WorldPacket& recvData)
|
||||
|
||||
void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket& recvData)
|
||||
{
|
||||
TC_LOG_DEBUG("network", "CMSG_LEARN_PREVIEW_TALENTS_PET");
|
||||
TC_LOG_DEBUG("network", "WORLD: Received CMSG_LEARN_PREVIEW_TALENTS_PET");
|
||||
|
||||
ObjectGuid guid;
|
||||
recvData >> guid;
|
||||
|
||||
Reference in new issue
Block a user