Core/Corpses: Fixed client crashes with player corpses

Closes #25714

2 files changed, 8 insertions, 8 deletions

diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.cpp b/src/server/game/Entities/Object/Updates/UpdateFields.cpp
index 6a7b62e93ce..c6b75392e26 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.cpp
@@ -4483,9 +4483,9 @@ void CorpseData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVi
     {
         data << uint32(Items[i]);
     }
-    data << uint8(Unused);
     data << uint8(RaceID);
     data << uint8(Sex);
+    data << uint8(Class);
     data << uint32(Customizations.size());
     data << uint32(Flags);
     data << int32(FactionTemplate);
@@ -4553,15 +4553,15 @@ void CorpseData::WriteUpdate(ByteBuffer& data, UpdateMask<33> const& changesMask
         }
         if (changesMask[7])
         {
-            data << uint8(Unused);
+            data << uint8(RaceID);
         }
         if (changesMask[8])
         {
-            data << uint8(RaceID);
+            data << uint8(Sex);
         }
         if (changesMask[9])
         {
-            data << uint8(Sex);
+            data << uint8(Class);
         }
         if (changesMask[10])
         {
@@ -4596,9 +4596,9 @@ void CorpseData::ClearChangesMask()
     Base::ClearChangesMask(PartyGUID);
     Base::ClearChangesMask(GuildGUID);
     Base::ClearChangesMask(DisplayID);
-    Base::ClearChangesMask(Unused);
     Base::ClearChangesMask(RaceID);
     Base::ClearChangesMask(Sex);
+    Base::ClearChangesMask(Class);
     Base::ClearChangesMask(Flags);
     Base::ClearChangesMask(FactionTemplate);
     Base::ClearChangesMask(StateSpellVisualKitID);
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h
index 6d0998d631b..35cd04e5bff 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.h
@@ -837,9 +837,9 @@ struct CorpseData : public IsUpdateFieldStructureTag, public HasChangesMask<33>
     UpdateField<ObjectGuid, 0, 4> PartyGUID;
     UpdateField<ObjectGuid, 0, 5> GuildGUID;
     UpdateField<uint32, 0, 6> DisplayID;
-    UpdateField<uint8, 0, 7> Unused;
-    UpdateField<uint8, 0, 8> RaceID;
-    UpdateField<uint8, 0, 9> Sex;
+    UpdateField<uint8, 0, 7> RaceID;
+    UpdateField<uint8, 0, 8> Sex;
+    UpdateField<uint8, 0, 9> Class;
     UpdateField<uint32, 0, 10> Flags;
     UpdateField<int32, 0, 11> FactionTemplate;
     UpdateField<uint32, 0, 12> StateSpellVisualKitID;