diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-12-27 17:52:11 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-12-27 17:52:11 +0000 |
| commit | 91136ea55fe308db37d260969da60c488cf74b81 (patch) | |
| tree | dc11b3024d73edd8a317b0d7b1d09261ecd11bbf /src/server/game/Server | |
| parent | 3ee6ec258a3ccf3dfe1d74eec9adbf8bbc2843f6 (diff) | |
| parent | 7fe2d7309ae3b850f3a7c75fc9bb6ec18bea00a1 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/DataStores/DBCEnums.h
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 79c566e08a5..3a370333925 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -631,7 +631,7 @@ void OpcodeTable::Initialize() DEFINE_OPCODE_HANDLER(SMSG_AREA_TRIGGER_MESSAGE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_AREA_TRIGGER_MOVEMENT_UPDATE, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_ARENA_ERROR, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - DEFINE_OPCODE_HANDLER(SMSG_ARENA_OPPONENT_UPDATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + DEFINE_OPCODE_HANDLER(SMSG_ARENA_UNIT_DESTROYED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_ARENA_TEAM_CHANGE_FAILED_QUEUED, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_ARENA_TEAM_COMMAND_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_ARENA_TEAM_EVENT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index be0b8ad4d89..2c467ff7099 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -680,7 +680,7 @@ enum Opcodes SMSG_AREA_TRIGGER_MESSAGE = 0x4505, SMSG_AREA_TRIGGER_MOVEMENT_UPDATE = 0x3DB1, SMSG_ARENA_ERROR = 0x2D17, - SMSG_ARENA_OPPONENT_UPDATE = 0x2637, + SMSG_ARENA_UNIT_DESTROYED = 0x2637, SMSG_ARENA_TEAM_CHANGE_FAILED_QUEUED = 0x6E34, SMSG_ARENA_TEAM_COMMAND_RESULT = 0x39B3, SMSG_ARENA_TEAM_EVENT = 0x0617, |