From 5ccb2ecb048607d11240fb42c21c2efa7a412c77 Mon Sep 17 00:00:00 2001 From: zamalaev Date: Wed, 19 Feb 2020 13:49:55 +0000 Subject: [PATCH] CMSG_AREATRIGGER 5.4.7 (18019) --- src/game/Server/Opcodes.h | 2 +- src/game/WorldHandlers/MiscHandler.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index 8db08f9ef..92d2b1fd3 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -246,7 +246,7 @@ enum Opcodes CMSG_GAMEOBJ_USE = 0x4E17, // 4.3.4 15595 CMSG_DESTROY_ITEMS = 0x10B3, SMSG_GAMEOBJECT_CUSTOM_ANIM = 0x4936, // 4.3.4 15595 - CMSG_AREATRIGGER = 0x0937, // 4.3.4 15595 + CMSG_AREATRIGGER = 0x155A, // 5.4.7 18019 CMSG_MOVE_START_FORWARD = 0x13C9, // 5.4.1 17538 CMSG_MOVE_START_BACKWARD = 0x12C0, // 5.4.1 17538 CMSG_MOVE_STOP = 0x0649, // 5.4.1 17538 diff --git a/src/game/WorldHandlers/MiscHandler.cpp b/src/game/WorldHandlers/MiscHandler.cpp index e41ee282c..dd075c7df 100644 --- a/src/game/WorldHandlers/MiscHandler.cpp +++ b/src/game/WorldHandlers/MiscHandler.cpp @@ -790,14 +790,18 @@ void WorldSession::HandleReturnToGraveyard(WorldPacket& /*recvPacket*/) } } -void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data) +void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData) { DEBUG_LOG("WORLD: Received opcode CMSG_AREATRIGGER"); uint32 Trigger_ID; + uint8 unk1, unk2; + recvData >> Trigger_ID; + unk1 = recvData.ReadBit(); + unk2 = recvData.ReadBit(); - recv_data >> Trigger_ID; DEBUG_LOG("Trigger ID: %u", Trigger_ID); + Player* player = GetPlayer(); if (player->IsTaxiFlying())