From de2c57f6cc93185e87afcb2c4cdc7b288ec6babc Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Wed, 17 Mar 2021 16:06:24 +0100
Subject: [PATCH] fix(scripts/VoA): Vault of Archavon (#4853)

---
 src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp  | 2 +-
 src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
index b1978e877..0c194d55f 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
@@ -206,7 +206,7 @@ public:
             if (target->GetTypeId() == TYPEID_UNIT && GetAura()->GetStackAmount() >= 10)
             {
                 target->CastSpell(target, SPELL_OVERCHARGED_BLAST, true);
-                target->ToCreature()->DespawnOrUnsummon(500);
+                Unit::Kill(target, target, false);
             }
 
             PreventDefaultAction();
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
index 19aa29fc6..4c887b69d 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
@@ -94,6 +94,7 @@ public:
         {
             if (rotateTimer)
             {
+                me->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, 0);
                 rotateTimer += diff;
                 if (rotateTimer >= 3000)
                 {