Server/PacketIO: Update SMSG_RAID_INSTANCE_MESSAGE

ProjectSkyfire · Feb 24, 2024 · 59a2af9 · 59a2af9
1 parent 166df4f
commit 59a2af9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -24205,16 +24205,14 @@ void Player::SendInstanceResetWarning(uint32 mapid, DifficultyID difficulty, uin
     else
         type = RAID_INSTANCE_WARNING_MIN_SOON;
 
-    WorldPacket data(SMSG_RAID_INSTANCE_MESSAGE, 4+4+4+4);
-    data << uint32(type);
+    WorldPacket data(SMSG_RAID_INSTANCE_MESSAGE, 1+4+1+4+4);
+    data.WriteBit(0);
+    data.WriteBit(0);
+    data.FlushBits();
     data << uint32(mapid);
-    data << uint32(difficulty);                             // difficulty
+    data << uint8(type);
     data << uint32(time);
-    if (type == RAID_INSTANCE_WELCOME)
-    {
-        data << uint8(0);                                   // is locked
-        data << uint8(0);                                   // is extended, ignored if prev field is 0
-    }
+    data << uint32(difficulty);                             // difficulty
     GetSession()->SendPacket(&data);
 }
 

diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -979,6 +979,7 @@ void OpcodeTable::InitializeServerTable()
     DEFINE_OPCODE_HANDLER(SMSG_QUEST_PUSH_RESULT,                  0x074D, STATUS_NEVER    ); // 5.4.8 18414
     DEFINE_OPCODE_HANDLER(SMSG_QUEST_QUERY_RESPONSE,               0x0276, STATUS_NEVER    ); // 5.4.8 18414
     DEFINE_OPCODE_HANDLER(SMSG_RAID_INSTANCE_INFO,                 0x16BF, STATUS_NEVER    ); // 5.4.8 18414
+    DEFINE_OPCODE_HANDLER(SMSG_RAID_INSTANCE_MESSAGE,              0x0CAF, STATUS_NEVER    ); // 5.4.8 18414
     DEFINE_OPCODE_HANDLER(SMSG_RAID_READY_CHECK,                   0x1C8E, STATUS_NEVER    ); // 5.4.8 18414
     DEFINE_OPCODE_HANDLER(SMSG_RAID_READY_CHECK_COMPLETED,         0x15C2, STATUS_NEVER    ); // 5.4.8 18414
     DEFINE_OPCODE_HANDLER(SMSG_RAID_READY_CHECK_CONFIRM,           0x02AF, STATUS_NEVER    ); // 5.4.8 18414
@@ -1165,7 +1166,6 @@ void OpcodeTable::InitializeServerTable()
     DEFINE_OPCODE_HANDLER(SMSG_QUESTGIVER_QUEST_FAILED, 0x12DE, STATUS_UNHANDLED);
     DEFINE_OPCODE_HANDLER(SMSG_QUESTUPDATE_FAILEDTIMER, 0x06FF, STATUS_UNHANDLED);
     DEFINE_OPCODE_HANDLER(SMSG_RAID_GROUP_ONLY, 0x0000, STATUS_UNHANDLED);
-    DEFINE_OPCODE_HANDLER(SMSG_RAID_INSTANCE_MESSAGE, 0x0CAF, STATUS_UNHANDLED);
     DEFINE_OPCODE_HANDLER(SMSG_REALM_SPLIT, 0x1A2E, STATUS_UNHANDLED);
     DEFINE_OPCODE_HANDLER(SMSG_SET_PROJECTILE_POSITION, 0x0000, STATUS_UNHANDLED);
     DEFINE_OPCODE_HANDLER(SMSG_SPELLSTEALLOG, 0x0000, STATUS_UNHANDLED);