From f0f72c74c0681d839dcb26ac459ff92a1d706df7 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 5 May 2019 17:28:28 +0200 Subject: [PATCH] Scripts/Deadmines: fixed placing shapeshifted players into the Slagworks trap at Vanessa VanCleef's encounter and fixed an issue that was preventing Vanessa's encounter from resetting properly when dying during her real fight --- .../EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp | 1 + src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp index 8882db5569..41746145bd 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp @@ -216,6 +216,7 @@ class boss_vanessa_van_cleef : public CreatureScript _EnterEvadeMode(); summons.DespawnAll(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + instance->SetBossState(DATA_VANESSA_VAN_CLEEF, FAIL); _DespawnAtEvade(); } diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 0ef0210a4e..0e8a522338 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -620,8 +620,8 @@ class spell_deadmines_ride_magma_vehicle : public SpellScriptLoader void HandleHit(SpellEffIndex effIndex) { - if (Unit* caster = GetCaster()) - GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[effIndex].BasePoints); + Unit* target = GetHitUnit(); + target->CastSpell(target, GetSpellInfo()->Effects[effIndex].BasePoints, true); } void Register() override