From 07c043552aa833bd101ffc0eb2ed71594fdea773 Mon Sep 17 00:00:00 2001
From: Nefertumm <nefertum.dev@protonmail.com>
Date: Wed, 27 Jul 2022 00:41:20 -0300
Subject: [PATCH] fix(Scripts/RuinsOfAhnQiraj): Ossirian reset (#12548)

---
 .../sql/updates/pending_db_world/rev_1658857216982492500.sql | 2 ++
 .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp       | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1658857216982492500.sql

diff --git a/data/sql/updates/pending_db_world/rev_1658857216982492500.sql b/data/sql/updates/pending_db_world/rev_1658857216982492500.sql
new file mode 100644
index 000000000..a54d274f3
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1658857216982492500.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `flags_extra` = `flags_extra`|0x80000000 WHERE `entry` = 15339;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index b885ce139..bfa85bc52 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -168,6 +168,11 @@ struct boss_ossirian : public BossAI
         {
             crystal->Use(me);
         }
+
+        std::list<Creature*> vortexes;
+        me->GetCreaturesWithEntryInRange(vortexes, 200.f, NPC_SAND_VORTEX);
+        for (Creature* vortex : vortexes)
+            vortex->DespawnOrUnsummon();
     }
 
     void SpawnNextCrystal()