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

Core/PacketIO: Updated values of all known server opcodes

Browse Source
This commit is contained in:
Shauren
2015-03-27 22:21:24 +01:00
parent b05d74ba46
commit 8cfb542ee4
60 changed files with 1128 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/BattlegroundMgr.cpp
+1 -1
View File
@@ -242,7 +242,7 @@ void BattlegroundMgr::BuildBattlegroundStatusPacket(WorldPacket* data, Battlegro
}
case STATUS_WAIT_JOIN:
{
data->Initialize(SMSG_BATTLEFIELD_STATUS_NEEDCONFIRMATION);
data->Initialize(SMSG_BATTLEFIELD_STATUS_NEED_CONFIRMATION);
*data << uint32(bg->GetClientInstanceID()); // Client Instance ID
*data << uint32(Time1); // Time until closed
src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
+2 -2
View File
@@ -240,13 +240,13 @@ void BattlegroundAB::HandleAreaTrigger(Player* player, uint32 trigger)
{
case 3948: // Arathi Basin Alliance Exit.
if (player->GetTeam() != ALLIANCE)
player->GetSession()->SendAreaTriggerMessage("Only The Alliance can use that portal");
player->GetSession()->SendNotification("Only The Alliance can use that portal");
else
player->LeaveBattleground();
break;
case 3949: // Arathi Basin Horde Exit.
if (player->GetTeam() != HORDE)
player->GetSession()->SendAreaTriggerMessage("Only The Horde can use that portal");
player->GetSession()->SendNotification("Only The Horde can use that portal");
else
player->LeaveBattleground();
break;
src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
+2 -2
View File
@@ -503,13 +503,13 @@ void BattlegroundAV::HandleAreaTrigger(Player* player, uint32 trigger)
case 95:
case 2608:
if (player->GetTeam() != ALLIANCE)
player->GetSession()->SendAreaTriggerMessage("Only The Alliance can use that portal");
player->GetSession()->SendNotification("Only The Alliance can use that portal");
else
player->LeaveBattleground();
break;
case 2606:
if (player->GetTeam() != HORDE)
player->GetSession()->SendAreaTriggerMessage("Only The Horde can use that portal");
player->GetSession()->SendNotification("Only The Horde can use that portal");
else
player->LeaveBattleground();
break;
src/server/game/Calendar/CalendarMgr.cpp
+1 -1
View File
@@ -473,7 +473,7 @@ void CalendarMgr::SendCalendarEventUpdateAlert(CalendarEvent const& calendarEven
void CalendarMgr::SendCalendarEventStatus(CalendarEvent const& calendarEvent, CalendarInvite const& invite)
{
WorldPacket data(SMSG_CALENDAR_EVENT_STATUS, 8 + 8 + 4 + 4 + 1 + 1 + 4);
WorldPacket data(SMSG_CALENDAR_EVENT_INVITE_STATUS, 8 + 8 + 4 + 4 + 1 + 1 + 4);
data << invite.GetInviteeGUID().WriteAsPacked();
data << uint64(calendarEvent.GetEventId());
data.AppendPackedTime(calendarEvent.GetEventTime());
src/server/game/Entities/Creature/GossipDef.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ void QuestMenu::ClearMenu()
void PlayerMenu::SendQuestGiverQuestList(QEmote const& eEmote, const std::string& Title, ObjectGuid npcGUID)
{
WorldPacket data(SMSG_QUESTGIVER_QUEST_LIST, 100); // guess size
WorldPacket data(SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE, 100); // guess size
data << npcGUID;
data << Title;
data << uint32(eEmote._Delay); // player emote
src/server/game/Entities/GameObject/GameObject.cpp
+2 -2
View File
@@ -1361,7 +1361,7 @@ void GameObject::Use(Unit* user)
{
if (info->goober.pageID) // show page...
{
WorldPacket data(SMSG_GAMEOBJECT_PAGETEXT, 8);
WorldPacket data(SMSG_PAGE_TEXT, 8);
data << GetGUID();
player->SendDirectMessage(&data);
}
@@ -1848,7 +1848,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId, bool triggered /*= true
void GameObject::SendCustomAnim(uint32 anim)
{
WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM, 8+4);
WorldPacket data(SMSG_GAME_OBJECT_CUSTOM_ANIM, 8 + 4);
data << GetGUID();
data << uint32(anim);
SendMessageToSet(&data, true);
src/server/game/Entities/Object/Object.cpp
+1 -1
View File
@@ -2358,7 +2358,7 @@ void WorldObject::SendMessageToSet(WorldPacket const* data, Player const* skippe
void WorldObject::SendObjectDeSpawnAnim(ObjectGuid guid)
{
WorldPacket data(SMSG_GAMEOBJECT_DESPAWN_ANIM, 8);
WorldPacket data(SMSG_GAME_OBJECT_DESPAWN, 8);
data << guid;
SendMessageToSet(&data, true);
}
src/server/game/Entities/Pet/Pet.cpp
+2 -2
View File
@@ -1429,7 +1429,7 @@ bool Pet::learnSpell(uint32 spell_id)
if (!m_loading)
{
WorldPacket data(SMSG_PET_LEARNED_SPELL, 4);
WorldPacket data(SMSG_PET_LEARNED_SPELLS, 4);
data << uint32(spell_id);
GetOwner()->GetSession()->SendPacket(&data);
GetOwner()->PetSpellInitialize();
@@ -1482,7 +1482,7 @@ bool Pet::unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
{
if (!m_loading)
{
WorldPacket data(SMSG_PET_REMOVED_SPELL, 4);
WorldPacket data(SMSG_PET_UNLEARNED_SPELLS, 4);
data << uint32(spell_id);
GetOwner()->GetSession()->SendPacket(&data);
}
src/server/game/Entities/Player/Player.cpp
+30 -52
View File
@@ -2817,7 +2817,7 @@ void Player::RemoveFromGroup(Group* group, ObjectGuid guid, RemoveMethod method
void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 BonusXP, bool recruitAFriend, float /*group_rate*/)
{
WorldPacket data(SMSG_LOG_XPGAIN, 21); // guess size?
WorldPacket data(SMSG_LOG_XP_GAIN, 21); // guess size?
data << (victim ? victim->GetGUID() : ObjectGuid::Empty);
data << uint32(GivenXP + BonusXP); // given experience
data << uint8(victim ? 0 : 1); // 00-kill_xp type, 01-non_kill_xp type
@@ -7145,26 +7145,6 @@ uint32 Player::GetCurrencyTotalCap(CurrencyTypesEntry const* currency) const
return cap;
}
void Player::UpdateConquestCurrencyCap(uint32 currency)
{
uint32 currenciesToUpdate[2] = { currency, CURRENCY_TYPE_CONQUEST_POINTS };
for (uint32 i = 0; i < 2; ++i)
{
CurrencyTypesEntry const* currencyEntry = sCurrencyTypesStore.LookupEntry(currenciesToUpdate[i]);
if (!currencyEntry)
continue;
uint32 precision = (currencyEntry->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? 100 : 1;
uint32 cap = GetCurrencyWeekCap(currencyEntry);
WorldPacket packet(SMSG_UPDATE_CURRENCY_WEEK_LIMIT, 8);
packet << uint32(cap / precision);
packet << uint32(currenciesToUpdate[i]);
GetSession()->SendPacket(&packet);
}
}
void Player::SetInGuild(ObjectGuid::LowType guildId)
{
if (guildId)
@@ -7200,10 +7180,7 @@ void Player::SetArenaTeamInfoField(uint8 slot, ArenaTeamInfoType type, uint32 va
{
SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (slot * ARENA_TEAM_END) + type, value);
if (type == ARENA_TEAM_PERSONAL_RATING && value > _maxPersonalArenaRate)
{
_maxPersonalArenaRate = value;
UpdateConquestCurrencyCap(CURRENCY_TYPE_CONQUEST_META_ARENA);
}
}
void Player::SetInArenaTeam(uint32 ArenaTeamId, uint8 slot, uint8 type)
@@ -16269,7 +16246,7 @@ void Player::SendQuestFailed(uint32 questId, InventoryResult reason)
{
if (questId)
{
WorldPacket data(SMSG_QUESTGIVER_QUEST_FAILED, 4 + 4);
WorldPacket data(SMSG_QUEST_GIVER_QUEST_FAILED, 4 + 4);
data << uint32(questId);
data << uint32(reason); // failed reason (valid reasons: 4, 16, 50, 17, 74, other values show default message)
GetSession()->SendPacket(&data);
@@ -16290,7 +16267,7 @@ void Player::SendQuestTimerFailed(uint32 quest_id)
void Player::SendCanTakeQuestResponse(QuestFailedReason msg) const
{
WorldPacket data(SMSG_QUESTGIVER_QUEST_INVALID, 4);
WorldPacket data(SMSG_QUEST_GIVER_INVALID_QUEST, 4);
data << uint32(msg);
GetSession()->SendPacket(&data);
TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTGIVER_QUEST_INVALID");
@@ -18451,7 +18428,7 @@ void Player::SendRaidInfo()
{
uint32 counter = 0;
WorldPacket data(SMSG_RAID_INSTANCE_INFO, 4);
WorldPacket data(SMSG_INSTANCE_INFO, 4);
size_t p_counter = data.wpos();
data << uint32(counter); // placeholder
@@ -18586,7 +18563,7 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report
if (DisableMgr::IsDisabledFor(DISABLE_TYPE_MAP, target_map, this))
{
GetSession()->SendAreaTriggerMessage("%s", GetSession()->GetTrinityString(LANG_INSTANCE_CLOSED));
GetSession()->SendNotification("%s", GetSession()->GetTrinityString(LANG_INSTANCE_CLOSED));
return false;
}
@@ -18617,9 +18594,9 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report
else if (mapDiff->HasMessage()) // if (missingAchievement) covered by this case
SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty);
else if (missingItem)
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(missingItem))->GetName(GetSession()->GetSessionDbcLocale()));
GetSession()->SendNotification(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(missingItem))->GetName(GetSession()->GetSessionDbcLocale()));
else if (LevelMin)
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED), LevelMin);
GetSession()->SendNotification(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED), LevelMin);
}
return false;
}
@@ -20147,7 +20124,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
if (pet->isControlled())
{
WorldPacket data(SMSG_PET_SPELLS, 8);
WorldPacket data(SMSG_PET_SPELLS_MESSAGE, 8);
data << uint64(0);
GetSession()->SendPacket(&data);
@@ -20299,7 +20276,7 @@ void Player::PetSpellInitialize()
CharmInfo* charmInfo = pet->GetCharmInfo();
WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+1);
WorldPacket data(SMSG_PET_SPELLS_MESSAGE, 8 + 2 + 4 + 4 + 4 * MAX_UNIT_ACTION_BAR_INDEX + 1 + 1);
data << pet->GetGUID();
data << uint16(pet->GetCreatureTemplate()->family); // creature family (required for pet talents)
data << uint32(pet->GetDuration());
@@ -20351,7 +20328,7 @@ void Player::PossessSpellInitialize()
return;
}
WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+1);
WorldPacket data(SMSG_PET_SPELLS_MESSAGE, 8 + 2 + 4 + 4 + 4 * MAX_UNIT_ACTION_BAR_INDEX + 1 + 1);
data << charm->GetGUID();
data << uint16(0);
data << uint32(0);
@@ -20375,7 +20352,7 @@ void Player::VehicleSpellInitialize()
uint8 cooldownCount = 0;
WorldPacket data(SMSG_PET_SPELLS, 8 + 2 + 4 + 4 + 4 * 10 + 1 + 1 + cooldownCount * (4 + 2 + 4 + 4));
WorldPacket data(SMSG_PET_SPELLS_MESSAGE, 8 + 2 + 4 + 4 + 4 * 10 + 1 + 1 + cooldownCount * (4 + 2 + 4 + 4));
data << vehicle->GetGUID(); // Guid
data << uint16(0); // Pet Family (0 for all vehicles)
data << uint32(vehicle->IsSummon() ? vehicle->ToTempSummon()->GetTimer() : 0); // Duration
@@ -20443,7 +20420,7 @@ void Player::CharmSpellInitialize()
}
}
WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+4*addlist+1);
WorldPacket data(SMSG_PET_SPELLS_MESSAGE, 8 + 2 + 4 + 4 + 4 * MAX_UNIT_ACTION_BAR_INDEX + 1 + 4 * addlist + 1);
data << charm->GetGUID();
data << uint16(0);
data << uint32(0);
@@ -20475,7 +20452,7 @@ void Player::CharmSpellInitialize()
void Player::SendRemoveControlBar()
{
WorldPacket data(SMSG_PET_SPELLS, 8);
WorldPacket data(SMSG_PET_SPELLS_MESSAGE, 8);
data << uint64(0);
GetSession()->SendPacket(&data);
}
@@ -22326,17 +22303,18 @@ void Player::SendComboPoints()
Unit* combotarget = ObjectAccessor::GetUnit(*this, m_comboTarget);
if (combotarget)
{
WorldPacket data;
if (m_mover != this)
{
data.Initialize(SMSG_PET_UPDATE_COMBO_POINTS, m_mover->GetPackGUID().size()+combotarget->GetPackGUID().size()+1);
data << m_mover->GetPackGUID();
}
else
data.Initialize(SMSG_UPDATE_COMBO_POINTS, combotarget->GetPackGUID().size()+1);
data << combotarget->GetPackGUID();
data << uint8(m_comboPoints);
GetSession()->SendPacket(&data);
// Combo points are now a power
//WorldPacket data;
//if (m_mover != this)
//{
// data.Initialize(SMSG_PET_UPDATE_COMBO_POINTS, m_mover->GetPackGUID().size()+combotarget->GetPackGUID().size()+1);
// data << m_mover->GetPackGUID();
//}
//else
// data.Initialize(SMSG_UPDATE_COMBO_POINTS, combotarget->GetPackGUID().size()+1);
//data << combotarget->GetPackGUID();
//data << uint8(m_comboPoints);
//GetSession()->SendPacket(&data);
}
}
@@ -23697,7 +23675,7 @@ void Player::ResurrectUsingRequestData()
void Player::SetClientControl(Unit* target, bool allowMove)
{
WorldPacket data(SMSG_CLIENT_CONTROL_UPDATE, target->GetPackGUID().size()+1);
WorldPacket data(SMSG_CONTROL_UPDATE, target->GetPackGUID().size()+1);
data << target->GetPackGUID();
data << uint8(allowMove ? 1 : 0);
GetSession()->SendPacket(&data);
@@ -25643,7 +25621,7 @@ void Player::SendRefundInfo(Item* item)
}
ObjectGuid guid = item->GetGUID();
WorldPacket data(SMSG_ITEM_REFUND_INFO_RESPONSE, 8+4+4+4+4*4+4*4+4+4);
WorldPacket data(SMSG_SET_ITEM_PURCHASE_DATA, 8 + 4 + 4 + 4 + 4 * 4 + 4 * 4 + 4 + 4);
data.WriteBit(guid[3]);
data.WriteBit(guid[5]);
data.WriteBit(guid[7]);
@@ -26077,8 +26055,8 @@ void Player::OnCombatExit()
void Player::SendMovementSetCanTransitionBetweenSwimAndFly(bool apply)
{
Movement::PacketSender(this, static_cast<OpcodeServer>(NULL_OPCODE), apply ?
SMSG_MOVE_ENABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY :
SMSG_MOVE_DISABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY).Send();
SMSG_MOVE_ENABLE_TRANSITION_BETWEEN_SWIM_AND_FLY :
SMSG_MOVE_DISABLE_TRANSITION_BETWEEN_SWIM_AND_FLY).Send();
}
void Player::SendMovementSetCollisionHeight(float height)
@@ -26601,7 +26579,7 @@ void Player::UpdatePhasing()
void Player::SendSupercededSpell(uint32 oldSpell, uint32 newSpell)
{
WorldPacket data(SMSG_SUPERCEDED_SPELL, 8);
WorldPacket data(SMSG_SUPERCEDED_SPELLS, 8);
data << uint32(newSpell) << uint32(oldSpell);
GetSession()->SendPacket(&data);
}
src/server/game/Entities/Player/Player.h
-3
View File
@@ -2782,9 +2782,6 @@ class Player : public Unit, public GridObject<Player>
*/
uint32 GetCurrencyTotalCap(CurrencyTypesEntry const* currency) const;
/// Updates weekly conquest point cap (dynamic cap)
void UpdateConquestCurrencyCap(uint32 currency);
VoidStorageItem* _voidStorageItems[VOID_STORAGE_MAX_SLOT];
std::vector<Item*> m_itemUpdateQueue;
src/server/game/Entities/Unit/Unit.cpp
+6 -14
View File
@@ -4755,7 +4755,7 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo* pInfo)
{
AuraEffect const* aura = pInfo->auraEff;
WorldPacket data(SMSG_PERIODICAURALOG, 30);
WorldPacket data(SMSG_SPELL_PERIODIC_AURA_LOG, 30);
data << GetPackGUID();
data << aura->GetCasterGUID().WriteAsPacked();
data << uint32(aura->GetId()); // spellId
@@ -9548,7 +9548,7 @@ void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry)
if (CreateVehicleKit(VehicleId, creatureEntry))
{
// Send others that we now have a vehicle
WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, GetPackGUID().size()+4);
WorldPacket data(SMSG_SET_VEHICLE_REC_ID, GetPackGUID().size() + 4);
data << GetPackGUID();
data << uint32(VehicleId);
SendMessageToSet(&data, true);
@@ -9597,7 +9597,7 @@ void Unit::Dismount()
if (GetTypeId() == TYPEID_PLAYER && GetVehicleKit())
{
// Send other players that we are no longer a vehicle
data.Initialize(SMSG_PLAYER_VEHICLE_DATA, 8+4);
data.Initialize(SMSG_SET_VEHICLE_REC_ID, 8 + 4);
data << GetPackGUID();
data << uint32(0);
ToPlayer()->SendMessageToSet(&data, true);
@@ -13326,7 +13326,7 @@ void Unit::SetMovementAnimKitId(uint16 animKitId)
_movementAnimKitId = animKitId;
WorldPacket data(SMSG_MOVE_SET_ANIM_KIT, 8 + 2);
WorldPacket data(SMSG_SET_MOVEMENT_ANIM_KIT, 8 + 2);
data << GetPackGUID();
data << uint16(animKitId);
SendMessageToSet(&data, true);
@@ -16138,8 +16138,8 @@ bool Unit::SetHover(bool enable, bool packetOnly /*= false*/)
static OpcodeServer const hoverOpcodeTable[2][2] =
{
{ SMSG_MOVE_SPLINE_UNSET_HOVER, SMSG_MOVE_UNSET_HOVER },
{ SMSG_MOVE_SPLINE_SET_HOVER, SMSG_MOVE_SET_HOVER }
{ SMSG_MOVE_SPLINE_UNSET_HOVER, SMSG_MOVE_UNSET_HOVERING },
{ SMSG_MOVE_SPLINE_SET_HOVER, SMSG_MOVE_SET_HOVERING }
};
bool player = GetTypeId() == TYPEID_PLAYER && ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER;
@@ -16187,14 +16187,6 @@ void Unit::SendSetPlayHoverAnim(bool enable)
SendMessageToSet(&data, true);
}
void Unit::SendMovementSetSplineAnim(Movement::AnimType anim)
{
WorldPacket data(SMSG_MOVE_SPLINE_SET_ANIM, 8 + 4);
data << GetPackGUID();
data << uint32(anim);
SendMessageToSet(&data, false);
}
bool Unit::IsSplineEnabled() const
{
return movespline->Initialized() && !movespline->Finalized();
src/server/game/Entities/Unit/Unit.h
-1
View File
@@ -1650,7 +1650,6 @@ class Unit : public WorldObject
void SendSetPlayHoverAnim(bool enable);
void SendMovementSetSplineAnim(Movement::AnimType anim);
bool IsLevitating() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY); }
bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING); }
src/server/game/Guilds/Guild.cpp
+2 -2
View File
@@ -2520,7 +2520,7 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max
{
uint32 count = 0;
WorldPacket data(SMSG_CALENDAR_FILTER_GUILD);
WorldPacket data(SMSG_CALENDAR_EVENT_INITIAL_INVITES);
data << uint32(count); // count placeholder
for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
@@ -2539,7 +2539,7 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max
if (member->GetGUID() != session->GetPlayer()->GetGUID() && level >= minLevel && level <= maxLevel && member->IsRankNotLower(minRank))
{
data << member->GetGUID().WriteAsPacked();
data << uint8(0); // unk
data << uint8(level);
++count;
}
}
src/server/game/Guilds/GuildFinderMgr.cpp
+1 -1
View File
@@ -317,7 +317,7 @@ void GuildFinderMgr::DeleteGuild(ObjectGuid const& guildId)
void GuildFinderMgr::SendApplicantListUpdate(Guild* guild)
{
WorldPacket data(SMSG_LF_GUILD_APPLICANT_LIST_UPDATED, 0);
WorldPacket data(SMSG_LF_GUILD_APPLICANT_LIST_CHANGED, 0);
if (Player* player = ObjectAccessor::FindPlayer(guild->GetLeaderGUID()))
player->SendDirectMessage(&data);
guild->BroadcastPacketToRank(&data, GR_OFFICER);
src/server/game/Handlers/AuctionHouseHandler.cpp
+17 -17
View File
@@ -78,23 +78,23 @@ void WorldSession::SendAuctionCommandResult(AuctionEntry* auction, uint32 action
}
//this function sends notification, if bidder is online
void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auctionId, ObjectGuid bidder, uint32 bidSum, uint32 diff, uint32 itemEntry)
void WorldSession::SendAuctionBidderNotification(uint32 /*location*/, uint32 /*auctionId*/, ObjectGuid /*bidder*/, uint32 /*bidSum*/, uint32 /*diff*/, uint32 /*itemEntry*/)
{
WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4));
data << uint32(location);
data << uint32(auctionId);
data << bidder;
data << uint64(bidSum);
data << uint64(diff);
data << uint32(itemEntry);
data << uint32(0);
SendPacket(&data);
//WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4));
//data << uint32(location);
//data << uint32(auctionId);
//data << bidder;
//data << uint64(bidSum);
//data << uint64(diff);
//data << uint32(itemEntry);
//data << uint32(0);
//SendPacket(&data);
}
// this void causes on client to display: "Your auction sold"
void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction)
{
WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, 40);
WorldPacket data(SMSG_AUCTION_CLOSED_NOTIFICATION, 40);
data << uint32(auction->Id);
data << uint64(auction->bid);
data << uint64(0); //unk
@@ -105,13 +105,13 @@ void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction)
SendPacket(&data);
}
void WorldSession::SendAuctionRemovedNotification(uint32 auctionId, uint32 itemEntry, int32 randomPropertyId)
void WorldSession::SendAuctionRemovedNotification(uint32 /*auctionId*/, uint32 /*itemEntry*/, int32 /*randomPropertyId*/)
{
WorldPacket data(SMSG_AUCTION_REMOVED_NOTIFICATION, (4+4+4));
data << uint32(auctionId);
data << uint32(itemEntry);
data << uint32(randomPropertyId);
SendPacket(&data);
//WorldPacket data(SMSG_AUCTION_REMOVED_NOTIFICATION, (4+4+4));
//data << uint32(auctionId);
//data << uint32(itemEntry);
//data << uint32(randomPropertyId);
//SendPacket(&data);
}
//this void creates new auction and adds auction to some auctionhouse
src/server/game/Handlers/BattleGroundHandler.cpp
+2 -14
View File
@@ -799,7 +799,7 @@ void WorldSession::HandleRequestRatedBattlefieldInfo(WorldPacket& recvData)
/// @Todo: perfome research in this case
/// The unk fields are related to arenas
WorldPacket data(SMSG_RATED_BG_STATS, 72);
WorldPacket data(SMSG_RATED_BATTLEFIELD_INFO, 72);
data << uint32(0); // BgWeeklyWins20vs20
data << uint32(0); // BgWeeklyPlayed20vs20
data << uint32(0); // BgWeeklyPlayed15vs15
@@ -848,17 +848,5 @@ void WorldSession::HandleRequestPvpReward(WorldPacket& /*recvData*/)
void WorldSession::HandleRequestRatedBgStats(WorldPacket& /*recvData*/)
{
TC_LOG_DEBUG("network", "WORLD: CMSG_REQUEST_RATED_BG_STATS");
WorldPacket data(SMSG_BATTLEFIELD_RATED_INFO, 29);
data << uint32(0); // Reward
data << uint8(3); // unk
data << uint32(0); // unk
data << uint32(0); // unk
data << _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, true);
data << uint32(0); // unk
data << uint32(0); // unk
data << _player->GetCurrency(CURRENCY_TYPE_CONQUEST_POINTS, true);
SendPacket(&data);
// deleted opcode
}
src/server/game/Handlers/BattlefieldHandler.cpp
+5 -5
View File
@@ -37,7 +37,7 @@
*/
void WorldSession::SendBfInvitePlayerToWar(ObjectGuid guid, uint32 zoneId, uint32 acceptTime)
{
WorldPacket data(SMSG_BATTLEFIELD_MGR_ENTRY_INVITE, 16);
WorldPacket data(SMSG_BF_MGR_ENTRY_INVITE, 16);
data.WriteBit(guid[5]);
data.WriteBit(guid[3]);
@@ -70,7 +70,7 @@ void WorldSession::SendBfInvitePlayerToWar(ObjectGuid guid, uint32 zoneId, uint3
*/
void WorldSession::SendBfInvitePlayerToQueue(ObjectGuid guid)
{
WorldPacket data(SMSG_BATTLEFIELD_MGR_QUEUE_INVITE, 5);
WorldPacket data(SMSG_BF_MGR_QUEUE_INVITE, 5);
data.WriteBit(1); // unk
data.WriteBit(0); // Has Warmup
@@ -117,7 +117,7 @@ void WorldSession::SendBfQueueInviteResponse(ObjectGuid guid, uint32 zoneId, boo
const bool hasSecondGuid = false;
const bool warmup = true;
WorldPacket data(SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE, 16);
WorldPacket data(SMSG_BF_MGR_QUEUE_REQUEST_RESPONSE, 16);
data.WriteBit(guid[1]);
data.WriteBit(guid[6]);
@@ -167,7 +167,7 @@ void WorldSession::SendBfEntered(ObjectGuid guid)
{
uint8 isAFK = _player->isAFK() ? 1 : 0;
WorldPacket data(SMSG_BATTLEFIELD_MGR_ENTERING, 11);
WorldPacket data(SMSG_BF_MGR_ENTERING, 11);
data.WriteBit(0); // unk
data.WriteBit(isAFK); // Clear AFK
@@ -205,7 +205,7 @@ void WorldSession::SendBfEntered(ObjectGuid guid)
*/
void WorldSession::SendBfLeaveMessage(ObjectGuid guid, BFLeaveReason reason /*= BF_LEAVE_REASON_EXITED*/)
{
WorldPacket data(SMSG_BATTLEFIELD_MGR_EJECTED, 11);
WorldPacket data(SMSG_BF_MGR_EJECTED, 11);
data.WriteBit(guid[2]);
data.WriteBit(guid[5]);
src/server/game/Handlers/CharacterHandler.cpp
+3 -3
View File
@@ -921,9 +921,9 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
pCurrChar->SetGuildLevel(0);
}
WorldPacket data(SMSG_LEARNED_DANCE_MOVES, 4+4);
data << uint64(0);
SendPacket(&data);
//WorldPacket data(SMSG_LEARNED_DANCE_MOVES, 4+4);
//data << uint64(0);
//SendPacket(&data);
WorldPackets::Query::HotfixNotifyBlob hotfixInfo;
hotfixInfo.Hotfixes = sDB2Manager.GetHotfixData();
src/server/game/Handlers/ChatHandler.cpp
+2 -8
View File
@@ -249,7 +249,7 @@ void WorldSession::HandleChatMessage(ChatMsg type, uint32 lang, std::string msg,
if (GetPlayer()->GetTeam() != receiver->GetTeam() && !HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHAT) && !receiver->IsInWhisperWhiteList(sender->GetGUID()))
{
SendWrongFactionNotice();
SendPlayerNotFoundNotice(target);
return;
}
@@ -628,7 +628,7 @@ void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recvData)
void WorldSession::SendPlayerNotFoundNotice(std::string const& name)
{
WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, name.size()+1);
WorldPacket data(SMSG_CHAT_PLAYER_NOTFOUND, name.size()+1);
data << name;
SendPacket(&data);
}
@@ -640,12 +640,6 @@ void WorldSession::SendPlayerAmbiguousNotice(std::string const& name)
SendPacket(&data);
}
void WorldSession::SendWrongFactionNotice()
{
WorldPacket data(SMSG_CHAT_WRONG_FACTION, 0);
SendPacket(&data);
}
void WorldSession::SendChatRestrictedNotice(ChatRestrictionType restriction)
{
WorldPacket data(SMSG_CHAT_RESTRICTED, 1);
src/server/game/Handlers/GroupHandler.cpp
+4 -8
View File
@@ -751,11 +751,7 @@ void WorldSession::HandleGroupRequestJoinUpdates(WorldPacket& /*recvData*/)
if (!group)
return;
WorldPacket data(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8);
data << uint8(group->GetGroupType());
data << uint32(group->GetMembersCount() - 1);
data << group->GetLeaderGUID();
SendPacket(&data);
// does some stuff. dunno what.
}
void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData)
@@ -909,7 +905,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
if (mask & GROUP_UPDATE_FLAG_PET_POWER_TYPE) // same for pets
mask |= (GROUP_UPDATE_FLAG_PET_CUR_POWER | GROUP_UPDATE_FLAG_PET_MAX_POWER);
data->Initialize(SMSG_PARTY_MEMBER_STATS, 80); // average value
data->Initialize(SMSG_PARTY_MEMBER_STATE, 80); // average value
*data << player->GetPackGUID();
*data << uint32(mask);
@@ -1142,7 +1138,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
Player* player = ObjectAccessor::FindConnectedPlayer(Guid);
if (!player)
{
WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
WorldPacket data(SMSG_PARTY_MEMBER_STATE, 3 + 4 + 2);
data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
data << Guid.WriteAsPacked();
data << uint32(GROUP_UPDATE_FLAG_STATUS);
@@ -1155,7 +1151,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
Powers powerType = player->getPowerType();
std::set<uint32> const& phases = player->GetPhases();
WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 4+2+2+2+1+2*6+8+1+8);
WorldPacket data(SMSG_PARTY_MEMBER_STATE, 4 + 2 + 2 + 2 + 1 + 2 * 6 + 8 + 1 + 8);
data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
data << player->GetPackGUID();
src/server/game/Handlers/GuildFinderHandler.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ void WorldSession::HandleGuildFinderGetApplications(WorldPacket& /*recvPacket*/)
std::list<MembershipRequest> applicatedGuilds = sGuildFinderMgr->GetAllMembershipRequestsForPlayer(GetPlayer()->GetGUID());
uint32 applicationsCount = applicatedGuilds.size();
WorldPacket data(SMSG_LF_GUILD_MEMBERSHIP_LIST_UPDATED, 7 + 54 * applicationsCount);
WorldPacket data(SMSG_LF_GUILD_APPLICATIONS, 7 + 54 * applicationsCount);
data.WriteBits(applicationsCount, 20);
if (applicationsCount > 0)
src/server/game/Handlers/ItemHandler.cpp
+1 -1
View File
@@ -332,7 +332,7 @@ void WorldSession::HandleReadItem(WorldPacket& recvData)
}
else
{
data.Initialize(SMSG_READ_ITEM_FAILED, 8);
data.Initialize(SMSG_READ_ITEM_RESULT_FAILED, 8);
TC_LOG_INFO("network", "STORAGE: Unable to read item");
_player->SendEquipError(msg, pItem, NULL);
}
src/server/game/Handlers/LFGHandler.cpp
+8 -8
View File
@@ -502,7 +502,7 @@ void WorldSession::SendLfgRoleChosen(ObjectGuid guid, uint8 roles)
TC_LOG_DEBUG("lfg", "SMSG_LFG_ROLE_CHOSEN %s guid: %s roles: %u",
GetPlayerInfo().c_str(), guid.ToString().c_str(), roles);
WorldPacket data(SMSG_LFG_ROLE_CHOSEN, 8 + 1 + 4);
WorldPacket data(SMSG_ROLE_CHOSEN, 8 + 1 + 4);
data << guid; // Guid
data << uint8(roles > 0); // Ready
data << uint32(roles); // Roles
@@ -716,7 +716,7 @@ void WorldSession::SendLfgBootProposalUpdate(lfg::LfgPlayerBoot const& boot)
GetPlayerInfo().c_str(), uint8(boot.inProgress), uint8(playerVote != lfg::LFG_ANSWER_PENDING),
uint8(playerVote == lfg::LFG_ANSWER_AGREE), boot.victim.ToString().c_str(), votesNum, agreeNum,
secsleft, lfg::LFG_GROUP_KICK_VOTES_NEEDED, boot.reason.c_str());
WorldPacket data(SMSG_LFG_BOOT_PROPOSAL_UPDATE, 1 + 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + boot.reason.length());
WorldPacket data(SMSG_LFG_BOOT_PLAYER, 1 + 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + boot.reason.length());
data << uint8(boot.inProgress); // Vote in progress
data << uint8(agreeNum >= lfg::LFG_GROUP_KICK_VOTES_NEEDED); // Did succeed
data << uint8(playerVote != lfg::LFG_ANSWER_PENDING); // Did Vote
@@ -831,13 +831,13 @@ void WorldSession::SendLfgUpdateProposal(lfg::LfgProposal const& proposal)
SendPacket(&data);
}
void WorldSession::SendLfgLfrList(bool update)
void WorldSession::SendLfgLfrList(bool /*update*/)
{
TC_LOG_DEBUG("lfg", "SMSG_LFG_LFR_LIST %s update: %u",
GetPlayerInfo().c_str(), update ? 1 : 0);
WorldPacket data(SMSG_LFG_UPDATE_SEARCH, 1);
data << uint8(update); // In Lfg Queue?
SendPacket(&data);
//TC_LOG_DEBUG("lfg", "SMSG_LFG_LFR_LIST %s update: %u",
// GetPlayerInfo().c_str(), update ? 1 : 0);
//WorldPacket data(SMSG_LFG_UPDATE_SEARCH, 1);
//data << uint8(update); // In Lfg Queue?
//SendPacket(&data);
}
void WorldSession::SendLfgDisabled()
src/server/game/Handlers/MiscHandler.cpp
+1 -18
View File
@@ -598,23 +598,6 @@ void WorldSession::HandleResurrectResponse(WorldPackets::Misc::ResurrectResponse
GetPlayer()->ResurrectUsingRequestData();
}
void WorldSession::SendAreaTriggerMessage(const char* Text, ...)
{
va_list ap;
char szStr [1024];
szStr[0] = '\0';
va_start(ap, Text);
vsnprintf(szStr, 1024, Text, ap);
va_end(ap);
uint32 length = strlen(szStr)+1;
WorldPacket data(SMSG_AREA_TRIGGER_MESSAGE, 4+length);
data << length;
data << szStr;
SendPacket(&data);
}
void WorldSession::HandleAreaTriggerOpcode(WorldPackets::Misc::AreaTrigger& packet)
{
TC_LOG_DEBUG("network", "CMSG_AREATRIGGER. Trigger ID: %u", packet.AreaTriggerID);
@@ -1425,7 +1408,7 @@ void WorldSession::SendSetPhaseShift(std::set<uint32> const& phaseIds, std::set<
{
ObjectGuid guid = _player->GetGUID();
WorldPacket data(SMSG_SET_PHASE_SHIFT_CHANGE, 1 + 8 + 4 + 4 + 4 + 4 + 2 * phaseIds.size() + 4 + terrainswaps.size() * 2);
WorldPacket data(SMSG_PHASE_SHIFT_CHANGE, 1 + 8 + 4 + 4 + 4 + 4 + 2 * phaseIds.size() + 4 + terrainswaps.size() * 2);
data.WriteBit(guid[2]);
data.WriteBit(guid[3]);
data.WriteBit(guid[1]);
src/server/game/Handlers/PetHandler.cpp
+2 -2
View File
@@ -431,7 +431,7 @@ void WorldSession::SendPetNameQuery(ObjectGuid petguid, uint32 petnumber)
Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, petguid);
if (!pet)
{
WorldPacket data(SMSG_PET_NAME_QUERY_RESPONSE, (4+1+4+1));
WorldPacket data(SMSG_QUERY_PET_NAME_RESPONSE, (4 + 1 + 4 + 1));
data << uint32(petnumber);
data << uint8(0);
data << uint32(0);
@@ -440,7 +440,7 @@ void WorldSession::SendPetNameQuery(ObjectGuid petguid, uint32 petnumber)
return;
}
WorldPacket data(SMSG_PET_NAME_QUERY_RESPONSE, (4+4+pet->GetName().size()+1));
WorldPacket data(SMSG_QUERY_PET_NAME_RESPONSE, (4 + 4 + pet->GetName().size() + 1));
data << uint32(petnumber);
data << pet->GetName();
data << uint32(pet->GetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP));
src/server/game/Handlers/SpellHandler.cpp
+2 -2
View File
@@ -581,7 +581,7 @@ void WorldSession::HandleMirrorImageDataRequest(WorldPacket& recvData)
void WorldSession::HandleUpdateProjectilePosition(WorldPacket& recvPacket)
{
TC_LOG_DEBUG("network", "WORLD: CMSG_UPDATE_PROJECTILE_POSITION");
TC_LOG_DEBUG("network", "WORLD: CMSG_MISSILE_TRAJECTORY_COLLISION");
ObjectGuid casterGuid;
uint32 spellId;
@@ -607,7 +607,7 @@ void WorldSession::HandleUpdateProjectilePosition(WorldPacket& recvPacket)
pos.Relocate(x, y, z);
spell->m_targets.ModDst(pos);
WorldPacket data(SMSG_SET_PROJECTILE_POSITION, 21);
WorldPacket data(SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION, 21);
data << casterGuid;
data << uint8(castCount);
data << float(x);
src/server/game/Handlers/TaxiHandler.cpp
+2 -2
View File
@@ -56,7 +56,7 @@ void WorldSession::SendTaxiStatus(ObjectGuid guid)
TC_LOG_DEBUG("network", "WORLD: current location %u ", curloc);
WorldPacket data(SMSG_TAXINODE_STATUS, 9);
WorldPacket data(SMSG_TAXI_NODE_STATUS, 9);
data << guid;
data << uint8(GetPlayer()->m_taxi.IsTaximaskNodeKnown(curloc) ? 1 : 0);
SendPacket(&data);
@@ -143,7 +143,7 @@ bool WorldSession::SendLearnNewTaxiNode(Creature* unit)
WorldPacket msg(SMSG_NEW_TAXI_PATH, 0);
SendPacket(&msg);
WorldPacket update(SMSG_TAXINODE_STATUS, 9);
WorldPacket update(SMSG_TAXI_NODE_STATUS, 9);
update << unit->GetGUID();
update << uint8(1);
SendPacket(&update);
src/server/game/Instances/InstanceScript.cpp
+8 -12
View File
@@ -560,32 +560,28 @@ bool InstanceScript::CheckAchievementCriteriaMeet(uint32 criteria_id, Player con
void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= NULL*/, uint8 param1 /*= 0*/, uint8 param2 /*= 0*/)
{
// size of this packet is at most 15 (usually less)
WorldPacket data(SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT, 15);
WorldPacket data(SMSG_INSTANCE_ENCOUNTER_ENGAGE_UNIT, 15);
data << uint32(type);
switch (type)
{
case ENCOUNTER_FRAME_ENGAGE:
case ENCOUNTER_FRAME_DISENGAGE:
case ENCOUNTER_FRAME_UPDATE_PRIORITY:
case ENCOUNTER_FRAME_ENGAGE: // SMSG_INSTANCE_ENCOUNTER_ENGAGE_UNIT
case ENCOUNTER_FRAME_DISENGAGE: // SMSG_INSTANCE_ENCOUNTER_DISENGAGE_UNIT
case ENCOUNTER_FRAME_UPDATE_PRIORITY: // SMSG_INSTANCE_ENCOUNTER_CHANGE_PRIORITY
if (!unit)
return;
data << unit->GetPackGUID();
data << uint8(param1);
break;
case ENCOUNTER_FRAME_ADD_TIMER:
case ENCOUNTER_FRAME_ENABLE_OBJECTIVE:
case ENCOUNTER_FRAME_DISABLE_OBJECTIVE:
case ENCOUNTER_FRAME_SET_COMBAT_RES_LIMIT:
case ENCOUNTER_FRAME_ADD_TIMER: // SMSG_INSTANCE_ENCOUNTER_TIMER_START
case ENCOUNTER_FRAME_ENABLE_OBJECTIVE: // SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_START
case ENCOUNTER_FRAME_DISABLE_OBJECTIVE: // SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_COMPLETE
data << uint8(param1);
break;
case ENCOUNTER_FRAME_UPDATE_OBJECTIVE:
case ENCOUNTER_FRAME_UPDATE_OBJECTIVE: // SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_UPDATE
data << uint8(param1);
data << uint8(param2);
break;
case ENCOUNTER_FRAME_UNK7:
case ENCOUNTER_FRAME_ADD_COMBAT_RES_LIMIT:
case ENCOUNTER_FRAME_RESET_COMBAT_RES_LIMIT:
default:
break;
}
src/server/game/Maps/Map.cpp
+1 -1
View File
@@ -3004,7 +3004,7 @@ bool InstanceMap::AddPlayerToMap(Player* player)
// players also become permanently bound when they enter
if (groupBind->perm)
{
WorldPacket data(SMSG_INSTANCE_LOCK_WARNING_QUERY, 10);
WorldPacket data(SMSG_PENDING_RAID_LOCK, 10);
data << uint32(60000);
data << uint32(i_data ? i_data->GetCompletedEncounterMask() : 0);
data << uint8(0);
src/server/game/Maps/MapManager.cpp
+3 -2
View File
@@ -155,9 +155,10 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
// can only enter in a raid group
if ((!group || !group->isRaidGroup()) && !sWorld->getBoolConfig(CONFIG_INSTANCE_IGNORE_RAID))
{
// probably there must be special opcode, because client has this string constant in GlobalStrings.lua
/// @todo this is not a good place to send the message
player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName);
WorldPacket data(SMSG_RAID_GROUP_ONLY);
data << uint32(0) << uint32(2);
player->GetSession()->SendPacket(&data);
TC_LOG_DEBUG("maps", "MAP: Player '%s' must be in a raid group to enter instance '%s'", player->GetName().c_str(), mapName);
return false;
}
src/server/game/Server/Packets/AuthenticationPackets.cpp
+1 -1
View File
@@ -273,7 +273,7 @@ uint8 const WherePacketHmac[] =
0x83, 0x95, 0x81, 0x69, 0xB0, 0x5A, 0xB4, 0x9D, 0xA8, 0x55, 0xFF, 0xFC, 0xEE, 0x58, 0x0A, 0x2F
};
WorldPackets::Auth::ConnectTo::ConnectTo() : ServerPacket(SMSG_REDIRECT_CLIENT, 8 + 4 + 256 + 1)
WorldPackets::Auth::ConnectTo::ConnectTo() : ServerPacket(SMSG_CONNECT_TO, 8 + 4 + 256 + 1)
{
HexStrToByteArray("F41DCB2D728CF3337A4FF338FA89DB01BBBE9C3B65E9DA96268687353E48B94C", Payload.PanamaKey);
Payload.Adler32 = 0xA0A66C10;
src/server/game/Server/Packets/CharacterPackets.h
+6 -6
View File
@@ -162,7 +162,7 @@ namespace WorldPackets
uint8 Race = 0;
};
EnumCharactersResult() : ServerPacket(SMSG_CHAR_ENUM) { }
EnumCharactersResult() : ServerPacket(SMSG_ENUM_CHARACTERS_RESULT) { }
WorldPacket const* Write() override;
@@ -199,7 +199,7 @@ namespace WorldPackets
class CharacterCreateResponse final : public ServerPacket
{
public:
CharacterCreateResponse() : ServerPacket(SMSG_CHAR_CREATE, 1) { }
CharacterCreateResponse() : ServerPacket(SMSG_CREATE_CHAR, 1) { }
WorldPacket const* Write() override;
@@ -219,7 +219,7 @@ namespace WorldPackets
class CharacterDeleteResponse final : public ServerPacket
{
public:
CharacterDeleteResponse(): ServerPacket(SMSG_CHAR_DELETE, 1) { }
CharacterDeleteResponse(): ServerPacket(SMSG_DELETE_CHAR, 1) { }
WorldPacket const* Write() override;
@@ -243,7 +243,7 @@ namespace WorldPackets
class CharacterRenameResult final : public ServerPacket
{
public:
CharacterRenameResult() : ServerPacket(SMSG_CHAR_RENAME, 20) { }
CharacterRenameResult() : ServerPacket(SMSG_CHARACTER_RENAME_RESULT, 20) { }
WorldPacket const* Write() override;
@@ -311,7 +311,7 @@ namespace WorldPackets
uint8 RaceID = RACE_NONE;
};
CharFactionChangeResult() : ServerPacket(SMSG_CHAR_FACTION_CHANGE, 20 + sizeof(CharFactionChangeDisplayInfo)) { }
CharFactionChangeResult() : ServerPacket(SMSG_CHAR_FACTION_CHANGE_RESULT, 20 + sizeof(CharFactionChangeDisplayInfo)) { }
WorldPacket const* Write() override;
@@ -334,7 +334,7 @@ namespace WorldPackets
class GenerateRandomCharacterNameResult final : public ServerPacket
{
public:
GenerateRandomCharacterNameResult() : ServerPacket(SMSG_RANDOMIZE_CHAR_NAME, 20) { }
GenerateRandomCharacterNameResult() : ServerPacket(SMSG_GENERATE_RANDOM_CHARACTER_NAME_RESULT, 20) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/ChatPackets.h
+2 -2
View File
@@ -134,7 +134,7 @@ namespace WorldPackets
class Chat final : public ServerPacket
{
public:
Chat() : ServerPacket(SMSG_MESSAGECHAT, 100) { }
Chat() : ServerPacket(SMSG_CHAT, 100) { }
void Initalize(ChatMsg chatType, Language language, WorldObject const* sender, WorldObject const* receiver, std::string message, uint32 achievementId = 0, std::string channelName = "", LocaleConstant locale = DEFAULT_LOCALE, std::string addonPrefix = "");
WorldPacket const* Write() override;
@@ -200,7 +200,7 @@ namespace WorldPackets
class PrintNotification final : public ServerPacket
{
public:
PrintNotification(std::string const& notifyText) : ServerPacket(SMSG_NOTIFICATION, 2 + notifyText.size()), NotifyText(notifyText) { }
PrintNotification(std::string const& notifyText) : ServerPacket(SMSG_PRINT_NOTIFICATION, 2 + notifyText.size()), NotifyText(notifyText) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/ClientConfigPackets.h
+1 -1
View File
@@ -54,7 +54,7 @@ namespace WorldPackets
class ClientCacheVersion final : public ServerPacket
{
public:
ClientCacheVersion() : ServerPacket(SMSG_CLIENTCACHE_VERSION, 4) { }
ClientCacheVersion() : ServerPacket(SMSG_CACHE_VERSION, 4) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/CombatLogPackets.h
+1 -1
View File
@@ -50,7 +50,7 @@ namespace WorldPackets
class EnvironmentalDamageLog final : public ServerPacket
{
public:
EnvironmentalDamageLog() : ServerPacket(SMSG_ENVIRONMENTALDAMAGELOG, 23) { }
EnvironmentalDamageLog() : ServerPacket(SMSG_ENVIRONMENTAL_DAMAGE_LOG, 23) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/CombatPackets.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ WorldPacket const* WorldPackets::Combat::AttackStart::Write()
return &_worldPacket;
}
WorldPackets::Combat::SAttackStop::SAttackStop(Unit const* attacker, Unit const* victim) : ServerPacket(SMSG_ATTACKSTOP, 16 + 16 + 1)
WorldPackets::Combat::SAttackStop::SAttackStop(Unit const* attacker, Unit const* victim) : ServerPacket(SMSG_ATTACK_STOP, 16 + 16 + 1)
{
Attacker = attacker->GetGUID();
if (victim)
src/server/game/Server/Packets/CombatPackets.h
+5 -5
View File
@@ -39,8 +39,8 @@ namespace WorldPackets
class AttackSwingError final : public ServerPacket
{
public:
AttackSwingError() : ServerPacket(SMSG_ATTACKSWING_ERROR, 4) { }
AttackSwingError(AttackSwingErr reason) : ServerPacket(SMSG_ATTACKSWING_ERROR, 4), Reason(reason) { }
AttackSwingError() : ServerPacket(SMSG_ATTACK_SWING_ERROR, 4) { }
AttackSwingError(AttackSwingErr reason) : ServerPacket(SMSG_ATTACK_SWING_ERROR, 4), Reason(reason) { }
WorldPacket const* Write() override;
@@ -58,7 +58,7 @@ namespace WorldPackets
class AttackStart final : public ServerPacket
{
public:
AttackStart() : ServerPacket(SMSG_ATTACKSTART, 16) { }
AttackStart() : ServerPacket(SMSG_ATTACK_START, 16) { }
WorldPacket const* Write() override;
@@ -69,7 +69,7 @@ namespace WorldPackets
class SAttackStop final : public ServerPacket
{
public:
SAttackStop() : ServerPacket(SMSG_ATTACKSTOP, 16 + 16 + 1) { }
SAttackStop() : ServerPacket(SMSG_ATTACK_STOP, 16 + 16 + 1) { }
SAttackStop(Unit const* attacker, Unit const* victim);
WorldPacket const* Write() override;
@@ -158,7 +158,7 @@ namespace WorldPackets
class AttackerStateUpdate final : public ServerPacket
{
public:
AttackerStateUpdate() : ServerPacket(SMSG_ATTACKERSTATEUPDATE, 70) { }
AttackerStateUpdate() : ServerPacket(SMSG_ATTACKER_STATE_UPDATE, 70) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/EquipmentSetPackets.h
+2 -2
View File
@@ -27,7 +27,7 @@ namespace WorldPackets
class EquipmentSetID final : public ServerPacket
{
public:
EquipmentSetID() : ServerPacket(SMSG_EQUIPMENT_SET_SAVED, 8 + 4) { }
EquipmentSetID() : ServerPacket(SMSG_EQUIPMENT_SET_ID, 8 + 4) { }
WorldPacket const* Write() override;
@@ -38,7 +38,7 @@ namespace WorldPackets
class LoadEquipmentSet final : public ServerPacket
{
public:
LoadEquipmentSet() : ServerPacket(SMSG_EQUIPMENT_SET_LIST, 4) { }
LoadEquipmentSet() : ServerPacket(SMSG_LOAD_EQUIPMENT_SET, 4) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/GuildPackets.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ void WorldPackets::Guild::QueryGuildInfo::Read()
}
WorldPackets::Guild::QueryGuildInfoResponse::QueryGuildInfoResponse()
: ServerPacket(SMSG_GUILD_QUERY_RESPONSE) { }
: ServerPacket(SMSG_QUERY_GUILD_INFO_RESPONSE) { }
WorldPacket const* WorldPackets::Guild::QueryGuildInfoResponse::Write()
{
src/server/game/Server/Packets/GuildPackets.h
+4 -4
View File
@@ -648,7 +648,7 @@ namespace WorldPackets
class GuildPartyState final : public ServerPacket
{
public:
GuildPartyState() : ServerPacket(SMSG_GUILD_PARTY_STATE_RESPONSE, 15) { }
GuildPartyState() : ServerPacket(SMSG_GUILD_PARTY_STATE, 15) { }
WorldPacket const* Write() override;
@@ -682,7 +682,7 @@ namespace WorldPackets
class GuildRewardList final : public ServerPacket
{
public:
GuildRewardList() : ServerPacket(SMSG_GUILD_REWARDS_LIST, 8) { }
GuildRewardList() : ServerPacket(SMSG_GUILD_REWARD_LIST, 8) { }
WorldPacket const* Write() override;
@@ -866,7 +866,7 @@ namespace WorldPackets
class GuildBankLogQueryResults final : public ServerPacket
{
public:
GuildBankLogQueryResults() : ServerPacket(SMSG_GUILD_BANK_LOG_QUERY_RESULT, 25) { }
GuildBankLogQueryResults() : ServerPacket(SMSG_GUILD_BANK_LOG_QUERY_RESULTS, 25) { }
WorldPacket const* Write() override;
@@ -1000,7 +1000,7 @@ namespace WorldPackets
class PlayerSaveGuildEmblem final : public ServerPacket
{
public:
PlayerSaveGuildEmblem() : ServerPacket(SMSG_SAVE_GUILD_EMBLEM, 4) { }
PlayerSaveGuildEmblem() : ServerPacket(SMSG_PLAYER_SAVE_GUILD_EMBLEM, 4) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/MailPackets.h
+1 -1
View File
@@ -137,7 +137,7 @@ namespace WorldPackets
class MailCommandResult final : public ServerPacket
{
public:
MailCommandResult() : ServerPacket(SMSG_SEND_MAIL_RESULT) { }
MailCommandResult() : ServerPacket(SMSG_MAIL_COMMAND_RESULT) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/MiscPackets.h
+5 -5
View File
@@ -33,7 +33,7 @@ namespace WorldPackets
class BindPointUpdate final : public ServerPacket
{
public:
BindPointUpdate() : ServerPacket(SMSG_BINDPOINTUPDATE, 20) { }
BindPointUpdate() : ServerPacket(SMSG_BIND_POINT_UPDATE, 20) { }
WorldPacket const* Write() override;
@@ -78,7 +78,7 @@ namespace WorldPackets
class LoginSetTimeSpeed final : public ServerPacket
{
public:
LoginSetTimeSpeed() : ServerPacket(SMSG_LOGIN_SETTIMESPEED, 20) { }
LoginSetTimeSpeed() : ServerPacket(SMSG_LOGIN_SET_TIME_SPEED, 20) { }
WorldPacket const* Write() override;
@@ -147,7 +147,7 @@ namespace WorldPackets
class TimeSyncRequest final : public ServerPacket
{
public:
TimeSyncRequest() : ServerPacket(SMSG_TIME_SYNC_REQ, 4) { }
TimeSyncRequest() : ServerPacket(SMSG_TIME_SYNC_REQUEST, 4) { }
WorldPacket const* Write() override;
@@ -289,7 +289,7 @@ namespace WorldPackets
class RaidDifficultySet final : public ServerPacket
{
public:
RaidDifficultySet() : ServerPacket(SMSG_SET_RAID_DIFFICULTY, 4 + 1) { }
RaidDifficultySet() : ServerPacket(SMSG_RAID_DIFFICULTY_SET, 4 + 1) { }
WorldPacket const* Write() override;
@@ -483,7 +483,7 @@ namespace WorldPackets
class LevelUpInfo final : public ServerPacket
{
public:
LevelUpInfo() : ServerPacket(SMSG_LEVELUP_INFO, 56) { }
LevelUpInfo() : ServerPacket(SMSG_LEVEL_UP_INFO, 56) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/NPCPackets.h
+2 -2
View File
@@ -115,7 +115,7 @@ namespace WorldPackets
class VendorInventory final : public ServerPacket
{
public:
VendorInventory() : ServerPacket(SMSG_LIST_INVENTORY, 600) { }
VendorInventory() : ServerPacket(SMSG_VENDOR_INVENTORY, 600) { }
WorldPacket const* Write() override;
@@ -162,7 +162,7 @@ namespace WorldPackets
class PlayerTabardVendorActivate final : public ServerPacket
{
public:
PlayerTabardVendorActivate() : ServerPacket(SMSG_TABARD_VENDOR_ACTIVATE, 16) { }
PlayerTabardVendorActivate() : ServerPacket(SMSG_PLAYER_TABARD_VENDOR_ACTIVATE, 16) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/PetitionPackets.h
+1 -1
View File
@@ -189,7 +189,7 @@ namespace WorldPackets
class TurnInPetitionResult final : public ServerPacket
{
public:
TurnInPetitionResult() : ServerPacket(SMSG_TURN_IN_PETITION_RESULTS, 4) { }
TurnInPetitionResult() : ServerPacket(SMSG_TURN_IN_PETITION_RESULT, 4) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/QueryPackets.h
+5 -5
View File
@@ -64,7 +64,7 @@ namespace WorldPackets
class QueryCreatureResponse final : public ServerPacket
{
public:
QueryCreatureResponse() : ServerPacket(SMSG_CREATURE_QUERY_RESPONSE, 76) { }
QueryCreatureResponse() : ServerPacket(SMSG_QUERY_CREATURE_RESPONSE, 76) { }
WorldPacket const* Write() override;
@@ -109,7 +109,7 @@ namespace WorldPackets
class QueryPlayerNameResponse final : public ServerPacket
{
public:
QueryPlayerNameResponse() : ServerPacket(SMSG_NAME_QUERY_RESPONSE, 60) { }
QueryPlayerNameResponse() : ServerPacket(SMSG_QUERY_PLAYER_NAME_RESPONSE, 60) { }
WorldPacket const* Write() override;
@@ -139,7 +139,7 @@ namespace WorldPackets
class QueryPageTextResponse final : public ServerPacket
{
public:
QueryPageTextResponse() : ServerPacket(SMSG_PAGE_TEXT_QUERY_RESPONSE, 15) { }
QueryPageTextResponse() : ServerPacket(SMSG_QUERY_PAGE_TEXT_RESPONSE, 15) { }
WorldPacket const* Write() override;
@@ -162,7 +162,7 @@ namespace WorldPackets
class QueryNPCTextResponse final : public ServerPacket
{
public:
QueryNPCTextResponse() : ServerPacket(SMSG_NPC_TEXT_UPDATE, 73) { }
QueryNPCTextResponse() : ServerPacket(SMSG_QUERY_NPC_TEXT_RESPONSE, 73) { }
WorldPacket const* Write() override;
@@ -246,7 +246,7 @@ namespace WorldPackets
class QueryGameObjectResponse final : public ServerPacket
{
public:
QueryGameObjectResponse() : ServerPacket(SMSG_GAMEOBJECT_QUERY_RESPONSE, 165) { }
QueryGameObjectResponse() : ServerPacket(SMSG_QUERY_GAME_OBJECT_RESPONSE, 165) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/QuestPackets.h
+7 -7
View File
@@ -59,7 +59,7 @@ namespace WorldPackets
class QuestGiverStatus final : public ServerPacket
{
public:
QuestGiverStatus() : ServerPacket(SMSG_QUESTGIVER_STATUS, 22) { }
QuestGiverStatus() : ServerPacket(SMSG_QUEST_GIVER_STATUS, 22) { }
WorldPacket const* Write() override;
@@ -69,7 +69,7 @@ namespace WorldPackets
class QuestGiverStatusMultiple final : public ServerPacket
{
public:
QuestGiverStatusMultiple() : ServerPacket(SMSG_QUESTGIVER_STATUS_MULTIPLE, 24) { }
QuestGiverStatusMultiple() : ServerPacket(SMSG_QUEST_GIVER_STATUS_MULTIPLE, 24) { }
WorldPacket const* Write() override;
@@ -172,7 +172,7 @@ namespace WorldPackets
class QueryQuestInfoResponse final : public ServerPacket
{
public:
QueryQuestInfoResponse() : ServerPacket(SMSG_QUEST_QUERY_RESPONSE, 1200) { }
QueryQuestInfoResponse() : ServerPacket(SMSG_QUERY_QUEST_INFO_RESPONSE, 1200) { }
WorldPacket const* Write() override;
@@ -247,7 +247,7 @@ namespace WorldPackets
class QuestGiverOfferRewardMessage final : public ServerPacket
{
public:
QuestGiverOfferRewardMessage() : ServerPacket(SMSG_QUESTGIVER_OFFER_REWARD, 600) { }
QuestGiverOfferRewardMessage() : ServerPacket(SMSG_QUEST_GIVER_OFFER_REWARD_MESSAGE, 600) { }
WorldPacket const* Write() override;
@@ -278,7 +278,7 @@ namespace WorldPackets
class QuestGiverQuestComplete final : public ServerPacket
{
public:
QuestGiverQuestComplete() : ServerPacket(SMSG_QUESTGIVER_QUEST_COMPLETE, 40) { }
QuestGiverQuestComplete() : ServerPacket(SMSG_QUEST_GIVER_QUEST_COMPLETE, 40) { }
WorldPacket const* Write() override;
@@ -318,7 +318,7 @@ namespace WorldPackets
class QuestGiverQuestDetails final : public ServerPacket
{
public:
QuestGiverQuestDetails() : ServerPacket(SMSG_QUESTGIVER_QUEST_DETAILS, 1000) { }
QuestGiverQuestDetails() : ServerPacket(SMSG_QUEST_GIVER_QUEST_DETAILS, 1000) { }
WorldPacket const* Write() override;
@@ -363,7 +363,7 @@ namespace WorldPackets
class QuestGiverRequestItems final : public ServerPacket
{
public:
QuestGiverRequestItems() : ServerPacket(SMSG_QUESTGIVER_REQUEST_ITEMS, 300) { }
QuestGiverRequestItems() : ServerPacket(SMSG_QUEST_GIVER_REQUEST_ITEMS, 300) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/SocialPackets.h
+1 -1
View File
@@ -69,7 +69,7 @@ namespace WorldPackets
class FriendStatus final : public ServerPacket
{
public:
FriendStatus() : ServerPacket(SMSG_CONTACT_STATUS, 38) { }
FriendStatus() : ServerPacket(SMSG_FRIEND_STATUS, 38) { }
void Initialize(ObjectGuid const& guid, FriendsResult result, FriendInfo const& friendInfo);
src/server/game/Server/Packets/SpellPackets.h
+3 -3
View File
@@ -50,7 +50,7 @@ namespace WorldPackets
int32 ModCooldown = 0; ///< Reduced Cooldown in ms
};
CategoryCooldown() : ServerPacket(SMSG_SPELL_CATEGORY_COOLDOWN, 4) { }
CategoryCooldown() : ServerPacket(SMSG_CATEGORY_COOLDOWN, 4) { }
WorldPacket const* Write() override;
@@ -60,7 +60,7 @@ namespace WorldPackets
class SendKnownSpells final : public ServerPacket
{
public:
SendKnownSpells() : ServerPacket(SMSG_INITIAL_SPELLS, 5) { }
SendKnownSpells() : ServerPacket(SMSG_SEND_KNOWN_SPELLS, 5) { }
WorldPacket const* Write() override;
@@ -71,7 +71,7 @@ namespace WorldPackets
class UpdateActionButtons final : public ServerPacket
{
public:
UpdateActionButtons() : ServerPacket(SMSG_ACTION_BUTTONS, MAX_ACTION_BUTTONS * 8 + 1)
UpdateActionButtons() : ServerPacket(SMSG_UPDATE_ACTION_BUTTONS, MAX_ACTION_BUTTONS * 8 + 1)
{
std::memset(ActionButtons, 0, sizeof(ActionButtons));
}
src/server/game/Server/Packets/TalentPackets.h
+1 -1
View File
@@ -41,7 +41,7 @@ namespace WorldPackets
class UpdateTalentData final : public ServerPacket
{
public:
UpdateTalentData() : ServerPacket(SMSG_TALENTS_INFO, 2+4+4+4+12) { }
UpdateTalentData() : ServerPacket(SMSG_UPDATE_TALENT_DATA, 2+4+4+4+12) { }
WorldPacket const* Write() override;
src/server/game/Server/Packets/WhoPackets.h
+1 -1
View File
@@ -39,7 +39,7 @@ namespace WorldPackets
class WhoIsResponse final : public ServerPacket
{
public:
WhoIsResponse() : ServerPacket(SMSG_WHOIS, 2) { }
WhoIsResponse() : ServerPacket(SMSG_WHO_IS, 2) { }
WorldPacket const* Write() override;
src/server/game/Server/Protocol/Opcodes.cpp
+189 -284
View File
File diff suppressed because it is too large Load Diff
src/server/game/Server/Protocol/Opcodes.h
+760 -890
View File
File diff suppressed because it is too large Load Diff
src/server/game/Server/WorldSession.h
-2
View File
@@ -581,7 +581,6 @@ class WorldSession
void SendNotification(uint32 stringId, ...);
void SendPetNameInvalid(uint32 error, std::string const& name, DeclinedName *declinedName);
void SendPartyResult(PartyOperation operation, std::string const& member, PartyResult res, uint32 val = 0);
void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2, 3);
void SendSetPhaseShift(std::set<uint32> const& phaseIds, std::set<uint32> const& terrainswaps, std::set<uint32> const& worldMapAreaSwaps);
void SendQueryTimeResponse();
@@ -1135,7 +1134,6 @@ class WorldSession
void HandleChatMessageEmoteOpcode(WorldPackets::Chat::ChatMessageEmote& packet);
void SendPlayerNotFoundNotice(std::string const& name);
void SendPlayerAmbiguousNotice(std::string const& name);
void SendWrongFactionNotice();
void SendChatRestrictedNotice(ChatRestrictionType restriction);
void HandleTextEmoteOpcode(WorldPackets::Chat::CTextEmote& packet);
void HandleChatIgnoredOpcode(WorldPacket& recvPacket);
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+1 -1
View File
@@ -5415,7 +5415,7 @@ void AuraEffect::HandleAuraSetVehicle(AuraApplication const* aurApp, uint8 mode,
if (target->GetTypeId() != TYPEID_PLAYER)
return;
WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, target->GetPackGUID().size()+4);
WorldPacket data(SMSG_SET_VEHICLE_REC_ID, target->GetPackGUID().size() + 4);
data << target->GetPackGUID();
data << uint32(apply ? vehicleId : 0);
target->SendMessageToSet(&data, true);
src/server/game/Spells/Spell.cpp
+2 -2
View File
@@ -4247,7 +4247,7 @@ void Spell::SendChannelUpdate(uint32 time)
m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, 0);
}
WorldPacket data(SMSG_CHANNEL_UPDATE, 8+4);
WorldPacket data(SMSG_SPELL_CHANNEL_UPDATE, 8 + 4);
data << m_caster->GetPackGUID();
data << uint32(time);
@@ -4261,7 +4261,7 @@ void Spell::SendChannelStart(uint32 duration)
if (m_UniqueTargetInfo.size() + m_UniqueGOTargetInfo.size() == 1) // this is for TARGET_SELECT_CATEGORY_NEARBY
channelTarget = !m_UniqueTargetInfo.empty() ? m_UniqueTargetInfo.front().targetGUID : m_UniqueGOTargetInfo.front().targetGUID;
WorldPacket data(SMSG_CHANNEL_START, (8+4+4));
WorldPacket data(SMSG_SPELL_CHANNEL_START, (8 + 4 + 4));
data << m_caster->GetPackGUID();
data << uint32(m_spellInfo->Id);
data << uint32(duration);
src/server/game/Spells/SpellEffects.cpp
+2 -2
View File
@@ -2340,7 +2340,7 @@ void Spell::EffectDispel(SpellEffIndex effIndex)
if (success_list.empty())
return;
WorldPacket dataSuccess(SMSG_SPELL_DISPEL_LOG, 8+8+4+1+4+success_list.size()*5);
WorldPacket dataSuccess(SMSG_SPELL_DISPELL_LOG, 8 + 8 + 4 + 1 + 4 + success_list.size() * 5);
// Send packet header
dataSuccess << unitTarget->GetPackGUID(); // Victim GUID
dataSuccess << m_caster->GetPackGUID(); // Caster GUID
@@ -5160,7 +5160,7 @@ void Spell::EffectStealBeneficialBuff(SpellEffIndex /*effIndex*/)
if (success_list.empty())
return;
WorldPacket dataSuccess(SMSG_SPELLSTEALLOG, 8+8+4+1+4+damage*5);
WorldPacket dataSuccess(SMSG_SPELL_DISPELL_LOG, 8 + 8 + 4 + 1 + 4 + damage * 5);
dataSuccess << unitTarget->GetPackGUID(); // Victim GUID
dataSuccess << m_caster->GetPackGUID(); // Caster GUID
dataSuccess << uint32(m_spellInfo->Id); // dispel spell id
src/server/game/World/World.cpp
+2 -2
View File
@@ -442,7 +442,7 @@ void World::LoadConfigSettings(bool reload)
sSupportMgr->SetSuggestionSystemStatus(m_bool_configs[CONFIG_SUPPORT_SUGGESTIONS_ENABLED]);
}
m_float_configs[CONFIG_CHANCE_OF_GM_SURVEY] = sConfigMgr->GetFloatDefault("Support.ChanceOfGMSurvey", 50.0f);
///- Get string for new logins (newly created characters)
SetNewCharString(sConfigMgr->GetStringDefault("PlayerStart.String", ""));
@@ -2746,7 +2746,7 @@ void World::ShutdownCancel()
/// Send a server message to the user(s)
void World::SendServerMessage(ServerMessageType type, const char *text, Player* player)
{
WorldPacket data(SMSG_SERVER_MESSAGE, 50); // guess size
WorldPacket data(SMSG_CHAT_SERVER_MESSAGE, 50); // guess size
data << uint32(type);
if (type <= SERVER_MSG_STRING)
data << text;
src/server/scripts/Commands/cs_debug.cpp
+4 -3
View File
@@ -33,6 +33,7 @@ EndScriptData */
#include "GossipDef.h"
#include "Transport.h"
#include "Language.h"
#include "MovementPackets.h"
#include <fstream>
@@ -1343,9 +1344,9 @@ public:
target->DestroyForNearbyPlayers(); // Force new SMSG_UPDATE_OBJECT:CreateObject
else
{
WorldPacket data(SMSG_MOVE_UPDATE);
target->WriteMovementInfo(data);
target->SendMessageToSet(&data, true);
WorldPackets::Movement::MoveUpdate moveUpdate;
moveUpdate.movementInfo = &target->m_movementInfo;
target->SendMessageToSet(moveUpdate.Write(), true);
}
handler->PSendSysMessage(LANG_MOVEFLAGS_SET, target->GetUnitMovementFlags(), target->GetExtraUnitMovementFlags());
src/server/scripts/Commands/cs_send.cpp
+2 -3
View File
@@ -271,9 +271,8 @@ public:
}
/// - Send the message
// Use SendAreaTriggerMessage for fastest delivery.
player->GetSession()->SendAreaTriggerMessage("%s", msgStr);
player->GetSession()->SendAreaTriggerMessage("|cffff0000[Message from administrator]:|r");
player->GetSession()->SendNotification("%s", msgStr);
player->GetSession()->SendNotification("|cffff0000[Message from administrator]:|r");
// Confirmation message
std::string nameLink = handler->GetNameLink(player);
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+2 -2
View File
@@ -746,7 +746,7 @@ class npc_gunship : public CreatureScript
{
cannon->CastSpell(cannon, SPELL_EJECT_ALL_PASSENGERS_BELOW_ZERO, TRIGGERED_FULL_MASK);
WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, cannon->GetPackGUID().size() + 4);
WorldPacket data(SMSG_SET_VEHICLE_REC_ID, cannon->GetPackGUID().size() + 4);
data << cannon->GetPackGUID();
data << uint32(0);
cannon->SendMessageToSet(&data, true);
@@ -2101,7 +2101,7 @@ class spell_igb_overheat : public SpellScriptLoader
{
if (Player* player = passenger->ToPlayer())
{
WorldPacket data(SMSG_CLIENT_CONTROL_UPDATE, GetUnitOwner()->GetPackGUID().size() + 1);
WorldPacket data(SMSG_CONTROL_UPDATE, GetUnitOwner()->GetPackGUID().size() + 1);
data << GetUnitOwner()->GetPackGUID();
data << uint8(value);
player->GetSession()->SendPacket(&data);