Fix 11.0.7.58630 FVendor_C structure

TrinityCore · Jan 15, 2025 · 10cc728 · 10cc728
1 parent b53de52
commit 10cc728
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/WowPacketParser/Enums/WowCSEntityFragments.cs b/WowPacketParser/Enums/WowCSEntityFragments.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using WowPacketParser.Misc;
 
 namespace WowPacketParser.Enums
 {
@@ -55,6 +56,8 @@ public static bool IsIndirect(WowCSEntityFragments fragment)
                 case WowCSEntityFragments.CGObject:
                 case WowCSEntityFragments.CActor:
                     return true;
+                case WowCSEntityFragments.FVendor_C:
+                    return ClientVersion.AddedInVersion(ClientVersionBuild.V11_0_7_58630);
                 default:
                     return false;
             }

diff --git a/WowPacketParserModule.V11_0_0_55666/Parsers/UpdateHandler.cs b/WowPacketParserModule.V11_0_0_55666/Parsers/UpdateHandler.cs
@@ -175,9 +175,9 @@ public static void HandleUpdateObject(Packet packet)
                                 }
                             }
                             else
-                                obj.EntityFragments.Remove(WowCSEntityFragments.CGObject);
+                                obj?.EntityFragments.Remove(WowCSEntityFragments.CGObject);
 
-                            var vendorFragment = WowCSUtilities.GetUpdateBitIndex(obj.EntityFragments, WowCSEntityFragments.FVendor_C);
+                            var vendorFragment = WowCSUtilities.GetUpdateBitIndex(fragments, WowCSEntityFragments.FVendor_C);
                             if (vendorFragment >= 0 && changedFragments[vendorFragment])
                                 handler.ReadUpdateVendorData(fieldsData, i);
                         }
@@ -291,7 +291,8 @@ private static void ReadCreateObjectBlock(Packet packet, CreateObject createObje
                         obj.EntityFragments.Remove(WowCSEntityFragments.CGObject);
                 }
                 if (obj.EntityFragments.Contains(WowCSEntityFragments.FVendor_C))
-                    handler.ReadCreateVendorData(fieldsData, flags, index);
+                    if (ClientVersion.RemovedInVersion(ClientVersionBuild.V11_0_7_58630) || fieldsData.ReadBool("IndirectFragmentActive [FVendor_C]", index))
+                        handler.ReadCreateVendorData(fieldsData, flags, index);
             }
 
             // If this is the second time we see the same object (same guid,