From cdc96a7269011b2f3471e4b8d8a979949ce10e34 Mon Sep 17 00:00:00 2001
From: Rival <dev.rival@mail.ru>
Date: Mon, 15 Aug 2016 02:16:58 +0400
Subject: [PATCH] Core/Spells: Fix Corpse Explosion picking ghoul as a target
 without selection. (#83)

---
 src/scripts/Spells/spell_dk.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/Spells/spell_dk.cpp b/src/scripts/Spells/spell_dk.cpp
index dcc443f31..62cc45961 100644
--- a/src/scripts/Spells/spell_dk.cpp
+++ b/src/scripts/Spells/spell_dk.cpp
@@ -1313,13 +1313,13 @@ class spell_dk_blood_gorged : public SpellScriptLoader
 class CorpseExplosionCheck
 {
 public:
-    explicit CorpseExplosionCheck(uint64 casterGUID) : _casterGUID(casterGUID) { }
+    explicit CorpseExplosionCheck(uint64 casterGUID, bool allowGhoul) : _casterGUID(casterGUID), _allowGhoul(allowGhoul) { }
 
     bool operator()(WorldObject* obj) const
     {
         if (Unit* target = obj->ToUnit())
         {
-            if ((target->isDead() || (target->GetEntry() == NPC_DK_GHOUL && target->GetOwnerGUID() == _casterGUID))
+            if ((target->isDead() || (_allowGhoul && (target->GetEntry() == NPC_DK_GHOUL && target->GetOwnerGUID() == _casterGUID))
                 && !(target->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL)
                 && target->GetDisplayId() == target->GetNativeDisplayId())
                 return false;
@@ -1360,7 +1360,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader
 
             void CheckTarget(WorldObject*& target)
             {
-                if (CorpseExplosionCheck(GetCaster()->GetGUID())(target))
+                if (CorpseExplosionCheck(GetCaster()->GetGUID(), true)(target))
                     target = NULL;
 
                 _target = target;
@@ -1371,7 +1371,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader
                 WorldObject* target = _target;
                 if (!target)
                 {
-                    targets.remove_if(CorpseExplosionCheck(GetCaster()->GetGUID()));
+                    targets.remove_if(CorpseExplosionCheck(GetCaster()->GetGUID(), false));
                     if (targets.empty())
                     {
                         FinishCast(SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW);