mirror of
https://github.com/mangosfour/server.git
synced 2025-12-26 07:37:02 +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
|
|
@ -26,8 +26,6 @@
|
|||
|
||||
void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
|
||||
{
|
||||
CHECK_PACKET_SIZE(recvPacket, 8);
|
||||
|
||||
uint64 guid;
|
||||
Player *pl;
|
||||
Player *plTarget;
|
||||
|
|
@ -57,8 +55,6 @@ void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
|
|||
|
||||
void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
|
||||
{
|
||||
CHECK_PACKET_SIZE(recvPacket, 8);
|
||||
|
||||
//sLog.outDebug( "WORLD: received CMSG_DUEL_CANCELLED" );
|
||||
|
||||
// no duel requested
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue