From 82ced5db6e136c3f347461de135e9ce35e68e1f8 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 3 May 2018 14:45:56 +0200 Subject: [PATCH 1/2] DB/Spell: Fix Inner Fire By Keader --- sql/updates/world/4.3.4/2018_05_03_00_world.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/4.3.4/2018_05_03_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_05_03_00_world.sql b/sql/updates/world/4.3.4/2018_05_03_00_world.sql new file mode 100644 index 0000000000..021bd16ace --- /dev/null +++ b/sql/updates/world/4.3.4/2018_05_03_00_world.sql @@ -0,0 +1,9 @@ +-- +DELETE FROM `spell_group` WHERE `id`=1122; +INSERT INTO `spell_group` (`id`, `spell_id`) VALUES +(1122,588), +(1122,73413); + +DELETE FROM `spell_group_stack_rules` WHERE `group_id`=1122; +INSERT INTO `spell_group_stack_rules` (`group_id`, `stack_rule`) VALUES +(1122,1); From a8262881f968793df2f8f88bb44a51011a717dbe Mon Sep 17 00:00:00 2001 From: Jorge Turrado Ferrero <36899226+JorTurFer@users.noreply.github.com> Date: Wed, 2 May 2018 01:11:40 +0200 Subject: [PATCH 2/2] Scripts/Ulduar: Fixed Vehicles when flame leviathan die(#21897) --- .../Ulduar/Ulduar/instance_ulduar.cpp | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 5d1e43a728..a975c8f912 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -281,7 +281,10 @@ class instance_ulduar : public InstanceMapScript case NPC_SALVAGED_DEMOLISHER: case NPC_SALVAGED_SIEGE_ENGINE: case NPC_SALVAGED_CHOPPER: - LeviathanVehicleGUIDs.push_back(creature->GetGUID()); + if (GetBossState(BOSS_LEVIATHAN) == DONE) + DespawnLeviatanVehicle(creature); + else + LeviathanVehicleGUIDs.push_back(creature->GetGUID()); break; // XT-002 Deconstructor @@ -1043,17 +1046,8 @@ class instance_ulduar : public InstanceMapScript // Eject all players from vehicles and make them untargetable. // They will be despawned after a while for (auto const& vehicleGuid : LeviathanVehicleGUIDs) - { if (Creature* vehicleCreature = instance->GetCreature(vehicleGuid)) - { - if (Vehicle* vehicle = vehicleCreature->GetVehicleKit()) - { - vehicle->RemoveAllPassengers(); - vehicleCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - vehicleCreature->DespawnOrUnsummon(5 * MINUTE * IN_MILLISECONDS); - } - } - } + DespawnLeviatanVehicle(vehicleCreature); break; case EVENT_LEVIATHAN_BREAK_DOOR: if (Creature* leviathan = GetCreature(BOSS_LEVIATHAN)) @@ -1065,6 +1059,16 @@ class instance_ulduar : public InstanceMapScript } } + void DespawnLeviatanVehicle(Creature* vehicleCreature) + { + if (Vehicle* vehicle = vehicleCreature->GetVehicleKit()) + { + vehicle->RemoveAllPassengers(); + vehicleCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + vehicleCreature->DespawnOrUnsummon(5 * MINUTE * IN_MILLISECONDS); + } + } + void UpdateDoorState(GameObject* door) override { // Leviathan doors are set to DOOR_TYPE_ROOM except the one it uses to enter the room