diff options
19 files changed, 27 insertions, 14 deletions
diff --git a/sql/updates/8770_world_areatrigger_scripts.sql b/sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql index 044725b3a5f..044725b3a5f 100644 --- a/sql/updates/8770_world_areatrigger_scripts.sql +++ b/sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql diff --git a/sql/updates/8770_world_script_waypoints.sql b/sql/updates/3.3.3a_old/8770_world_script_waypoints.sql index c2418f6da33..c2418f6da33 100644 --- a/sql/updates/8770_world_script_waypoints.sql +++ b/sql/updates/3.3.3a_old/8770_world_script_waypoints.sql diff --git a/sql/updates/8770_world_scriptname.sql b/sql/updates/3.3.3a_old/8770_world_scriptname.sql index e173f7e41f2..e173f7e41f2 100644 --- a/sql/updates/8770_world_scriptname.sql +++ b/sql/updates/3.3.3a_old/8770_world_scriptname.sql diff --git a/sql/updates/8790_world_locales_item_set_names.sql b/sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql index 4f6015ac749..4f6015ac749 100644 --- a/sql/updates/8790_world_locales_item_set_names.sql +++ b/sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql diff --git a/sql/updates/8816_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql index 67d01d19b77..67d01d19b77 100644 --- a/sql/updates/8816_world_spell_bonus_data.sql +++ b/sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql diff --git a/sql/updates/8821_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8821_world_spell_dbc.sql index 903a932edaf..903a932edaf 100644 --- a/sql/updates/8821_world_spell_dbc.sql +++ b/sql/updates/3.3.3a_old/8821_world_spell_dbc.sql diff --git a/sql/updates/8836_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql index 64c3c66c9e1..64c3c66c9e1 100644 --- a/sql/updates/8836_world_spell_linked_spell.sql +++ b/sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql diff --git a/sql/updates/8842_world_script_texts.sql b/sql/updates/3.3.3a_old/8842_world_script_texts.sql index 617b61a694f..617b61a694f 100644 --- a/sql/updates/8842_world_script_texts.sql +++ b/sql/updates/3.3.3a_old/8842_world_script_texts.sql diff --git a/sql/updates/8842_world_scriptname.sql b/sql/updates/3.3.3a_old/8842_world_scriptname.sql index 5ef8e4b6aa9..5ef8e4b6aa9 100644 --- a/sql/updates/8842_world_scriptname.sql +++ b/sql/updates/3.3.3a_old/8842_world_scriptname.sql diff --git a/sql/updates/8843_world_scriptname.sql b/sql/updates/3.3.3a_old/8843_world_scriptname.sql index 4517544d99d..4517544d99d 100644 --- a/sql/updates/8843_world_scriptname.sql +++ b/sql/updates/3.3.3a_old/8843_world_scriptname.sql diff --git a/sql/updates/3.3.5a_old/CMakeLists.txt b/sql/updates/3.3.5a_old/CMakeLists.txt new file mode 100644 index 00000000000..63cb6eab23e --- /dev/null +++ b/sql/updates/3.3.5a_old/CMakeLists.txt @@ -0,0 +1,3 @@ +FILE(GLOB _SQL_335 *.sql) + +INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.5a_old) diff --git a/sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql b/sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql new file mode 100644 index 00000000000..c6622d5ce1e --- /dev/null +++ b/sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql @@ -0,0 +1,3 @@ +UPDATE `realmlist` SET `gamebuild`=12340 WHERE `id`=1; +ALTER TABLE `realmlist` CHANGE COLUMN `gamebuild` `gamebuild` int(11) unsigned NOT NULL default '12340'; + diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 0d2d6cd6bfa..fca7e740f90 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(3.1.3_old) add_subdirectory(3.2.2a_old) add_subdirectory(3.3.2_old) add_subdirectory(3.3.3a_old) +add_subdirectory(3.3.5a_old) FILE(GLOB _SQL_UPDATES *.sql) diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h index eb6e4abfb08..802b7b78f1b 100644 --- a/src/server/authserver/Authentication/AuthCodes.h +++ b/src/server/authserver/Authentication/AuthCodes.h @@ -80,7 +80,7 @@ enum LoginResult //3.3.2 build 11403 //3.3.3a build 11723 -#define POST_BC_ACCEPTED_CLIENT_BUILD {11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0} +#define POST_BC_ACCEPTED_CLIENT_BUILD {12340, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0} #define PRE_BC_ACCEPTED_CLIENT_BUILD {5875, 6005, 0} #define POST_BC_EXP_FLAG 0x2 diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index bc127cb309c..4ddccd735f5 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -592,13 +592,13 @@ void LoadDBCStores(const std::string& dataPath) } // Check loaded DBC files proper version - if (!sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.3a - !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.3a - !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.3a - !sItemStore.LookupEntry(54860) || // last gem property added in 3.3.3a - !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.3a - !sMapStore.LookupEntry(724) || // last map added in 3.3.3a - !sSpellStore.LookupEntry(76567) ) // last client known item added in 3.3.3a + if (!sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.5a + !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.5a + !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.5a + !sItemStore.LookupEntry(56806) || // last gem property added in 3.3.5a + !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.5a + !sMapStore.LookupEntry(724) || // last map added in 3.3.5a + !sSpellStore.LookupEntry(80864) ) // last client known item added in 3.3.5a { sLog.outError("\nYou have _outdated_ DBC files. Please extract correct versions from current using client."); exit(1); diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 5f819375677..1b334967688 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -21,7 +21,7 @@ #ifndef _UPDATEFIELDS_AUTO_H #define _UPDATEFIELDS_AUTO_H -// Auto generated for version 3, 3, 3, 11723 +// Auto generated for version 3, 3, 3, 12340 enum EObjectFields { diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index dbed6e93006..1f40fcf28e9 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -43,7 +43,8 @@ enum SocialFlag { SOCIAL_FLAG_FRIEND = 0x01, SOCIAL_FLAG_IGNORED = 0x02, - SOCIAL_FLAG_MUTED = 0x04 // guessed + SOCIAL_FLAG_MUTED = 0x04, // guessed + SOCIAL_FLAG_RAF = 0x08 // Recruit A Friend }; struct FriendInfo @@ -112,7 +113,7 @@ enum FriendsResult }; #define SOCIALMGR_FRIEND_LIMIT 50 -#define SOCIALMGR_IGNORE_LIMIT 25 +#define SOCIALMGR_IGNORE_LIMIT 50 class PlayerSocial { diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 6e2fb0b6db1..44a06ddb8d3 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1244,7 +1244,7 @@ enum Opcodes SMSG_ITEM_REFUND_RESULT = 0x4B5, // refund item result CMSG_CORPSE_MAP_POSITION_QUERY = 0x4B6, // CMSG, uint32 SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE = 0x4B7, // SMSG, 3*float+float - CMSG_LFG_SET_ROLES_2 = 0x4B8, // not found + UMSG_UNKNOWN_1208 = 0x4B8, // not found UMSG_UNKNOWN_1209 = 0x4B9, // not found CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP = 0x4BA, // CMSG, uint64, lua: CalendarContextEventSignUp SMSG_CALENDAR_ACTION_PENDING = 0x4BB, // SMSG, calendar related EVENT_CALENDAR_ACTION_PENDING @@ -1343,7 +1343,11 @@ enum Opcodes SMSG_UNKNOWN_1304 = 0x518, // something with player movement (move event 58?), speed packet UMSG_UNKNOWN_1305 = 0x519, // not found UMSG_UNKNOWN_1306 = 0x51A, // not found - NUM_MSG_TYPES = 0x51B + CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND = 0x51B, // lua: CommentatorSetSkirmishMatchmakingMode/CommentatorRequestSkirmishQueueData/CommentatorRequestSkirmishMode/CommentatorStartSkirmishMatch + SMSG_UNKNOWN_1308 = 0x51C, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST, CGCommentator::QueueNode + SMSG_UNKNOWN_1309 = 0x51D, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST + SMSG_UNKNOWN_1310 = 0x51E, // some compressed packet? + NUM_MSG_TYPES = 0x51F }; /// Player state diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index ac4900a0fd3..f7b128fb761 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -768,7 +768,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) // NOTE: ATM the socket is singlethread, have this in mind ... uint8 digest[20]; uint32 clientSeed; - uint32 unk2, unk3; + uint32 unk2, unk3, unk5, unk6, unk7; uint64 unk4; uint32 BuiltNumberClient; uint32 id, security; @@ -797,6 +797,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) recvPacket >> account; recvPacket >> unk3; recvPacket >> clientSeed; + recvPacket >> unk5 >> unk6 >> unk7; recvPacket >> unk4; recvPacket.read (digest, 20); |