josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Opcodes: sync with wpp

Browse Source
This commit is contained in:
joschiwald
2015-01-17 03:55:29 +01:00
parent b21c346658
commit 36e50ff8ae
26 changed files with 1017 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+3 -4
View File
@@ -9627,11 +9627,10 @@ void Player::SetBindPoint(ObjectGuid guid)
GetSession()->SendPacket(&data);
}
void Player::SendTalentWipeConfirm(ObjectGuid guid)
void Player::SendRespecWipeConfirm(ObjectGuid const& guid, uint32 cost)
{
WorldPacket data(MSG_TALENT_WIPE_CONFIRM, 8 + 4);
WorldPacket data(SMSG_RESPEC_WIPE_CONFIRM, 8 + 4);
data << guid;
uint32 cost = sWorld->getBoolConfig(CONFIG_NO_RESET_TALENT_COST) ? 0 : GetNextResetTalentsCost();
data << cost;
GetSession()->SendPacket(&data);
}
@@ -14022,7 +14021,7 @@ void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 men
break;
case GOSSIP_OPTION_UNLEARNTALENTS:
PlayerTalkClass->SendCloseGossip();
SendTalentWipeConfirm(guid);
SendRespecWipeConfirm(guid, sWorld->getBoolConfig(CONFIG_NO_RESET_TALENT_COST) ? 0 : GetNextResetTalentsCost());
break;
case GOSSIP_OPTION_UNLEARNPETTALENTS:
PlayerTalkClass->SendCloseGossip();
src/server/game/Entities/Player/Player.h
+1 -1
View File
@@ -1737,7 +1737,7 @@ class Player : public Unit, public GridObject<Player>
bool m_mailsUpdated;
void SetBindPoint(ObjectGuid guid);
void SendTalentWipeConfirm(ObjectGuid guid);
void SendRespecWipeConfirm(ObjectGuid const& guid, uint32 cost);
void ResetPetTalents();
void CalcRage(uint32 damage, bool attacker);
void RegenerateAll();
src/server/game/Entities/Unit/Unit.cpp
+28 -28
View File
@@ -1378,7 +1378,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
victim->DealDamageMods(this, damage, NULL);
/// @todo Move this to a packet handler
WorldPacket data(SMSG_SPELLDAMAGESHIELD, 8 + 8 + 4 + 4 + 4 + 4 + 4);
WorldPacket data(SMSG_SPELL_DAMAGE_SHIELD, 8 + 8 + 4 + 4 + 4 + 4 + 4);
data << victim->GetGUID();
data << GetGUID();
data << uint32(i_spellProto->Id);
@@ -8036,7 +8036,7 @@ void Unit::UnsummonAllTotems()
void Unit::SendHealSpellLog(Unit* victim, uint32 SpellID, uint32 Damage, uint32 OverHeal, uint32 Absorb, bool critical)
{
// we guess size
WorldPacket data(SMSG_SPELLHEALLOG, 8 + 8 + 4 + 4 + 4 + 4 + 1 + 1);
WorldPacket data(SMSG_SPELL_HEAL_LOG, 8 + 8 + 4 + 4 + 4 + 4 + 1 + 1);
data << victim->GetPackGUID();
data << GetPackGUID();
data << uint32(SpellID);
@@ -8061,7 +8061,7 @@ int32 Unit::HealBySpell(Unit* victim, SpellInfo const* spellInfo, uint32 addHeal
void Unit::SendEnergizeSpellLog(Unit* victim, uint32 spellId, int32 damage, Powers powerType)
{
WorldPacket data(SMSG_SPELLENERGIZELOG, (8+8+4+4+4+1));
WorldPacket data(SMSG_SPELL_ENERGIZE_LOG, (8+8+4+4+4+1));
data << victim->GetPackGUID();
data << GetPackGUID();
data << uint32(spellId);
@@ -10374,15 +10374,15 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
// Spline packets are for creatures and move_update are for players
static OpcodeServer const moveTypeToOpcode[MAX_MOVE_TYPE][3] =
{
{SMSG_SPLINE_MOVE_SET_WALK_SPEED, SMSG_MOVE_SET_WALK_SPEED, SMSG_MOVE_UPDATE_WALK_SPEED },
{SMSG_SPLINE_MOVE_SET_RUN_SPEED, SMSG_MOVE_SET_RUN_SPEED, SMSG_MOVE_UPDATE_RUN_SPEED },
{SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED, SMSG_MOVE_SET_RUN_BACK_SPEED, SMSG_MOVE_UPDATE_RUN_BACK_SPEED },
{SMSG_SPLINE_MOVE_SET_SWIM_SPEED, SMSG_MOVE_SET_SWIM_SPEED, SMSG_MOVE_UPDATE_SWIM_SPEED },
{SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED, SMSG_MOVE_SET_SWIM_BACK_SPEED, SMSG_MOVE_UPDATE_SWIM_BACK_SPEED },
{SMSG_SPLINE_MOVE_SET_TURN_RATE, SMSG_MOVE_SET_TURN_RATE, SMSG_MOVE_UPDATE_TURN_RATE },
{SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED, SMSG_MOVE_SET_FLIGHT_SPEED, SMSG_MOVE_UPDATE_FLIGHT_SPEED },
{SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED, SMSG_MOVE_SET_FLIGHT_BACK_SPEED, SMSG_MOVE_UPDATE_FLIGHT_BACK_SPEED},
{SMSG_SPLINE_MOVE_SET_PITCH_RATE, SMSG_MOVE_SET_PITCH_RATE, SMSG_MOVE_UPDATE_PITCH_RATE },
{SMSG_MOVE_SPLINE_SET_WALK_SPEED, SMSG_MOVE_SET_WALK_SPEED, SMSG_MOVE_UPDATE_WALK_SPEED },
{SMSG_MOVE_SPLINE_SET_RUN_SPEED, SMSG_MOVE_SET_RUN_SPEED, SMSG_MOVE_UPDATE_RUN_SPEED },
{SMSG_MOVE_SPLINE_SET_RUN_BACK_SPEED, SMSG_MOVE_SET_RUN_BACK_SPEED, SMSG_MOVE_UPDATE_RUN_BACK_SPEED },
{SMSG_MOVE_SPLINE_SET_SWIM_SPEED, SMSG_MOVE_SET_SWIM_SPEED, SMSG_MOVE_UPDATE_SWIM_SPEED },
{SMSG_MOVE_SPLINE_SET_SWIM_BACK_SPEED, SMSG_MOVE_SET_SWIM_BACK_SPEED, SMSG_MOVE_UPDATE_SWIM_BACK_SPEED },
{SMSG_MOVE_SPLINE_SET_TURN_RATE, SMSG_MOVE_SET_TURN_RATE, SMSG_MOVE_UPDATE_TURN_RATE },
{SMSG_MOVE_SPLINE_SET_FLIGHT_SPEED, SMSG_MOVE_SET_FLIGHT_SPEED, SMSG_MOVE_UPDATE_FLIGHT_SPEED },
{SMSG_MOVE_SPLINE_SET_FLIGHT_BACK_SPEED, SMSG_MOVE_SET_FLIGHT_BACK_SPEED, SMSG_MOVE_UPDATE_FLIGHT_BACK_SPEED},
{SMSG_MOVE_SPLINE_SET_PITCH_RATE, SMSG_MOVE_SET_PITCH_RATE, SMSG_MOVE_UPDATE_PITCH_RATE },
};
if (GetTypeId() == TYPEID_PLAYER)
@@ -13753,9 +13753,9 @@ void Unit::SetRooted(bool apply, bool packetOnly /*= false*/)
}
if (apply)
Movement::PacketSender(this, SMSG_SPLINE_MOVE_ROOT, SMSG_MOVE_ROOT, SMSG_MOVE_ROOT).Send();
Movement::PacketSender(this, SMSG_MOVE_SPLINE_ROOT, SMSG_MOVE_ROOT, SMSG_MOVE_ROOT).Send();
else
Movement::PacketSender(this, SMSG_SPLINE_MOVE_UNROOT, SMSG_MOVE_UNROOT, SMSG_MOVE_UNROOT).Send();
Movement::PacketSender(this, SMSG_MOVE_SPLINE_UNROOT, SMSG_MOVE_UNROOT, SMSG_MOVE_UNROOT).Send();
}
void Unit::SetFeared(bool apply)
@@ -15855,9 +15855,9 @@ bool Unit::SetWalk(bool enable)
///@ TODO: Find proper opcode for walk mode setting in player mind controlling a player case
if (enable)
Movement::PacketSender(this, SMSG_SPLINE_MOVE_SET_WALK_MODE, SMSG_SPLINE_MOVE_SET_WALK_MODE).Send();
Movement::PacketSender(this, SMSG_MOVE_SPLINE_SET_WALK_MODE, SMSG_MOVE_SPLINE_SET_WALK_MODE).Send();
else
Movement::PacketSender(this, SMSG_SPLINE_MOVE_SET_RUN_MODE, SMSG_SPLINE_MOVE_SET_RUN_MODE).Send();
Movement::PacketSender(this, SMSG_MOVE_SPLINE_SET_RUN_MODE, SMSG_MOVE_SPLINE_SET_RUN_MODE).Send();
return true;
}
@@ -15885,8 +15885,8 @@ bool Unit::SetDisableGravity(bool disable, bool packetOnly /*= false*/)
static OpcodeServer const gravityOpcodeTable[2][2] =
{
{SMSG_SPLINE_MOVE_GRAVITY_ENABLE, SMSG_MOVE_GRAVITY_ENABLE },
{SMSG_SPLINE_MOVE_GRAVITY_DISABLE, SMSG_MOVE_GRAVITY_DISABLE }
{SMSG_MOVE_SPLINE_ENABLE_GRAVITY, SMSG_MOVE_GRAVITY_ENABLE },
{SMSG_MOVE_SPLINE_DISABLE_GRAVITY, SMSG_MOVE_GRAVITY_DISABLE }
};
bool player = GetTypeId() == TYPEID_PLAYER && ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER;
@@ -15934,7 +15934,7 @@ bool Unit::SetSwim(bool enable)
else
RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING);
static OpcodeServer const swimOpcodeTable[2] = {SMSG_SPLINE_MOVE_STOP_SWIM, SMSG_SPLINE_MOVE_START_SWIM};
static OpcodeServer const swimOpcodeTable[2] = { SMSG_MOVE_SPLINE_STOP_SWIM, SMSG_MOVE_SPLINE_START_SWIM};
WorldPackets::Movement::MoveSplineSetFlag packet(swimOpcodeTable[enable]);
packet.MoverGUID = GetGUID();
@@ -15963,8 +15963,8 @@ bool Unit::SetCanFly(bool enable)
static OpcodeServer const flyOpcodeTable[2][2] =
{
{SMSG_SPLINE_MOVE_UNSET_FLYING, SMSG_MOVE_UNSET_CAN_FLY },
{SMSG_SPLINE_MOVE_SET_FLYING, SMSG_MOVE_SET_CAN_FLY }
{ SMSG_MOVE_SPLINE_UNSET_FLYING, SMSG_MOVE_UNSET_CAN_FLY },
{ SMSG_MOVE_SPLINE_SET_FLYING, SMSG_MOVE_SET_CAN_FLY }
};
bool player = GetTypeId() == TYPEID_PLAYER && ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER;
@@ -16001,8 +16001,8 @@ bool Unit::SetWaterWalking(bool enable, bool packetOnly /*= false */)
static OpcodeServer const waterWalkingOpcodeTable[2][2] =
{
{SMSG_SPLINE_MOVE_SET_LAND_WALK, SMSG_MOVE_LAND_WALK },
{SMSG_SPLINE_MOVE_SET_WATER_WALK, SMSG_MOVE_WATER_WALK}
{ SMSG_MOVE_SPLINE_SET_LAND_WALK, SMSG_MOVE_LAND_WALK },
{ SMSG_MOVE_SPLINE_SET_WATER_WALK, SMSG_MOVE_WATER_WALK }
};
bool player = GetTypeId() == TYPEID_PLAYER && ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER;
@@ -16039,8 +16039,8 @@ bool Unit::SetFeatherFall(bool enable, bool packetOnly /*= false */)
static OpcodeServer const featherFallOpcodeTable[2][2] =
{
{SMSG_SPLINE_MOVE_SET_NORMAL_FALL, SMSG_MOVE_NORMAL_FALL },
{SMSG_SPLINE_MOVE_SET_FEATHER_FALL, SMSG_MOVE_FEATHER_FALL }
{ SMSG_MOVE_SPLINE_SET_NORMAL_FALL, SMSG_MOVE_NORMAL_FALL },
{ SMSG_MOVE_SPLINE_SET_FEATHER_FALL, SMSG_MOVE_FEATHER_FALL }
};
bool player = GetTypeId() == TYPEID_PLAYER && ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER;
@@ -16092,8 +16092,8 @@ bool Unit::SetHover(bool enable, bool packetOnly /*= false*/)
static OpcodeServer const hoverOpcodeTable[2][2] =
{
{SMSG_SPLINE_MOVE_UNSET_HOVER, SMSG_MOVE_UNSET_HOVER },
{SMSG_SPLINE_MOVE_SET_HOVER, SMSG_MOVE_SET_HOVER }
{ SMSG_MOVE_SPLINE_UNSET_HOVER, SMSG_MOVE_UNSET_HOVER },
{ SMSG_MOVE_SPLINE_SET_HOVER, SMSG_MOVE_SET_HOVER }
};
bool player = GetTypeId() == TYPEID_PLAYER && ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER;
@@ -16143,7 +16143,7 @@ void Unit::SendSetPlayHoverAnim(bool enable)
void Unit::SendMovementSetSplineAnim(Movement::AnimType anim)
{
WorldPacket data(SMSG_SPLINE_MOVE_SET_ANIM, 8 + 4);
WorldPacket data(SMSG_MOVE_SPLINE_SET_ANIM, 8 + 4);
data << GetPackGUID();
data << uint32(anim);
SendMessageToSet(&data, false);
src/server/game/Groups/Group.cpp
+2 -2
View File
@@ -707,7 +707,7 @@ void Group::ChangeLeader(ObjectGuid newLeaderGuid)
m_leaderName = newLeader->GetName();
ToggleGroupMemberFlag(slot, MEMBER_FLAG_ASSISTANT, false);
WorldPacket data(SMSG_GROUP_SET_LEADER, m_leaderName.size()+1);
WorldPacket data(SMSG_GROUP_NEW_LEADER, m_leaderName.size()+1);
data << slot->name;
BroadcastPacket(&data, true);
}
@@ -1671,7 +1671,7 @@ void Group::OfflineReadyCheck()
Player* player = ObjectAccessor::FindConnectedPlayer(citr->guid);
if (!player || !player->GetSession())
{
WorldPacket data(SMSG_RAID_READY_CHECK_CONFIRM, 9);
WorldPacket data(SMSG_READY_CHECK_RESPONSE, 9);
data << citr->guid;
data << uint8(0);
BroadcastReadyCheck(&data);
src/server/game/Guilds/GuildFinderMgr.cpp
+1 -1
View File
@@ -325,6 +325,6 @@ void GuildFinderMgr::SendApplicantListUpdate(Guild* guild)
void GuildFinderMgr::SendMembershipRequestListUpdate(Player* player)
{
WorldPacket data(SMSG_LF_GUILD_APPLICATIONS_LIST_CHANGED, 0);
WorldPacket data(SMSG_LF_GUILD_APPLICATIONS, 0);
player->SendDirectMessage(&data);
}
src/server/game/Handlers/AuctionHouseHandler.cpp
+2 -2
View File
@@ -33,7 +33,7 @@
#include "AuctionHousePackets.h"
//void called when player click on auctioneer npc
void WorldSession::HandleAuctionHelloOpcode(WorldPackets::AuctionHouse::AuctionHello& packet)
void WorldSession::HandleAuctionHelloOpcode(WorldPackets::AuctionHouse::AuctionHelloRequest& packet)
{
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(packet.Guid, UNIT_NPC_FLAG_AUCTIONEER);
if (!unit)
@@ -755,7 +755,7 @@ void WorldSession::HandleAuctionListPendingSales(WorldPacket& recvData)
uint32 count = 0;
WorldPacket data(SMSG_AUCTION_LIST_PENDING_SALES, 4);
WorldPacket data(SMSG_AUCTION_LIST_PENDING_SALES_RESULT, 4);
data << uint32(count); // count
/*for (uint32 i = 0; i < count; ++i)
{
src/server/game/Handlers/CalendarHandler.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ Copied events should probably have a new owner
void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recvData*/)
{
ObjectGuid guid = _player->GetGUID();
TC_LOG_DEBUG("network", "CMSG_CALENDAR_GET_CALENDAR [%s]", guid.ToString().c_str());
TC_LOG_DEBUG("network", "CMSG_CALENDAR_GET [%s]", guid.ToString().c_str());
time_t currTime = time(NULL);
src/server/game/Handlers/GroupHandler.cpp
+5 -63
View File
@@ -399,9 +399,9 @@ void WorldSession::HandleGroupInviteResponseOpcode(WorldPacket& recvData)
}
}
void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupUninviteOpcode(WorldPacket& recvData)
{
TC_LOG_DEBUG("network", "WORLD: Received CMSG_GROUP_UNINVITE_GUID");
TC_LOG_DEBUG("network", "WORLD: Received CMSG_PARTY_UNINVITE");
ObjectGuid guid;
std::string reason;
@@ -442,52 +442,6 @@ void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData)
SendPartyResult(PARTY_OP_UNINVITE, "", ERR_TARGET_NOT_IN_GROUP_S);
}
void WorldSession::HandleGroupUninviteOpcode(WorldPacket& recvData)
{
TC_LOG_DEBUG("network", "WORLD: Received CMSG_GROUP_UNINVITE");
std::string membername;
recvData >> membername;
// player not found
if (!normalizePlayerName(membername))
return;
// can't uninvite yourself
if (GetPlayer()->GetName() == membername)
{
TC_LOG_ERROR("network", "WorldSession::HandleGroupUninviteOpcode: leader %s (%s) tried to uninvite himself from the group.",
GetPlayer()->GetName().c_str(), GetPlayer()->GetGUID().ToString().c_str());
return;
}
PartyResult res = GetPlayer()->CanUninviteFromGroup();
if (res != ERR_PARTY_RESULT_OK)
{
SendPartyResult(PARTY_OP_UNINVITE, "", res);
return;
}
Group* grp = GetPlayer()->GetGroup();
if (!grp)
return;
ObjectGuid guid = grp->GetMemberGUID(membername);
if (!guid.IsEmpty())
{
Player::RemoveFromGroup(grp, guid, GROUP_REMOVEMETHOD_KICK, GetPlayer()->GetGUID());
return;
}
if (Player* player = grp->GetInvited(guid))
{
player->UninviteFromGroup();
return;
}
SendPartyResult(PARTY_OP_UNINVITE, membername, ERR_TARGET_NOT_IN_GROUP_S);
}
void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recvData)
{
TC_LOG_DEBUG("network", "WORLD: Received CMSG_GROUP_SET_LEADER");
@@ -905,7 +859,7 @@ void WorldSession::HandlePartyAssignmentOpcode(WorldPacket& recvData)
void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData)
{
TC_LOG_DEBUG("network", "WORLD: Received MSG_RAID_READY_CHECK");
TC_LOG_DEBUG("network", "WORLD: Received CMSG_DO_READY_CHECK");
Group* group = GetPlayer()->GetGroup();
if (!group)
@@ -919,7 +873,7 @@ void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData)
/********************/
// everything's fine, do it
WorldPacket data(MSG_RAID_READY_CHECK, 8);
WorldPacket data(SMSG_READY_CHECK_STARTED, 8);
data << GetPlayer()->GetGUID();
group->BroadcastPacket(&data, false, -1);
@@ -931,25 +885,13 @@ void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData)
recvData >> state;
// everything's fine, do it
WorldPacket data(SMSG_RAID_READY_CHECK_CONFIRM, 9);
WorldPacket data(SMSG_READY_CHECK_RESPONSE, 9);
data << GetPlayer()->GetGUID();
data << uint8(state);
group->BroadcastReadyCheck(&data);
}
}
void WorldSession::HandleRaidReadyCheckFinishedOpcode(WorldPacket& /*recvData*/)
{
//Group* group = GetPlayer()->GetGroup();
//if (!group)
// return;
//if (!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
// return;
// Is any reaction need?
}
void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacket* data)
{
uint32 mask = player->GetGroupUpdateFlag();
src/server/game/Handlers/GuildFinderHandler.cpp
+4 -4
View File
@@ -98,13 +98,13 @@ void WorldSession::HandleGuildFinderBrowse(WorldPacket& recvPacket)
if (guildCount == 0)
{
WorldPacket packet(SMSG_LF_GUILD_BROWSE_UPDATED, 0);
WorldPacket packet(SMSG_LF_GUILD_BROWSE, 0);
player->SendDirectMessage(&packet);
return;
}
ByteBuffer bufferData(65 * guildCount);
WorldPacket data(SMSG_LF_GUILD_BROWSE_UPDATED, 3 + guildCount * 65); // Estimated size
WorldPacket data(SMSG_LF_GUILD_BROWSE, 3 + guildCount * 65); // Estimated size
data.WriteBits(guildCount, 19);
for (LFGuildStore::const_iterator itr = guildList.begin(); itr != guildList.end(); ++itr)
@@ -285,7 +285,7 @@ void WorldSession::HandleGuildFinderGetRecruits(WorldPacket& recvPacket)
uint32 recruitCount = recruitsList.size();
ByteBuffer dataBuffer(53 * recruitCount);
WorldPacket data(SMSG_LF_GUILD_RECRUIT_LIST_UPDATED, 7 + 26 * recruitCount + 53 * recruitCount);
WorldPacket data(SMSG_LF_GUILD_RECRUITS, 7 + 26 * recruitCount + 53 * recruitCount);
data.WriteBits(recruitCount, 20);
for (std::vector<MembershipRequest>::const_iterator itr = recruitsList.begin(); itr != recruitsList.end(); ++itr)
@@ -353,7 +353,7 @@ void WorldSession::HandleGuildFinderPostRequest(WorldPacket& /*recvPacket*/)
LFGuildSettings settings = sGuildFinderMgr->GetGuildSettings(guild->GetGUID());
WorldPacket data(SMSG_LF_GUILD_POST_UPDATED, 35);
WorldPacket data(SMSG_LF_GUILD_POST, 35);
data.WriteBit(isGuildMaster); // Guessed
if (isGuildMaster)
src/server/game/Handlers/ItemHandler.cpp
+1 -1
View File
@@ -885,7 +885,7 @@ void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket)
void WorldSession::SendEnchantmentLog(ObjectGuid target, ObjectGuid caster, uint32 itemId, uint32 enchantId)
{
WorldPacket data(SMSG_ENCHANTMENTLOG, (8+8+4+4));
WorldPacket data(SMSG_ENCHANTMENT_LOG, (8+8+4+4));
data << target.WriteAsPacked();
data << caster.WriteAsPacked();
data << uint32(itemId);
src/server/game/Handlers/MailHandler.cpp
+1 -1
View File
@@ -843,7 +843,7 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket& recvData)
/// @todo Fix me! ... this void has probably bad condition, but good data are sent
void WorldSession::HandleQueryNextMailTime(WorldPacket& /*recvData*/)
{
WorldPacket data(MSG_QUERY_NEXT_MAIL_TIME, 8);
WorldPacket data(SMSG_MAIL_QUERY_NEXT_TIME_RESULT, 8);
if (!_player->m_mailsLoaded)
_player->_LoadMail();
src/server/game/Handlers/MiscHandler.cpp
+3 -3
View File
@@ -732,7 +732,7 @@ void WorldSession::HandleSetContactNotesOpcode(WorldPacket& recvData)
_player->GetSocial()->SetFriendNote(guid, note);
}
void WorldSession::HandleBugOpcode(WorldPacket& recvData)
void WorldSession::HandleBugReportOpcode(WorldPacket& recvData)
{
uint32 suggestion, contentlen, typelen;
std::string content, type;
@@ -744,9 +744,9 @@ void WorldSession::HandleBugOpcode(WorldPacket& recvData)
type = recvData.ReadString(typelen);
if (suggestion == 0)
TC_LOG_DEBUG("network", "WORLD: Received CMSG_BUG [Bug Report]");
TC_LOG_DEBUG("network", "WORLD: Received CMSG_BUG_REPORT [Bug Report]");
else
TC_LOG_DEBUG("network", "WORLD: Received CMSG_BUG [Suggestion]");
TC_LOG_DEBUG("network", "WORLD: Received CMSG_BUG_REPORT [Suggestion]");
TC_LOG_DEBUG("network", "%s", type.c_str());
TC_LOG_DEBUG("network", "%s", content.c_str());
src/server/game/Handlers/NPCHandler.cpp
+30 -30
View File
@@ -71,7 +71,7 @@ void WorldSession::HandleTabardVendorActivateOpcode(WorldPacket& recvData)
void WorldSession::SendTabardVendorActivate(ObjectGuid guid)
{
WorldPacket data(MSG_TABARDVENDOR_ACTIVATE, 8);
WorldPacket data(SMSG_TABARD_VENDOR_ACTIVATE, 18);
data << guid;
SendPacket(&data);
}
@@ -514,9 +514,9 @@ void WorldSession::SendStablePetCallback(PreparedQueryResult result, ObjectGuid
if (!GetPlayer())
return;
TC_LOG_DEBUG("network", "WORLD: Recv MSG_LIST_STABLED_PETS Send.");
TC_LOG_DEBUG("network", "WORLD: Recv CMSG_REQUEST_STABLED_PETS Send.");
WorldPacket data(MSG_LIST_STABLED_PETS, 200); // guess size
WorldPacket data(SMSG_PET_STABLE_LIST, 200); // guess size
data << guid;
@@ -564,9 +564,9 @@ void WorldSession::SendStablePetCallback(PreparedQueryResult result, ObjectGuid
}
void WorldSession::SendStableResult(uint8 res)
void WorldSession::SendPetStableResult(uint8 res)
{
WorldPacket data(SMSG_STABLE_RESULT, 1);
WorldPacket data(SMSG_PET_STABLE_RESULT, 1);
data << uint8(res);
SendPacket(&data);
}
@@ -580,13 +580,13 @@ void WorldSession::HandleStablePet(WorldPacket& recvData)
if (!GetPlayer()->IsAlive())
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
if (!CheckStableMaster(npcGUID))
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -599,7 +599,7 @@ void WorldSession::HandleStablePet(WorldPacket& recvData)
// can't place in stable dead pet
if (!pet || !pet->IsAlive() || pet->getPetType() != HUNTER_PET)
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -639,10 +639,10 @@ void WorldSession::HandleStablePetCallback(PreparedQueryResult result)
if (freeSlot > 0 && freeSlot <= GetPlayer()->m_stableSlots)
{
_player->RemovePet(_player->GetPet(), PetSaveMode(freeSlot));
SendStableResult(STABLE_SUCCESS_STABLE);
SendPetStableResult(STABLE_SUCCESS_STABLE);
}
else
SendStableResult(STABLE_ERR_INVALID_SLOT);
SendPetStableResult(STABLE_ERR_INVALID_SLOT);
}
void WorldSession::HandleUnstablePet(WorldPacket& recvData)
@@ -655,7 +655,7 @@ void WorldSession::HandleUnstablePet(WorldPacket& recvData)
if (!CheckStableMaster(npcGUID))
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -688,7 +688,7 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32
if (!petEntry)
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -697,16 +697,16 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32
{
// if problem in exotic pet
if (creatureInfo && creatureInfo->IsTameable(true))
SendStableResult(STABLE_ERR_EXOTIC);
SendPetStableResult(STABLE_ERR_EXOTIC);
else
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
Pet* pet = _player->GetPet();
if (pet && pet->IsAlive())
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -719,11 +719,11 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32
{
delete newPet;
newPet = NULL;
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
SendStableResult(STABLE_SUCCESS_UNSTABLE);
SendPetStableResult(STABLE_SUCCESS_UNSTABLE);
}
void WorldSession::HandleBuyStableSlot(WorldPacket& recvData)
@@ -735,7 +735,7 @@ void WorldSession::HandleBuyStableSlot(WorldPacket& recvData)
if (!CheckStableMaster(npcGUID))
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -750,13 +750,13 @@ void WorldSession::HandleBuyStableSlot(WorldPacket& recvData)
{
++GetPlayer()->m_stableSlots;
_player->ModifyMoney(-int32(SlotPrice->Price));
SendStableResult(STABLE_SUCCESS_BUY_SLOT);
SendPetStableResult(STABLE_SUCCESS_BUY_SLOT);
}
else
SendStableResult(STABLE_ERR_MONEY);*/
SendPetStableResult(STABLE_ERR_MONEY);*/
}
else
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
}
void WorldSession::HandleStableRevivePet(WorldPacket &/* recvData */)
@@ -774,7 +774,7 @@ void WorldSession::HandleStableSwapPet(WorldPacket& recvData)
if (!CheckStableMaster(npcGUID))
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -786,7 +786,7 @@ void WorldSession::HandleStableSwapPet(WorldPacket& recvData)
if (!pet || pet->getPetType() != HUNTER_PET)
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -808,7 +808,7 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3
if (!result)
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -819,20 +819,20 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3
if (!petEntry)
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(petEntry);
if (!creatureInfo || !creatureInfo->IsTameable(true))
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
if (!creatureInfo->IsTameable(_player->CanTameExoticPets()))
{
SendStableResult(STABLE_ERR_EXOTIC);
SendPetStableResult(STABLE_ERR_EXOTIC);
return;
}
@@ -840,7 +840,7 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3
// The player's pet could have been removed during the delay of the DB callback
if (!pet)
{
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
return;
}
@@ -852,10 +852,10 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3
if (!newPet->LoadPetFromDB(_player, petEntry, petId))
{
delete newPet;
SendStableResult(STABLE_ERR_STABLE);
SendPetStableResult(STABLE_ERR_STABLE);
}
else
SendStableResult(STABLE_SUCCESS_UNSTABLE);
SendPetStableResult(STABLE_SUCCESS_UNSTABLE);
}
void WorldSession::HandleRepairItemOpcode(WorldPackets::Item::RepairItem& packet)
src/server/game/Handlers/PetitionsHandler.cpp
+3 -1
View File
@@ -595,9 +595,11 @@ void WorldSession::HandlePetitionDeclineOpcode(WorldPacket& recvData)
Player* owner = ObjectAccessor::FindConnectedPlayer(ownerguid);
if (owner) // petition owner online
{
WorldPacket data(MSG_PETITION_DECLINE, 8);
/*
WorldPacket data(SMSG_DECLINE_PETITION, 18);
data << _player->GetGUID();
owner->GetSession()->SendPacket(&data);
*/
}
}
src/server/game/Handlers/SkillHandler.cpp
+3 -6
View File
@@ -41,7 +41,7 @@ void WorldSession::HandleLearnTalentOpcode(WorldPackets::Talent::LearnTalent& pa
_player->SendTalentsInfoData();
}
void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket& recvData)
void WorldSession::HandleConfirmRespecWipeOpcode(WorldPacket& recvData)
{
TC_LOG_DEBUG("network", "MSG_TALENT_WIPE_CONFIRM");
ObjectGuid guid;
@@ -50,7 +50,7 @@ void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket& recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER);
if (!unit)
{
TC_LOG_DEBUG("network", "WORLD: HandleTalentWipeConfirmOpcode - %s not found or you can't interact with him.", guid.ToString().c_str());
TC_LOG_DEBUG("network", "WORLD: HandleConfirmRespecWipeOpcode - %s not found or you can't interact with him.", guid.ToString().c_str());
return;
}
@@ -63,10 +63,7 @@ void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket& recvData)
if (!_player->ResetTalents())
{
WorldPacket data(MSG_TALENT_WIPE_CONFIRM, 8+4); //you have not any talent
data << uint64(0);
data << uint32(0);
SendPacket(&data);
GetPlayer()->SendRespecWipeConfirm(ObjectGuid::Empty, 0);
return;
}
src/server/game/Server/Packets/AuctionHousePackets.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "AuctionHouseMgr.h"
#include "ObjectGuid.h"
void WorldPackets::AuctionHouse::AuctionHello::Read()
void WorldPackets::AuctionHouse::AuctionHelloRequest::Read()
{
_worldPacket >> Guid;
}
src/server/game/Server/Packets/AuctionHousePackets.h
+6 -6
View File
@@ -26,11 +26,11 @@ namespace WorldPackets
{
namespace AuctionHouse
{
class AuctionHello final : public ClientPacket
class AuctionHelloRequest final : public ClientPacket
{
public:
AuctionHello(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_HELLO, std::move(packet)) { }
AuctionHelloRequest(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_HELLO_REQUEST, std::move(packet)) { }
void Read() override;
ObjectGuid Guid;
};
@@ -39,13 +39,13 @@ namespace WorldPackets
{
public:
AuctionHelloResponse() : ServerPacket(SMSG_AUCTION_HELLO, 1 + 16) { }
WorldPacket const* Write() override;
ObjectGuid Guid;
bool OpenForBusiness = true;
};
class AuctionCommandResult final : public ServerPacket
{
public:
src/server/game/Server/Packets/CombatLogPackets.h
+1 -1
View File
@@ -28,7 +28,7 @@ namespace WorldPackets
class SpellNonMeleeDamageLog final : public ServerPacket
{
public:
SpellNonMeleeDamageLog() : ServerPacket(SMSG_SPELLNONMELEEDAMAGELOG, 60) { }
SpellNonMeleeDamageLog() : ServerPacket(SMSG_SPELL_NON_MELEE_DAMAGE_LOG, 60) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/ItemPackets.h
+1 -1
View File
@@ -28,7 +28,7 @@ namespace WorldPackets
class BuyBackItem final : public ClientPacket
{
public:
BuyBackItem(WorldPacket&& packet) : ClientPacket(CMSG_BUYBACK_ITEM, std::move(packet)) { }
BuyBackItem(WorldPacket&& packet) : ClientPacket(CMSG_BUY_BACK_ITEM, std::move(packet)) { }
void Read() override;
src/server/game/Server/Protocol/Opcodes.cpp
+422 -93
View File
File diff suppressed because it is too large Load Diff
src/server/game/Server/Protocol/Opcodes.h
+484 -252
View File
File diff suppressed because it is too large Load Diff
src/server/game/Server/WorldSession.cpp
+3 -3
View File
@@ -1244,8 +1244,8 @@ uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) co
case CMSG_HEARTH_AND_RESURRECT: // 0 1.5
case CMSG_TOGGLE_PVP: // 0 1.5
case CMSG_PET_ABANDON: // 0 1.5
case CMSG_ACTIVATETAXIEXPRESS: // 0 1.5
case CMSG_ACTIVATETAXI: // 0 1.5
case CMSG_ACTIVATE_TAXI_EXPRESS: // 0 1.5
case CMSG_ACTIVATE_TAXI: // 0 1.5
case CMSG_SELF_RES: // 0 1.5
case CMSG_UNLEARN_SKILL: // 0 1.5
case CMSG_EQUIPMENT_SET_SAVE: // 0 1.5
@@ -1312,7 +1312,7 @@ uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) co
//case CMSG_GUILD_SET_NOTE: // 1 2 1 async db query
//case CMSG_SET_CONTACT_NOTES: // 1 2.5 1 async db query
//case CMSG_CALENDAR_GET_CALENDAR: // 0 1.5 medium upload bandwidth usage
//case CMSG_CALENDAR_GET: // 0 1.5 medium upload bandwidth usage
case CMSG_GUILD_BANK_QUERY_TAB: // 0 3.5 medium upload bandwidth usage
//case CMSG_QUERY_INSPECT_ACHIEVEMENTS: // 0 13 high upload bandwidth usage
case CMSG_GAMEOBJ_REPORT_USE: // not profiled
src/server/game/Server/WorldSession.h
+5 -7
View File
@@ -77,7 +77,7 @@ namespace WorldPackets
{
namespace AuctionHouse
{
class AuctionHello;
class AuctionHelloRequest;
}
namespace BlackMarket
@@ -520,7 +520,7 @@ class WorldSession
void SendPetNameQuery(ObjectGuid guid, uint32 petnumber);
void SendStablePet(ObjectGuid guid);
void SendStablePetCallback(PreparedQueryResult result, ObjectGuid guid);
void SendStableResult(uint8 guid);
void SendPetStableResult(uint8 guid);
bool CheckStableMaster(ObjectGuid guid);
// Account Data
@@ -736,7 +736,7 @@ class WorldSession
void HandleAddIgnoreOpcodeCallBack(PreparedQueryResult result);
void HandleDelIgnoreOpcode(WorldPacket& recvPacket);
void HandleSetContactNotesOpcode(WorldPacket& recvPacket);
void HandleBugOpcode(WorldPacket& recvPacket);
void HandleBugReportOpcode(WorldPacket& recvPacket);
void HandleAreaTriggerOpcode(WorldPackets::Misc::AreaTrigger& packet);
@@ -780,7 +780,6 @@ class WorldSession
//void HandleGroupCancelOpcode(WorldPacket& recvPacket);
void HandleGroupInviteResponseOpcode(WorldPacket& recvPacket);
void HandleGroupUninviteOpcode(WorldPacket& recvPacket);
void HandleGroupUninviteGuidOpcode(WorldPacket& recvPacket);
void HandleGroupSetLeaderOpcode(WorldPacket& recvPacket);
void HandleGroupSetRolesOpcode(WorldPacket& recvData);
void HandleGroupDisbandOpcode(WorldPacket& recvPacket);
@@ -790,7 +789,6 @@ class WorldSession
void HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData);
void HandleRaidTargetUpdateOpcode(WorldPacket& recvData);
void HandleRaidReadyCheckOpcode(WorldPacket& recvData);
void HandleRaidReadyCheckFinishedOpcode(WorldPacket& recvData);
void HandleGroupRaidConvertOpcode(WorldPacket& recvData);
void HandleGroupRequestJoinUpdates(WorldPacket& recvData);
void HandleGroupChangeSubGroupOpcode(WorldPacket& recvData);
@@ -891,7 +889,7 @@ class WorldSession
void HandleSetTradeItemOpcode(WorldPacket& recvPacket);
void HandleUnacceptTradeOpcode(WorldPacket& recvPacket);
void HandleAuctionHelloOpcode(WorldPackets::AuctionHouse::AuctionHello& packet);
void HandleAuctionHelloOpcode(WorldPackets::AuctionHouse::AuctionHelloRequest& packet);
void HandleAuctionListItems(WorldPacket& recvData);
void HandleAuctionListBidderItems(WorldPacket& recvData);
void HandleAuctionSellItem(WorldPacket& recvData);
@@ -946,7 +944,7 @@ class WorldSession
void HandleCancelAutoRepeatSpellOpcode(WorldPacket& recvPacket);
void HandleLearnTalentOpcode(WorldPackets::Talent::LearnTalent& packet);
void HandleTalentWipeConfirmOpcode(WorldPacket& recvPacket);
void HandleConfirmRespecWipeOpcode(WorldPacket& recvPacket);
void HandleUnlearnSkillOpcode(WorldPacket& recvPacket);
void HandleSetSpecializationOpcode(WorldPackets::Talent::SetSpecialization& packet);
src/server/game/Spells/Spell.cpp
+2 -2
View File
@@ -4275,7 +4275,7 @@ void Spell::WriteSpellGoTargets(WorldPacket* data)
void Spell::SendLogExecute()
{
WorldPacket data(SMSG_SPELLLOGEXECUTE, (8+4+4+4+4+8));
WorldPacket data(SMSG_SPELL_EXECUTE_LOG, (8+4+4+4+4+8));
data << m_caster->GetPackGUID();
@@ -4328,7 +4328,7 @@ void Spell::ExecuteLogEffectInterruptCast(uint8 /*effIndex*/, Unit* victim, uint
ObjectGuid casterGuid = m_caster->GetGUID();
ObjectGuid targetGuid = victim->GetGUID();
WorldPacket data(SMSG_SPELLINTERRUPTLOG, 8 + 8 + 4 + 4);
WorldPacket data(SMSG_SPELL_INTERRUPT_LOG, 8 + 8 + 4 + 4);
data.WriteBit(targetGuid[4]);
data.WriteBit(casterGuid[5]);
data.WriteBit(casterGuid[6]);
src/server/game/Spells/SpellEffects.cpp
+3 -3
View File
@@ -367,7 +367,7 @@ void Spell::EffectInstaKill(SpellEffIndex /*effIndex*/)
if (m_caster == unitTarget) // prevent interrupt message
finish();
WorldPacket data(SMSG_SPELLINSTAKILLLOG, 8+8+4);
WorldPacket data(SMSG_SPELL_INSTAKILL_LOG, 8+8+4);
data << m_caster->GetGUID();
data << unitTarget->GetGUID();
data << uint32(m_spellInfo->Id);
@@ -2333,7 +2333,7 @@ void Spell::EffectDispel(SpellEffIndex effIndex)
if (success_list.empty())
return;
WorldPacket dataSuccess(SMSG_SPELLDISPELLOG, 8+8+4+1+4+success_list.size()*5);
WorldPacket dataSuccess(SMSG_SPELL_DISPEL_LOG, 8+8+4+1+4+success_list.size()*5);
// Send packet header
dataSuccess << unitTarget->GetPackGUID(); // Victim GUID
dataSuccess << m_caster->GetPackGUID(); // Caster GUID
@@ -2436,7 +2436,7 @@ void Spell::EffectUntrainTalents(SpellEffIndex /*effIndex*/)
if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER)
return;
unitTarget->ToPlayer()->SendTalentWipeConfirm(m_caster->GetGUID());
unitTarget->ToPlayer()->SendRespecWipeConfirm(m_caster->GetGUID(), sWorld->getBoolConfig(CONFIG_NO_RESET_TALENT_COST) ? 0 : unitTarget->ToPlayer()->GetNextResetTalentsCost());
}
void Spell::EffectTeleUnitsFaceCaster(SpellEffIndex /*effIndex*/)
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+1 -1
View File
@@ -699,7 +699,7 @@ class npc_boombot : public CreatureScript
{
_boomed = true; // Prevent recursive calls
WorldPacket data(SMSG_SPELLINSTAKILLLOG, 8+8+4);
WorldPacket data(SMSG_SPELL_INSTAKILL_LOG, 8+8+4);
data << me->GetGUID();
data << me->GetGUID();
data << uint32(SPELL_BOOM);