diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 0e7a7e081..7593d9c10 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -903,7 +903,7 @@ void InitializeOpcodes() //OPCODE(SMSG_CHARACTER_PROFILE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_CHARACTER_PROFILE_REALM_CONNECTED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); OPCODE(SMSG_DEFENSE_MESSAGE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(SMSG_INSTANCE_DIFFICULTY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(SMSG_WORLD_SERVER_INFO, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(MSG_GM_RESETINSTANCELIMIT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); OPCODE(SMSG_MOTD, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index 9d8a2dc14..ad59c7c90 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -887,7 +887,7 @@ enum Opcodes SMSG_CHARACTER_PROFILE = 0x1339, SMSG_CHARACTER_PROFILE_REALM_CONNECTED = 0x133A, SMSG_DEFENSE_MESSAGE = 0x0314, // 4.3.4 15595 - SMSG_INSTANCE_DIFFICULTY = 0x133C, + SMSG_WORLD_SERVER_INFO = 0x31A2, // 4.3.4 15595 MSG_GM_RESETINSTANCELIMIT = 0x133D, SMSG_MOTD = 0x0A35, // 4.3.4 15595 SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY = 0x133F, diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 564298e0e..c8ae55cdb 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -20578,9 +20578,24 @@ void Player::SendInitialPacketsBeforeAddToMap() SendTalentsInfoData(false); - data.Initialize(SMSG_INSTANCE_DIFFICULTY, 4 + 4); + data.Initialize(SMSG_WORLD_SERVER_INFO, 1 + 1 + 4 + 4); + data.WriteBit(0); // HasRestrictedLevel + data.WriteBit(0); // HasRestrictedMoney + data.WriteBit(0); // IneligibleForLoot + + //if (IneligibleForLoot) + // data << uint32(0); // EncounterMask + + data << uint8(0); // IsOnTournamentRealm + + //if (HasRestrictedMoney) + // data << uint32(100000); // RestrictedMoney (starter accounts) + //if (HasRestrictedLevel) + // data << uint32(20); // RestrictedLevel (starter accounts) + + data << uint32(sWorld.GetNextWeeklyQuestsResetTime() - WEEK); // LastWeeklyReset (not instance reset) data << uint32(GetMap()->GetDifficulty()); - GetSession()->SendPacket(&data); + GetSession()->SendPacket(&data); SendInitialSpells(); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 268ccf212..00ea6a325 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12769" + #define REVISION_NR "12770" #endif // __REVISION_NR_H__