Allow spell cast on an NPC that is linked to a KillCredit to count toward the KillCredit.

--HG-- branch : trunk
2009-12-22 14:06:26 +01:00
parent e78bf5d666
commit da35e70579
1 changed files with 10 additions and 1 deletions
@@ -14572,8 +14572,17 @@ void Player::CastedCreatureOrGO(uint32 entry, uint64 guid, uint32 spell_id)
                    {
                        // creature activate objectives
                        if (qInfo->ReqCreatureOrGOId[j] > 0)
+                        {
                            // checked at quest_template loading
                            reqTarget = qInfo->ReqCreatureOrGOId[j];
+                            if (reqTarget != entry) // if entry doesn't match, check for killcredits referenced in template
+                            {
+                                CreatureInfo const *cinfo = objmgr.GetCreatureTemplate(entry);
+                                for (uint8 i = 0; i < MAX_KILL_CREDIT; ++i)
+                                    if (cinfo->KillCredit[i] == reqTarget)
+                                        entry = cinfo->KillCredit[i];
+                            }
+                         }
                    }
                    else
                    {