fix(core/Scripts): 'The Attack!' Quest Improvements/NPC Spawn Adjust (#4577)

data/sql/updates/pending_db_world/rev_1613367143020390000.sql

@@ -0,0 +1,13 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1613367143020390000');
+
+/* Quest 'The Attack!' Improvements
+*/
+
+DELETE FROM `creature` WHERE `id` = 7779;
+
+/*  Not part of 'The Attack!', but in the same area - NPC was stuck in the wall
+*/
+
+DELETE FROM `creature` WHERE (`id` = 24729) AND (`guid` IN (49591));
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(49591, 24729, 0, 0, 0, 1, 1, 344, 0, -8406.450195, 482.553864, 123.759903, 1.84221, 180, 3, 0, 8982, 0, 1, 0, 0, 0, '', 0);

src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp

@@ -434,7 +434,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;