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

Core/DataStores: Don't send hotfix ids in SMSG_AVAILABLE_HOTFIXES that don't have a hotfix blob for client locale

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/973b5f404f5b7115239a81030ad2f8dff8e165ea)
This commit is contained in:
hondacrx
2024-02-01 20:59:03 -05:00
parent 5869fbaee0
commit fc439dbed0
4 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/DB2Manager.cs
+28 -5
View File
@@ -637,7 +637,7 @@ namespace Game.DataStorage
return _storage.LookupByKey(type);
}
public void LoadHotfixData()
public void LoadHotfixData(BitSet availableDb2Locales)
{
uint oldMSTime = Time.GetMSTime();
@@ -660,7 +660,17 @@ namespace Game.DataStorage
HotfixRecord.Status status = (HotfixRecord.Status)result.Read<byte>(4);
if (status == HotfixRecord.Status.Valid && !_storage.ContainsKey(tableHash))
{
if (!_hotfixBlob.Any(p => p.ContainsKey((tableHash, recordId))))
var key = (tableHash, recordId);
for (int locale = 0; locale < (int)Locale.Total; ++locale)
{
if (!availableDb2Locales[locale])
continue;
if (!_hotfixBlob[locale].ContainsKey(key))
availableDb2Locales[locale] = false;
}
if (!availableDb2Locales.Any())
{
Log.outError(LogFilter.Sql, $"Table `hotfix_data` references unknown DB2 store by hash 0x{tableHash:X} and has no reference to `hotfix_blob` in hotfix id {id} with RecordID: {recordId}");
continue;
@@ -673,7 +683,13 @@ namespace Game.DataStorage
hotfixRecord.ID.PushID = id;
hotfixRecord.ID.UniqueID = uniqueId;
hotfixRecord.HotfixStatus = status;
_hotfixData.Add(id, hotfixRecord);
hotfixRecord.AvailableLocalesMask = availableDb2Locales.ToBlockRange()[0];//Ulgy i know
HotfixPush push = _hotfixData[id];
push.Records.Add(hotfixRecord);
push.AvailableLocalesMask |= hotfixRecord.AvailableLocalesMask;
_hotfixData.Add(id, push);
deletedRecords[(tableHash, recordId)] = status == HotfixRecord.Status.RecordRemoved;
++count;
@@ -812,7 +828,7 @@ namespace Game.DataStorage
public uint GetHotfixCount() { return (uint)_hotfixData.Count; }
public MultiMap<int, HotfixRecord> GetHotfixData() { return _hotfixData; }
public Dictionary<int, HotfixPush> GetHotfixData() { return _hotfixData; }
public byte[] GetHotfixBlobData(uint tableHash, int recordId, Locale locale)
{
@@ -2219,7 +2235,7 @@ namespace Game.DataStorage
delegate bool AllowedHotfixOptionalData(byte[] data);
Dictionary<uint, IDB2Storage> _storage = new();
MultiMap<int, HotfixRecord> _hotfixData = new();
Dictionary<int, HotfixPush> _hotfixData = new();
Dictionary<(uint tableHash, int recordId), byte[]>[] _hotfixBlob = new Dictionary<(uint tableHash, int recordId), byte[]>[(int)Locale.Total];
MultiMap<uint, Tuple<uint, AllowedHotfixOptionalData>> _allowedHotfixOptionalData = new();
MultiMap<(uint tableHash, int recordId), HotfixOptionalData>[] _hotfixOptionalData = new MultiMap<(uint tableHash, int recordId), HotfixOptionalData>[(int)Locale.Total];
@@ -2467,6 +2483,7 @@ namespace Game.DataStorage
public int RecordID;
public HotfixId ID;
public Status HotfixStatus = Status.Invalid;
public uint AvailableLocalesMask;
public void Write(WorldPacket data)
{
@@ -2516,6 +2533,12 @@ namespace Game.DataStorage
public byte[] Data;
}
public class HotfixPush
{
public List<HotfixRecord> Records = new();
public uint AvailableLocalesMask;
}
class ChrClassesXPowerTypesRecordComparer : IComparer<ChrClassesXPowerTypesRecord>
{
public int Compare(ChrClassesXPowerTypesRecord left, ChrClassesXPowerTypesRecord right)