From 8e04e47b67619bfe250fe05d0a9a006f14dd36ce Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Fri, 11 Feb 2022 17:32:27 -0300
Subject: [PATCH] fix(Scripts/UBRS): fix crash with Solakar minions (#10638)

---
 .../BlackrockSpire/instance_blackrock_spire.cpp              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index ed5cd03a5..e938ca071 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -362,7 +362,10 @@ public:
                         case FAIL:
                             for (const auto& creature : SolakarSummons)
                             {
-                                creature->RemoveFromWorld();
+                                if (creature)
+                                {
+                                    creature->RemoveFromWorld();
+                                }
                             }
                             SolakarSummons.clear();
                             CurrentSolakarWave = 0;