Merge pull request #4761 from Gyx/4.x

Gyx 4.x update

5 files changed, 15 insertions, 14 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index a5c224f7390..efa8c4ba7bc 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -60,7 +60,7 @@ CREATE TABLE `account` (
   `locked` tinyint(3) unsigned NOT NULL default '0',
   `last_login` timestamp NOT NULL default '0000-00-00 00:00:00',
   `online` tinyint(4) NOT NULL default '0',
-  `expansion` tinyint(3) unsigned NOT NULL default '2',
+  `expansion` tinyint(3) unsigned NOT NULL default '3',
   `mutetime` bigint(40) NOT NULL default '0',
   `locale` tinyint(3) unsigned NOT NULL default '0',
   `recruiter` int(11) NOT NULL default '0',
diff --git a/sql/updates/auth/2012_01_10_00_auth_account_4x.sql b/sql/updates/auth/2012_01_10_00_auth_account_4x.sql
new file mode 100644
index 00000000000..1e9016575fc
--- /dev/null
+++ b/sql/updates/auth/2012_01_10_00_auth_account_4x.sql
@@ -0,0 +1 @@
+ALTER TABLE `account` CHANGE COLUMN `expansion` `expansion` tinyint(3) unsigned NOT NULL DEFAULT '3';
diff --git a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
index add0c7fffaf..effc28c1063 100755
--- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
@@ -88,12 +88,12 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
         //case CMSG_MESSAGECHAT_OFFICER:
         //    type = CHAT_MSG_OFFICER;
         //    break;
-        //case CMSG_MESSAGECHAT_AFK:
-        //    type = CHAT_MSG_AFK;
-        //    break;
-        //case CMSG_MESSAGECHAT_DND:
-        //    type = CHAT_MSG_DND;
-        //    break;
+        case CMSG_MESSAGECHAT_AFK:
+            type = CHAT_MSG_AFK;
+            break;
+        case CMSG_MESSAGECHAT_DND:
+            type = CHAT_MSG_DND;
+            break;
         case CMSG_MESSAGECHAT_EMOTE:
             type = CHAT_MSG_EMOTE;
             break;
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 63ffde54a10..d05b45ab718 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -197,11 +197,11 @@ void InitOpcodes()
      DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_ADDON_PARTY,                 STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
      DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_ADDON_RAID,                  STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
      DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_ADDON_WHISPER,               STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode    );
-     //DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_AFK,                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
+     DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_AFK,                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
      //DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_BATTLEGROUND,                STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
      //DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_BATTLEGROUND_LEADER,         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
      DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_CHANNEL,                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
-     //DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_DND,                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
+     DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_DND,                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
      DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_EMOTE,                       STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
      DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_GUILD,                       STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
      //DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_OFFICER,                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
@@ -413,7 +413,7 @@ void InitOpcodes()
      //DEFINE_OPCODE_HANDLER(SMSG_RESURRECT_REQUEST,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      //DEFINE_OPCODE_HANDLER(CMSG_RESURRECT_RESPONSE,                      STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleResurrectResponseOpcode   );
      DEFINE_OPCODE_HANDLER(CMSG_LOOT,                                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootOpcode                );
-     //DEFINE_OPCODE_HANDLER(CMSG_LOOT_MONEY,                              STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootMoneyOpcode           );
+     DEFINE_OPCODE_HANDLER(CMSG_LOOT_MONEY,                              STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootMoneyOpcode           );
      DEFINE_OPCODE_HANDLER(CMSG_LOOT_RELEASE,                            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootReleaseOpcode         );
      DEFINE_OPCODE_HANDLER(SMSG_LOOT_RESPONSE,                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      DEFINE_OPCODE_HANDLER(SMSG_LOOT_RELEASE_RESPONSE,                   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 f337945a1be..68a779201b7 100755
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -72,7 +72,7 @@ enum Opcodes
     CMSG_AUTOSTORE_GROUND_ITEM                       = 0x00,
     CMSG_AUTOSTORE_LOOT_ITEM                         = 0xD876,
     CMSG_BANKER_ACTIVATE                             = 0x00,
-    CMSG_BATTLEFIELD_JOIN                            = 0x00,
+    CMSG_BATTLEFIELD_JOIN                            = 0x225,
     CMSG_BATTLEFIELD_REQUEST_SCORE_DATA              = 0x00,
     CMSG_BATTLEFIELD_STATUS                          = 0x00,
     MSG_BATTLEGROUND_PLAYER_POSITIONS                = 0x00,
@@ -264,7 +264,7 @@ enum Opcodes
     CMSG_LOGOUT_REQUEST                              = 0x4C7A,
     CMSG_LOOT                                        = 0x1E62,
     CMSG_LOOT_METHOD                                 = 0x00,
-    CMSG_LOOT_MONEY                                  = 0x00,
+    CMSG_LOOT_MONEY                                  = 0x4A42,
     CMSG_LOOT_RELEASE                                = 0x4A6A,
     CMSG_LOOT_ROLL                                   = 0x00,
     CMSG_MAIL_CREATE_TEXT_ITEM                       = 0x886E,
@@ -274,7 +274,7 @@ enum Opcodes
     CMSG_MAIL_TAKE_ITEM                              = 0xCC2,
     CMSG_MAIL_TAKE_MONEY                             = 0x4CD6,
     CMSG_MEETINGSTONE_INFO                           = 0xCA5B,
-    CMSG_MESSAGECHAT_AFK                             = 0x00,
+    CMSG_MESSAGECHAT_AFK                             = 0x30C1,
     CMSG_MESSAGECHAT_BATTLEGROUND                    = 0x00,
     CMSG_MESSAGECHAT_BATTLEGROUND_LEADER             = 0x00,
     CMSG_MESSAGECHAT_ADDON_BATTLEGROUND              = 0x6059, // New on 4.x
@@ -283,7 +283,7 @@ enum Opcodes
     CMSG_MESSAGECHAT_ADDON_RAID                      = 0x3041, // New on 4.x
     CMSG_MESSAGECHAT_ADDON_WHISPER                   = 0x20C1, // New on 4.x
     CMSG_MESSAGECHAT_CHANNEL                         = 0x7459,
-    CMSG_MESSAGECHAT_DND                             = 0x00,
+    CMSG_MESSAGECHAT_DND                             = 0x30C9,
     CMSG_MESSAGECHAT_EMOTE                           = 0x6449,
     CMSG_MESSAGECHAT_GUILD                           = 0x60C1,
     CMSG_MESSAGECHAT_OFFICER                         = 0x00,