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

Core/DB: Fixes sometimes wrong values added to DB, also fixes errors when trying to convert updatefield to object.

Browse Source
This commit is contained in:
hondacrx
2021-04-21 18:06:46 -04:00
parent 897ca11273
commit ba064327b0
30 changed files with 149 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+2 -2
View File
@@ -1207,12 +1207,12 @@ namespace Game.Entities
stmt.AddValue(index++, 0);
stmt.AddValue(index++, GetHealth());
stmt.AddValue(index++, GetPower(PowerType.Mana));
stmt.AddValue(index++, GetDefaultMovementType());
stmt.AddValue(index++, (byte)GetDefaultMovementType());
stmt.AddValue(index++, npcflag);
stmt.AddValue(index++, unitFlags);
stmt.AddValue(index++, unitFlags2);
stmt.AddValue(index++, unitFlags3);
stmt.AddValue(index++, dynamicflags);
stmt.AddValue(index++, (uint)dynamicflags);
trans.Append(stmt);
DB.World.CommitTransaction(trans);
Source/Game/Entities/GameObject/GameObject.cs
+1 -1
View File
@@ -995,7 +995,7 @@ namespace Game.Entities
stmt.AddValue(index++, m_worldRotation.W);
stmt.AddValue(index++, m_respawnDelayTime);
stmt.AddValue(index++, GetGoAnimProgress());
stmt.AddValue(index++, GetGoState());
stmt.AddValue(index++, (byte)GetGoState());
DB.World.Execute(stmt);
}
Source/Game/Entities/Pet.cs
+20 -20
View File
@@ -113,7 +113,7 @@ namespace Game.Entities
// Current pet (slot 0)
stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHAR_PET_BY_ENTRY_AND_SLOT);
stmt.AddValue(0, ownerid);
stmt.AddValue(1, PetSaveMode.AsCurrent);
stmt.AddValue(1, (byte)PetSaveMode.AsCurrent);
}
else if (petEntry != 0)
{
@@ -121,16 +121,16 @@ namespace Game.Entities
stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHAR_PET_BY_ENTRY_AND_SLOT_2);
stmt.AddValue(0, ownerid);
stmt.AddValue(1, petEntry);
stmt.AddValue(2, PetSaveMode.AsCurrent);
stmt.AddValue(3, PetSaveMode.LastStableSlot);
stmt.AddValue(2, (byte)PetSaveMode.AsCurrent);
stmt.AddValue(3, (byte)PetSaveMode.LastStableSlot);
}
else
{
// Any current or other non-stabled pet (for hunter "call pet")
stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHAR_PET_BY_SLOT);
stmt.AddValue(0, ownerid);
stmt.AddValue(1, PetSaveMode.AsCurrent);
stmt.AddValue(2, PetSaveMode.LastStableSlot);
stmt.AddValue(1, (byte)PetSaveMode.AsCurrent);
stmt.AddValue(2, (byte)PetSaveMode.LastStableSlot);
}
SQLResult result = DB.Characters.Query(stmt);
@@ -266,14 +266,14 @@ namespace Game.Entities
if (result.Read<byte>(7) != 0)
{
stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHAR_PET_SLOT_BY_SLOT_EXCLUDE_ID);
stmt.AddValue(0, PetSaveMode.NotInSlot);
stmt.AddValue(0, (byte)PetSaveMode.NotInSlot);
stmt.AddValue(1, ownerid);
stmt.AddValue(2, PetSaveMode.AsCurrent);
stmt.AddValue(2, (byte)PetSaveMode.AsCurrent);
stmt.AddValue(3, GetCharmInfo().GetPetNumber());
DB.Characters.Execute(stmt);
stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHAR_PET_SLOT_BY_ID);
stmt.AddValue(0, PetSaveMode.AsCurrent);
stmt.AddValue(0, (byte)PetSaveMode.AsCurrent);
stmt.AddValue(1, ownerid);
stmt.AddValue(2, GetCharmInfo().GetPetNumber());
DB.Characters.Execute(stmt);
@@ -422,9 +422,9 @@ namespace Game.Entities
if (mode <= PetSaveMode.LastStableSlot)
{
stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHAR_PET_SLOT_BY_SLOT);
stmt.AddValue(0, PetSaveMode.NotInSlot);
stmt.AddValue(0, (byte)PetSaveMode.NotInSlot);
stmt.AddValue(1, ownerLowGUID);
stmt.AddValue(2, mode);
stmt.AddValue(2, (byte)mode);
trans.Append(stmt);
}
@@ -433,8 +433,8 @@ namespace Game.Entities
{
stmt = DB.Characters.GetPreparedStatement(CharStatements.DEL_CHAR_PET_BY_SLOT);
stmt.AddValue(0, ownerLowGUID);
stmt.AddValue(1, PetSaveMode.AsCurrent);
stmt.AddValue(2, PetSaveMode.LastStableSlot);
stmt.AddValue(1, (byte)PetSaveMode.AsCurrent);
stmt.AddValue(2, (byte)PetSaveMode.LastStableSlot);
trans.Append(stmt);
}
@@ -445,17 +445,17 @@ namespace Game.Entities
stmt.AddValue(2, ownerLowGUID);
stmt.AddValue(3, GetNativeDisplayId());
stmt.AddValue(4, GetLevel());
stmt.AddValue(5, (uint)m_unitData.PetExperience);
stmt.AddValue(6, GetReactState());
stmt.AddValue(7, mode);
stmt.AddValue(5, m_unitData.PetExperience);
stmt.AddValue(6, (byte)GetReactState());
stmt.AddValue(7, (byte)mode);
stmt.AddValue(8, GetName());
stmt.AddValue(9, HasPetFlag(UnitPetFlags.CanBeRenamed) ? 0 : 1);
stmt.AddValue(10, curhealth);
stmt.AddValue(11, curmana);
stmt.AddValue(12, GenerateActionBarData());
stmt.AddValue(13, GameTime.GetGameTime());
stmt.AddValue(14, (uint)m_unitData.CreatedBySpell);
stmt.AddValue(15, GetPetType());
stmt.AddValue(14, m_unitData.CreatedBySpell);
stmt.AddValue(15, (byte)GetPetType());
stmt.AddValue(16, m_petSpecialization);
trans.Append(stmt);
@@ -823,14 +823,14 @@ namespace Game.Entities
stmt = DB.Characters.GetPreparedStatement(CharStatements.INS_PET_SPELL);
stmt.AddValue(0, GetCharmInfo().GetPetNumber());
stmt.AddValue(1, pair.Key);
stmt.AddValue(2, pair.Value.active);
stmt.AddValue(2, (byte)pair.Value.active);
trans.Append(stmt);
break;
case PetSpellState.New:
stmt = DB.Characters.GetPreparedStatement(CharStatements.INS_PET_SPELL);
stmt.AddValue(0, GetCharmInfo().GetPetNumber());
stmt.AddValue(1, pair.Key);
stmt.AddValue(2, pair.Value.active);
stmt.AddValue(2, (byte)pair.Value.active);
trans.Append(stmt);
break;
case PetSpellState.Unchanged:
@@ -976,7 +976,7 @@ namespace Game.Entities
stmt.AddValue(index++, key.SpellId);
stmt.AddValue(index++, key.EffectMask);
stmt.AddValue(index++, recalculateMask);
stmt.AddValue(index++, aura.GetCastDifficulty());
stmt.AddValue(index++, (byte)aura.GetCastDifficulty());
stmt.AddValue(index++, aura.GetStackAmount());
stmt.AddValue(index++, aura.GetMaxDuration());
stmt.AddValue(index++, aura.GetDuration());
Source/Game/Entities/Player/CollectionManager.cs
+2 -2
View File
@@ -206,7 +206,7 @@ namespace Game.Entities
stmt = DB.Login.GetPreparedStatement(LoginStatements.REP_ACCOUNT_HEIRLOOMS);
stmt.AddValue(0, _owner.GetBattlenetAccountId());
stmt.AddValue(1, heirloom.Key);
stmt.AddValue(2, heirloom.Value.flags);
stmt.AddValue(2, (uint)heirloom.Value.flags);
trans.Append(stmt);
}
}
@@ -404,7 +404,7 @@ namespace Game.Entities
PreparedStatement stmt = DB.Login.GetPreparedStatement(LoginStatements.REP_ACCOUNT_MOUNTS);
stmt.AddValue(0, _owner.GetBattlenetAccountId());
stmt.AddValue(1, mount.Key);
stmt.AddValue(2, mount.Value);
stmt.AddValue(2, (byte)mount.Value);
trans.Append(stmt);
}
}
Source/Game/Entities/Player/Player.DB.cs
+4 -4
View File
@@ -1778,7 +1778,7 @@ namespace Game.Entities
stmt.AddValue(index++, key.SpellId);
stmt.AddValue(index++, key.EffectMask);
stmt.AddValue(index++, recalculateMask);
stmt.AddValue(index++, aura.GetCastDifficulty());
stmt.AddValue(index++, (byte)aura.GetCastDifficulty());
stmt.AddValue(index++, aura.GetStackAmount());
stmt.AddValue(index++, aura.GetMaxDuration());
stmt.AddValue(index++, aura.GetDuration());
@@ -1911,7 +1911,7 @@ namespace Game.Entities
stmt.AddValue(1, GetActiveTalentGroup());
stmt.AddValue(2, pair.Key);
stmt.AddValue(3, pair.Value.GetAction());
stmt.AddValue(4, pair.Value.GetButtonType());
stmt.AddValue(4, (byte)pair.Value.GetButtonType());
trans.Append(stmt);
pair.Value.uState = ActionButtonUpdateState.UnChanged;
@@ -1919,7 +1919,7 @@ namespace Game.Entities
case ActionButtonUpdateState.Changed:
stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHAR_ACTION);
stmt.AddValue(0, pair.Value.GetAction());
stmt.AddValue(1, pair.Value.GetButtonType());
stmt.AddValue(1, (byte)pair.Value.GetButtonType());
stmt.AddValue(2, GetGUID().GetCounter());
stmt.AddValue(3, pair.Key);
stmt.AddValue(4, GetActiveTalentGroup());
@@ -1960,7 +1960,7 @@ namespace Game.Entities
stmt = DB.Characters.GetPreparedStatement(CharStatements.REP_CHAR_QUESTSTATUS);
stmt.AddValue(0, GetGUID().GetCounter());
stmt.AddValue(1, save.Key);
stmt.AddValue(2, data.Status);
stmt.AddValue(2, (byte)data.Status);
stmt.AddValue(3, data.Timer / Time.InMilliseconds + GameTime.GetGameTime());
trans.Append(stmt);
Source/Game/Entities/Player/Player.Map.cs
+2 -2
View File
@@ -386,7 +386,7 @@ namespace Game.Entities
stmt.AddValue(0, save.GetInstanceId());
stmt.AddValue(1, permanent);
stmt.AddValue(2, extendState);
stmt.AddValue(2, (byte)extendState);
stmt.AddValue(3, GetGUID().GetCounter());
stmt.AddValue(4, bind.save.GetInstanceId());
@@ -399,7 +399,7 @@ namespace Game.Entities
stmt.AddValue(0, GetGUID().GetCounter());
stmt.AddValue(1, save.GetInstanceId());
stmt.AddValue(2, permanent);
stmt.AddValue(3, extendState);
stmt.AddValue(3, (byte)extendState);
DB.Characters.Execute(stmt);
}
}
Source/Game/Entities/Player/SocialMgr.cs
+3 -3
View File
@@ -176,7 +176,7 @@ namespace Game.Entities
friendInfo.Flags |= flag;
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHARACTER_SOCIAL_FLAGS);
stmt.AddValue(0, friendInfo.Flags);
stmt.AddValue(0, (byte)friendInfo.Flags);
stmt.AddValue(1, GetPlayerGUID().GetCounter());
stmt.AddValue(2, friendGuid.GetCounter());
DB.Characters.Execute(stmt);
@@ -190,7 +190,7 @@ namespace Game.Entities
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.INS_CHARACTER_SOCIAL);
stmt.AddValue(0, GetPlayerGUID().GetCounter());
stmt.AddValue(1, friendGuid.GetCounter());
stmt.AddValue(2, flag);
stmt.AddValue(2, (byte)flag);
DB.Characters.Execute(stmt);
}
return true;
@@ -216,7 +216,7 @@ namespace Game.Entities
else
{
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHARACTER_SOCIAL_FLAGS);
stmt.AddValue(0, friendInfo.Flags);
stmt.AddValue(0, (byte)friendInfo.Flags);
stmt.AddValue(1, GetPlayerGUID().GetCounter());
stmt.AddValue(2, friendGuid.GetCounter());
DB.Characters.Execute(stmt);