Core/DataStores: Implement optional data in hotfix packets

Port From (https://github.com/TrinityCore/TrinityCore/commit/fbbf40981cc14523fa181cf6125336b254e8ae4d)
This commit is contained in:
hondacrx
2020-12-31 15:04:02 -05:00
parent 2485ea604d
commit 13c9e3d56d
7 changed files with 147 additions and 17 deletions
+16 -6
View File
@@ -29,11 +29,6 @@ namespace Game
void HandleDBQueryBulk(DBQueryBulk dbQuery)
{
IDB2Storage store = Global.DB2Mgr.GetStorage(dbQuery.TableHash);
if (store == null)
{
Log.outError(LogFilter.Network, "CMSG_DB_QUERY_BULK: {0} requested unsupported unknown hotfix type: {1}", GetPlayerInfo(), dbQuery.TableHash);
return;
}
foreach (DBQueryBulk.DBQueryRecord record in dbQuery.Queries)
{
@@ -41,11 +36,18 @@ namespace Game
dbReply.TableHash = dbQuery.TableHash;
dbReply.RecordID = record.RecordID;
if (store.HasRecord(record.RecordID))
if (store != null && store.HasRecord(record.RecordID))
{
dbReply.Status = 1;
dbReply.Timestamp = (uint)GameTime.GetGameTime();
store.WriteRecord(record.RecordID, GetSessionDbcLocale(), dbReply.Data);
var optionalDataEntries = Global.DB2Mgr.GetHotfixOptionalData(dbQuery.TableHash, record.RecordID, GetSessionDbcLocale());
foreach (HotfixOptionalData optionalData in optionalDataEntries)
{
dbReply.Data.WriteUInt32(optionalData.Key);
dbReply.Data.WriteBytes(optionalData.Data);
}
}
else
{
@@ -80,6 +82,14 @@ namespace Game
{
uint pos = hotfixQueryResponse.HotfixContent.GetSize();
storage.WriteRecord((uint)hotfixRecord.RecordID, GetSessionDbcLocale(), hotfixQueryResponse.HotfixContent);
var optionalDataEntries = Global.DB2Mgr.GetHotfixOptionalData(hotfixRecord.TableHash, (uint)hotfixRecord.RecordID, GetSessionDbcLocale());
foreach (HotfixOptionalData optionalData in optionalDataEntries)
{
hotfixQueryResponse.HotfixContent.WriteUInt32(optionalData.Key);
hotfixQueryResponse.HotfixContent.WriteBytes(optionalData.Data);
}
hotfixData.Size.Set(hotfixQueryResponse.HotfixContent.GetSize() - pos);
}
else