From d686aef6d350d94e993ac9a690d5eb0a39f9be47 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 18 Jun 2020 15:20:33 -0400 Subject: [PATCH] Core/DataStores: Fix loading hotfixes deleting records for db2s not loaded by worldserver Port From (https://github.com/TrinityCore/TrinityCore/commit/2493d88a7224d829bd3b893f637cc255b2a751dc) --- Source/Game/DataStorage/DB2Manager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/DataStorage/DB2Manager.cs b/Source/Game/DataStorage/DB2Manager.cs index 2884b2d1c..663cd0f11 100644 --- a/Source/Game/DataStorage/DB2Manager.cs +++ b/Source/Game/DataStorage/DB2Manager.cs @@ -652,9 +652,9 @@ namespace Game.DataStorage uint tableHash = result.Read(1); int recordId = result.Read(2); bool deleted = result.Read(3); - if (!_storage.ContainsKey(tableHash) && !_hotfixBlob.ContainsKey(Tuple.Create(tableHash, recordId))) + if (!deleted && !_storage.ContainsKey(tableHash) && !_hotfixBlob.ContainsKey(Tuple.Create(tableHash, recordId))) { - Log.outError(LogFilter.Sql, "Table `hotfix_data` references unknown DB2 store by hash 0x{0:X} and has no reference to `hotfix_blob` in hotfix id {1}", tableHash, id); + 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; }