From 87c54f63ec32dce4299006c69a87f5a7da6f618e Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 31 Dec 2020 15:51:22 -0500 Subject: [PATCH] Core/Quests: Fixed crash happening when a player is quest ender Port From (https://github.com/TrinityCore/TrinityCore/commit/1000f670d211f2ac5aef3351af0f08de06e13097) --- Source/Game/Handlers/QuestHandler.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Game/Handlers/QuestHandler.cs b/Source/Game/Handlers/QuestHandler.cs index ba68d3cc5..ff5e22130 100644 --- a/Source/Game/Handlers/QuestHandler.cs +++ b/Source/Game/Handlers/QuestHandler.cs @@ -360,7 +360,7 @@ namespace Game case TypeId.Player: { //For AutoSubmition was added plr case there as it almost same exclute AI script cases. - Creature creatureQGiver = obj.ToCreature(); + Unit unitQGiver = obj.ToUnit(); // Send next quest Quest nextQuest = _player.GetNextQuest(packet.QuestGiverGUID, quest); if (nextQuest != null) @@ -376,7 +376,9 @@ namespace Game } _player.PlayerTalkClass.ClearMenus(); - creatureQGiver.GetAI().QuestReward(_player, quest, packet.Choice.LootItemType, packet.Choice.Item.ItemID); + var qGiverAI = unitQGiver.GetAI(); + if (qGiverAI != null) + qGiverAI.QuestReward(_player, quest, packet.Choice.LootItemType, packet.Choice.Item.ItemID); break; } case TypeId.GameObject: