From de3fd4d076a1d02c5b75ab5d2f32bfb7ecb202a5 Mon Sep 17 00:00:00 2001 From: ariel- Date: Tue, 2 Jan 2018 01:30:41 -0300 Subject: [PATCH] Core/Scripts: fix issues with 'Squeeze' on Yogg-Saron encounter - Unassigned spell script for 25-man difficulty - Didn't remove aura on 25-man when tentacle killed --- sql/updates/world/3.3.5/2018_01_02_02_world.sql | 4 ++++ .../scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 sql/updates/world/3.3.5/2018_01_02_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_01_02_02_world.sql b/sql/updates/world/3.3.5/2018_01_02_02_world.sql new file mode 100644 index 00000000000..7fe03e77a5d --- /dev/null +++ b/sql/updates/world/3.3.5/2018_01_02_02_world.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_yogg_saron_squeeze'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(64125, 'spell_yogg_saron_squeeze'), +(64126, 'spell_yogg_saron_squeeze'); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 6f4326e1224..15e6be5ade7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -28,6 +28,7 @@ #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" +#include "SpellMgr.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "ulduar.h" @@ -1308,7 +1309,7 @@ class npc_constrictor_tentacle : public CreatureScript void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override { if (!apply) - passenger->RemoveAurasDueToSpell(SPELL_SQUEEZE); + passenger->RemoveAurasDueToSpell(sSpellMgr->GetSpellIdForDifficulty(SPELL_SQUEEZE, passenger)); } void UpdateAI(uint32 /*diff*/) override @@ -2422,7 +2423,7 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 } }; -class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125 +class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125, 64126 { public: spell_yogg_saron_squeeze() : SpellScriptLoader("spell_yogg_saron_squeeze") { }