mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10038] Prevent double triggering heal from 63534 and ranks.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>

Also use more simple and safe checks for added in [10035].
This commit is contained in:
zergtmn 2010-06-06 21:29:11 +04:00 • committed by VladimirMangos
parent 2ca1b3fcea
commit ff2f722f49
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/game/Unit.cpp
View file

@ -5919,7 +5919,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
if (!procSpell) if (!procSpell)
return false; return false;
Aura* healingAura = pVictim->GetAura(procSpell->Id, EFFECT_INDEX_0); // avoid double triggering from 2 auras
if (triggeredByAura->GetEffIndex() != EFFECT_INDEX_1)
return false;
// Renew
Aura* healingAura = pVictim->GetAura(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_PRIEST, UI64LIT(0x40), 0, GetGUID());
if (!healingAura) if (!healingAura)
return false; return false;
@ -7029,7 +7035,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
if (dummySpell->SpellIconID == 2709) if (dummySpell->SpellIconID == 2709)
{ {
// only melee auto attack affected and Rune Strike // only melee auto attack affected and Rune Strike
if (!(procFlag & PROC_FLAG_SUCCESSFUL_MELEE_HIT) && procSpell->Id != 56815) if (procSpell && procSpell->Id != 56815)
return false; return false;
basepoints[0] = triggerAmount * damage / 100; basepoints[0] = triggerAmount * damage / 100;
@ -7141,8 +7147,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
if (dummySpell->SpellIconID == 138) if (dummySpell->SpellIconID == 138)
{ {
// only main hand melee auto attack affected and Rune Strike // only main hand melee auto attack affected and Rune Strike
if ((procFlag & PROC_FLAG_SUCCESSFUL_OFFHAND_HIT) || if ((procFlag & PROC_FLAG_SUCCESSFUL_OFFHAND_HIT) || procSpell && procSpell->Id != 56815)
!(procFlag & PROC_FLAG_SUCCESSFUL_MELEE_HIT) && procSpell->Id != 56815)
return false; return false;
// triggered_spell_id in spell data // triggered_spell_id in spell data

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10037" #define REVISION_NR "10038"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__