From 5404654d65e196569b4e3d86a736cb77bef73185 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 9 Jul 2022 12:31:37 -0400 Subject: [PATCH] Core/SAI: Allow using default npc_text from gossip_menu with SMART_ACTION_SEND_GOSSIP_MENU Port From (https://github.com/TrinityCore/TrinityCore/commit/9ca8cf66e60c95ec3d20ed2c276623be2bb98713) --- Source/Game/AI/SmartScripts/SmartScript.cs | 6 +++++- Source/Game/Entities/Player/Player.cs | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs index f959a8c3a..8010cfb26 100644 --- a/Source/Game/AI/SmartScripts/SmartScript.cs +++ b/Source/Game/AI/SmartScripts/SmartScript.cs @@ -1902,7 +1902,11 @@ namespace Game.AI else player.PlayerTalkClass.ClearMenus(); - player.PlayerTalkClass.SendGossipMenu(e.Action.sendGossipMenu.gossipNpcTextId, GetBaseObject().GetGUID()); + uint gossipNpcTextId = e.Action.sendGossipMenu.gossipNpcTextId; + if (gossipNpcTextId == 0) + gossipNpcTextId = player.GetGossipTextId(e.Action.sendGossipMenu.gossipMenuId, GetBaseObject()); + + player.PlayerTalkClass.SendGossipMenu(gossipNpcTextId, GetBaseObject().GetGUID()); } } break; diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 5f98269ff..9470282ec 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -2581,6 +2581,7 @@ namespace Game.Entities ModifyMoney(-cost); } + public uint GetGossipTextId(WorldObject source) { if (source == null) @@ -2588,7 +2589,8 @@ namespace Game.Entities return GetGossipTextId(GetDefaultGossipMenuForSource(source), source); } - uint GetGossipTextId(uint menuId, WorldObject source) + + public uint GetGossipTextId(uint menuId, WorldObject source) { uint textId = SharedConst.DefaultGossipMessage;