mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 04:37:00 +00:00
Merge commit 'origin/master' into 320
Conflicts: src/game/CharacterHandler.cpp src/game/DuelHandler.cpp src/game/ItemHandler.cpp src/game/Mail.cpp src/game/MiscHandler.cpp src/game/MovementHandler.cpp src/game/TaxiHandler.cpp src/game/WorldSession.h src/game/WorldSocket.cpp
This commit is contained in:
commit
f553cf2887
38 changed files with 181 additions and 755 deletions
|
|
@ -127,8 +127,6 @@ void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32
|
|||
|
||||
void WorldSession::HandleNameQueryOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
CHECK_PACKET_SIZE(recv_data, 8);
|
||||
|
||||
uint64 guid;
|
||||
|
||||
recv_data >> guid;
|
||||
|
|
@ -152,8 +150,6 @@ void WorldSession::HandleQueryTimeOpcode( WorldPacket & /*recv_data*/ )
|
|||
/// Only _static_ data send in this packet !!!
|
||||
void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
CHECK_PACKET_SIZE(recv_data,4+8);
|
||||
|
||||
uint32 entry;
|
||||
recv_data >> entry;
|
||||
|
||||
|
|
@ -221,8 +217,6 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
|
|||
/// Only _static_ data send in this packet !!!
|
||||
void WorldSession::HandleGameObjectQueryOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
CHECK_PACKET_SIZE(recv_data,4+8);
|
||||
|
||||
uint32 entryID;
|
||||
recv_data >> entryID;
|
||||
|
||||
|
|
@ -333,8 +327,6 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
|
|||
|
||||
void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
CHECK_PACKET_SIZE(recv_data, 4 + 8);
|
||||
|
||||
uint32 textID;
|
||||
uint64 guid;
|
||||
|
||||
|
|
@ -421,8 +413,6 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data )
|
|||
|
||||
void WorldSession::HandlePageTextQueryOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
CHECK_PACKET_SIZE(recv_data, 4);
|
||||
|
||||
uint32 pageID;
|
||||
|
||||
recv_data >> pageID;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue