From 22a1797731ad1ae8e666c6a32ac36965db5f760b Mon Sep 17 00:00:00 2001 From: "Trond B. Krokli" <38162891+illfated@users.noreply.github.com> Date: Sun, 25 Oct 2020 10:10:07 +0100 Subject: Scripts/Stormwind City: Tyrion talks to player (#25613) Add player parameter to the `Talk()` command to resolve an issue where the creature_text `SAY_TYRION_1` shows $n in-game during the course of events of the quest "The Attack!" in Stormwind City. Soon to be replaced by SAI scripting. This is a temp solution. Ref. #25608 & #24735 Co-authored-by: Giacomo Pozzoni --- src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index 1b5fe4de36c..10ab0867d11 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -389,7 +389,10 @@ public: break; case 2: if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION, 10.0f)) - pTyrion->AI()->Talk(SAY_TYRION_1); + { + if (Player* player = GetPlayerForEscort()) + pTyrion->AI()->Talk(SAY_TYRION_1, player); + } uiTimer = 3000; uiPhase = 3; break; -- cgit v1.2.3