josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore

Browse Source
This commit is contained in:
Shocker
2011-06-18 18:31:02 +03:00
parent d7762a9ebb 5a18ee0e66
commit 587eb053c6
3 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+18 -6
View File
@@ -6809,21 +6809,27 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
return false;
// At melee attack or Hammer of the Righteous spell damage considered as melee attack
if ((procFlag & PROC_FLAG_DONE_MELEE_AUTO_ATTACK) || (procSpell && procSpell->Id == 53595))
bool stacker = !procSpell || procSpell->Id == 53595;
bool damager = procSpell && procSpell->EquippedItemClass == ITEM_CLASS_WEAPON;
if (!stacker && !damager)
return false;
triggered_spell_id = 31803;
// On target with 5 stacks of Holy Vengeance direct damage is done
if (Aura* aur = pVictim->GetAura(triggered_spell_id, GetGUID()))
{
if (aur->GetStackAmount() == 5)
{
if (stacker)
aur->RefreshDuration();
CastSpell(pVictim, 42463, true);
return true;
}
}
// Only Autoattack can stack debuff
if (procFlag & PROC_FLAG_DONE_SPELL_MELEE_DMG_CLASS)
if (!stacker)
return false;
break;
}
@@ -6834,21 +6840,27 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
return false;
// At melee attack or Hammer of the Righteous spell damage considered as melee attack
if ((procFlag & PROC_FLAG_DONE_MELEE_AUTO_ATTACK) || (procSpell && procSpell->Id == 53595))
bool stacker = !procSpell || procSpell->Id == 53595;
bool damager = procSpell && procSpell->EquippedItemClass == ITEM_CLASS_WEAPON;
if (!stacker && !damager)
return false;
triggered_spell_id = 53742;
// On target with 5 stacks of Blood Corruption direct damage is done
if (Aura* aur = pVictim->GetAura(triggered_spell_id, GetGUID()))
{
if (aur->GetStackAmount() == 5)
{
if (stacker)
aur->RefreshDuration();
CastSpell(pVictim, 53739, true);
return true;
}
}
// Only Autoattack can stack debuff
if (procFlag & PROC_FLAG_DONE_SPELL_MELEE_DMG_CLASS)
if (!stacker)
return false;
break;
}
src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
+19
View File
@@ -325,7 +325,16 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data)
{
// Send next quest
if (Quest const* nextquest = _player->GetNextQuest(guid , pQuest))
{
if (nextquest->IsAutoAccept() && _player->CanAddQuest(nextquest, true))
{
_player->AddQuest(nextquest, pObject);
if (_player->CanCompleteQuest(nextquest->GetQuestId()))
_player->CompleteQuest(nextquest->GetQuestId());
}
_player->PlayerTalkClass->SendQuestGiverQuestDetails(nextquest, guid, true);
}
(pObject->ToCreature())->AI()->sQuestReward(_player, pQuest, reward);
}
@@ -335,7 +344,17 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data)
{
// Send next quest
if (Quest const* nextquest = _player->GetNextQuest(guid , pQuest))
{
if (nextquest->IsAutoAccept() && _player->CanAddQuest(nextquest, true))
{
_player->AddQuest(nextquest, pObject);
if (_player->CanCompleteQuest(nextquest->GetQuestId()))
_player->CompleteQuest(nextquest->GetQuestId());
}
_player->PlayerTalkClass->SendQuestGiverQuestDetails(nextquest, guid, true);
}
pObject->ToGameObject()->AI()->QuestReward(_player, pQuest, reward);
}
break;
src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
+1
View File
@@ -17,6 +17,7 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
#include "ulduar.h"
enum AuriayaSpells