Merge pull request #3304 from DemiDroL/patch-1

Core/Script: Fix possible crash in achievement_defenseless.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 1e17103d23d..7ba12847750 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -168,6 +168,9 @@ class achievement_defenseless : public AchievementCriteriaScript
 
         bool OnCheck(Player* /*player*/, Unit* target)
         {
+            if(!target)
+                return false;
+
             InstanceScript* instance = target->GetInstanceScript();
             if (!instance)
                 return false;