From a702e070f338036b48ae2a30f24cd7f0e26a2ee7 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 7 Dec 2020 13:02:07 -0500 Subject: [PATCH] Core/Misc: Misc Fixes/Crashes --- Source/Game/BlackMarket/BlackMarketEntry.cs | 1 + Source/Game/DataStorage/ConversationDataStorage.cs | 4 ++-- Source/Game/Globals/ObjectManager.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Game/BlackMarket/BlackMarketEntry.cs b/Source/Game/BlackMarket/BlackMarketEntry.cs index eed24816e..8a995a4f0 100644 --- a/Source/Game/BlackMarket/BlackMarketEntry.cs +++ b/Source/Game/BlackMarket/BlackMarketEntry.cs @@ -30,6 +30,7 @@ namespace Game.BlackMarket { MarketID = fields.Read(0); SellerNPC = fields.Read(1); + Item = new ItemInstance(); Item.ItemID = fields.Read(2); Quantity = fields.Read(3); MinBid = fields.Read(4); diff --git a/Source/Game/DataStorage/ConversationDataStorage.cs b/Source/Game/DataStorage/ConversationDataStorage.cs index 739758d47..bd7b75f6e 100644 --- a/Source/Game/DataStorage/ConversationDataStorage.cs +++ b/Source/Game/DataStorage/ConversationDataStorage.cs @@ -172,8 +172,8 @@ namespace Game.DataStorage conversationTemplate.TextureKitId = templateResult.Read(3); conversationTemplate.ScriptId = Global.ObjectMgr.GetScriptId(templateResult.Read(3)); - conversationTemplate.Actors = actorsByConversation[conversationTemplate.Id].ToList(); - conversationTemplate.ActorGuids = actorGuidsByConversation[conversationTemplate.Id].ToList(); + conversationTemplate.Actors = actorsByConversation.TryGetValue(conversationTemplate.Id, out var actors) ? actors.ToList() : null; + conversationTemplate.ActorGuids = actorGuidsByConversation.TryGetValue(conversationTemplate.Id, out var actorGuids) ? actorGuids.ToList() : null; ConversationLineRecord currentConversationLine = CliDB.ConversationLineStorage.LookupByKey(conversationTemplate.FirstLineId); if (currentConversationLine == null) diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index 1bc229012..d2f55aea7 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -9314,7 +9314,7 @@ namespace Game currencyRewardCount++; response.Reward.Value.Currency.Add(new PlayerChoiceResponseRewardEntry(currencyId, quantity)); - } while (rewards.NextRow()); + } while (rewardCurrency.NextRow()); } SQLResult rewardFaction = DB.World.Query("SELECT ChoiceId, ResponseId, FactionId, Quantity FROM playerchoice_response_reward_faction ORDER BY `Index` ASC");