Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash with equipmentset

Browse Source
This commit is contained in:
hondacrx
2021-04-22 09:50:39 -04:00
parent 36040abe27
commit e4a5dbb0ba
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.DB.cs
+3 -7
View File
@@ -1446,9 +1446,6 @@ namespace Game.Entities
eqSet.Data.Pieces[i] = ObjectGuid.Create(HighGuid.Item, guid); eqSet.Data.Pieces[i] = ObjectGuid.Create(HighGuid.Item, guid);
} }
eqSet.Data.Appearances.Fill(0);
eqSet.Data.Enchants.Fill(0);
if (eqSet.Data.SetID >= ItemConst.MaxEquipmentSetIndex) // client limit if (eqSet.Data.SetID >= ItemConst.MaxEquipmentSetIndex) // client limit
continue; continue;
@@ -1478,12 +1475,11 @@ namespace Game.Entities
eqSet.Data.SetIcon = result.Read<string>(3); eqSet.Data.SetIcon = result.Read<string>(3);
eqSet.Data.IgnoreMask = result.Read<uint>(4); eqSet.Data.IgnoreMask = result.Read<uint>(4);
eqSet.state = EquipmentSetUpdateState.Unchanged; eqSet.state = EquipmentSetUpdateState.Unchanged;
eqSet.Data.Pieces.Fill(ObjectGuid.Empty);
for (int i = 0; i < EquipmentSlot.End; ++i) for (int i = 0; i < EquipmentSlot.End; ++i)
eqSet.Data.Appearances[i] = result.Read<int>(5 + i); eqSet.Data.Appearances[i] = result.Read<int>(5 + i);
for (int i = 0; i < eqSet.Data.Enchants.Count; ++i) for (int i = 0; i < eqSet.Data.Enchants.Length; ++i)
eqSet.Data.Enchants[i] = result.Read<int>(24 + i); eqSet.Data.Enchants[i] = result.Read<int>(24 + i);
if (eqSet.Data.SetID >= ItemConst.MaxEquipmentSetIndex) // client limit if (eqSet.Data.SetID >= ItemConst.MaxEquipmentSetIndex) // client limit
@@ -2341,7 +2337,7 @@ namespace Game.Entities
for (byte i = 0; i < EquipmentSlot.End; ++i) for (byte i = 0; i < EquipmentSlot.End; ++i)
stmt.AddValue(j++, eqSet.Data.Appearances[i]); stmt.AddValue(j++, eqSet.Data.Appearances[i]);
for (int i = 0; i < eqSet.Data.Enchants.Count; ++i) for (int i = 0; i < eqSet.Data.Enchants.Length; ++i)
stmt.AddValue(j++, eqSet.Data.Enchants[i]); stmt.AddValue(j++, eqSet.Data.Enchants[i]);
stmt.AddValue(j++, GetGUID().GetCounter()); stmt.AddValue(j++, GetGUID().GetCounter());
@@ -2380,7 +2376,7 @@ namespace Game.Entities
for (byte i = 0; i < EquipmentSlot.End; ++i) for (byte i = 0; i < EquipmentSlot.End; ++i)
stmt.AddValue(j++, eqSet.Data.Appearances[i]); stmt.AddValue(j++, eqSet.Data.Appearances[i]);
for (int i = 0; i < eqSet.Data.Enchants.Count; ++i) for (int i = 0; i < eqSet.Data.Enchants.Length; ++i)
stmt.AddValue(j++, eqSet.Data.Enchants[i]); stmt.AddValue(j++, eqSet.Data.Enchants[i]);
} }
trans.Append(stmt); trans.Append(stmt);
Source/Game/Entities/Player/Player.Fields.cs
+3 -3
View File
@@ -496,9 +496,9 @@ namespace Game.Entities
public int AssignedSpecIndex = -1; // Index of character specialization that this set is automatically equipped for public int AssignedSpecIndex = -1; // Index of character specialization that this set is automatically equipped for
public string SetName = ""; public string SetName = "";
public string SetIcon = ""; public string SetIcon = "";
public Array<ObjectGuid> Pieces = new(EquipmentSlot.End); public ObjectGuid[] Pieces = new ObjectGuid[EquipmentSlot.End];
public Array<int> Appearances = new(EquipmentSlot.End); // ItemModifiedAppearanceID public int[] Appearances = new int[EquipmentSlot.End]; // ItemModifiedAppearanceID
public Array<int> Enchants = new(2); // SpellItemEnchantmentID public int[] Enchants = new int[2]; // SpellItemEnchantmentID
public int Unknown901_1; public int Unknown901_1;
public int Unknown901_2; public int Unknown901_2;
} }