From c95d1f72a879b9b0c430431325a9d3b92d46604b Mon Sep 17 00:00:00 2001
From: Hacki95 <62942638+Hacki95@users.noreply.github.com>
Date: Fri, 23 Apr 2021 11:23:01 +0200
Subject: [PATCH] fix(Core/Script): Shadowmeld (#4857)

---
 src/server/scripts/Spells/spell_generic.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 490bf880b5..735d403404 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -5111,13 +5111,11 @@ public:
                 pCaster->SendAttackSwingCancelAttack();
             }
 
-            if (!caster->GetInstanceScript() || !caster->GetInstanceScript()->IsEncounterInProgress()) //Don't leave combat if you are in combat with a boss
+            if (instant_exit)
             {
-                if (!instant_exit) {
-                    caster->getHostileRefManager().deleteReferences(); // exit combat after 6 seconds
-                }
-                else caster->CombatStop(); // isn't necessary to call AttackStop because is just called in CombatStop
+                caster->getHostileRefManager().deleteReferences();
             }
+            caster->CombatStop();
         }
 
         void Register() override