Fixed skipping already present creatures/gameobject with guid > uint max

TrinityCore · Dec 29, 2023 · 329ad8e · 329ad8e
1 parent 20c6420
commit 329ad8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/WowPacketParser/SQL/SQLDatabase.cs b/WowPacketParser/SQL/SQLDatabase.cs
@@ -510,9 +510,9 @@ public static RowList<CreatureDB> GetCreatures(RowList<CreatureDB> rowList = nul
                     {
                         var creature = new CreatureDB();
 
-                        creature.DbGuid = reader.GetUInt32(0);
+                        creature.DbGuid = reader.GetUInt64(0);
                         creature.ID = reader.GetUInt32(1);
-                        creature.Map = reader.GetUInt32(2);
+                        creature.Map = reader.GetUInt16(2);
                         creature.PosX = reader.GetDecimal(3);
                         creature.PosY = reader.GetDecimal(4);
                         creature.PosZ = reader.GetDecimal(5);
@@ -549,9 +549,9 @@ public static RowList<GameObjectDB> GetGameObjects(RowList<GameObjectDB> rowList
                     {
                         var go = new GameObjectDB();
 
-                        go.DbGuid = reader.GetUInt32(0);
+                        go.DbGuid = reader.GetUInt64(0);
                         go.ID = reader.GetUInt32(1);
-                        go.Map = reader.GetUInt32(2);
+                        go.Map = reader.GetUInt16(2);
                         go.PosX = reader.GetDecimal(3);
                         go.PosY = reader.GetDecimal(4);
                         go.PosZ = reader.GetDecimal(5);

diff --git a/WowPacketParser/Store/Objects/CreatureDB.cs b/WowPacketParser/Store/Objects/CreatureDB.cs
@@ -6,11 +6,11 @@ namespace WowPacketParser.Store.Objects
     public sealed record CreatureDB : IDataModel
     {
         [DBFieldName("guid", true)]
-        public uint DbGuid;
+        public ulong DbGuid;
         [DBFieldName("id")]
         public uint ID;
         [DBFieldName("map")]
-        public uint Map;
+        public ushort Map;
         [DBFieldName("position_x")]
         public decimal PosX;
         [DBFieldName("position_y")]

diff --git a/WowPacketParser/Store/Objects/GameObjectDB.cs b/WowPacketParser/Store/Objects/GameObjectDB.cs
@@ -6,11 +6,11 @@ namespace WowPacketParser.Store.Objects
     public sealed record GameObjectDB : IDataModel
     {
         [DBFieldName("guid", true)]
-        public uint DbGuid;
+        public ulong DbGuid;
         [DBFieldName("id")]
         public uint ID;
         [DBFieldName("map")]
-        public uint Map;
+        public ushort Map;
         [DBFieldName("position_x")]
         public decimal PosX;
         [DBFieldName("position_y")]