From f31260051370662ed63a21058e501bf1e4e1459d Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Wed, 8 Jun 2022 04:38:33 +0200
Subject: [PATCH] fix(Core): Crashfix. (#11956)

---
 src/server/scripts/Northrend/isle_of_conquest.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp
index a75615c39..afeba1fc5 100644
--- a/src/server/scripts/Northrend/isle_of_conquest.cpp
+++ b/src/server/scripts/Northrend/isle_of_conquest.cpp
@@ -127,8 +127,13 @@ public:
 
         void JustDied(Unit* killer) override
         {
-            if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
-                player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, me);
+            if (killer)
+            {
+                if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
+                {
+                    player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, me);
+                }
+            }
         }
     };