Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed spell effect quest complete when quest was already in target's quest log

Browse Source
This commit is contained in:
Shauren
2011-06-15 20:46:49 +02:00
parent 8b14aff909
commit 50dbb8c8a5
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/server/game/Spells/SpellEffects.cpp
View File

@@ -5121,7 +5121,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
if (chargesAura->ModCharges(-1))
m_caster->ToTempSummon()->UnSummon();
}
return;
}
// Stoneclaw Totem
@@ -5895,27 +5895,26 @@ void Spell::EffectReputation(SpellEffIndex effIndex)
void Spell::EffectQuestComplete(SpellEffIndex effIndex)
{
Player *pPlayer;
if (m_caster->GetTypeId() == TYPEID_PLAYER)
pPlayer = (Player*)m_caster;
else if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
pPlayer = (Player*)unitTarget;
Player* player = NULL;
if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
player = (Player*)unitTarget;
else if (m_caster->GetTypeId() == TYPEID_PLAYER)
player = (Player*)m_caster;
else
return;
uint32 quest_id = m_spellInfo->EffectMiscValue[effIndex];
if (quest_id)
uint32 questId = m_spellInfo->EffectMiscValue[effIndex];
if (questId)
{
Quest* pQuest = sObjectMgr->GetQuestTemplate(quest_id);
if (!pQuest || !pPlayer->CanTakeQuest(pQuest, false))
Quest const* quest = sObjectMgr->GetQuestTemplate(questId);
if (!quest)
return;
uint16 log_slot = pPlayer->FindQuestSlot(quest_id);
if (log_slot < MAX_QUEST_LOG_SIZE)
pPlayer->AreaExploredOrEventHappens(quest_id);
else if (!pPlayer->GetQuestRewardStatus(quest_id)) // never rewarded before
pPlayer->CompleteQuest(quest_id); // quest not in log - for internal use
uint16 logSlot = player->FindQuestSlot(questId);
if (logSlot < MAX_QUEST_LOG_SIZE)
player->AreaExploredOrEventHappens(questId);
else if (player->CanTakeQuest(quest, false)) // never rewarded before
player->CompleteQuest(questId); // quest not in log - for internal use
}
}