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

[10554] Fix wrong procs when spell hits with no damage

Browse source
This commit is contained in:
Laise 2010-09-28 15:40:32 +02:00
parent b0e89aa5da
commit 6a492ce678
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/SpellAuras.cpp
View file

@ -917,7 +917,7 @@ bool Aura::CanProcFrom(SpellEntry const *spell, uint32 EventProcEx, uint32 procE
// if no class mask defined - allow proc // if no class mask defined - allow proc
if (!((uint64*)ptr)[0] && !ptr[2]) if (!((uint64*)ptr)[0] && !ptr[2])
{ {
if (IsPassiveSpell(GetSpellProto()) && !(EventProcEx & PROC_EX_EX_TRIGGER_ALWAYS)) if (!(EventProcEx & PROC_EX_EX_TRIGGER_ALWAYS))
{ {
// Check for extra req (if none) and hit/crit // Check for extra req (if none) and hit/crit
if (EventProcEx == PROC_EX_NONE) if (EventProcEx == PROC_EX_NONE)
@ -931,7 +931,7 @@ bool Aura::CanProcFrom(SpellEntry const *spell, uint32 EventProcEx, uint32 procE
else // Passive spells hits here only if resist/reflect/immune/evade else // Passive spells hits here only if resist/reflect/immune/evade
{ {
// Passive spells can`t trigger if need hit (exclude cases when procExtra include non-active flags) // Passive spells can`t trigger if need hit (exclude cases when procExtra include non-active flags)
if ((EventProcEx & PROC_EX_NORMAL_HIT & procEx) && !active) if ((EventProcEx & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT) & procEx) && !active)
return false; return false;
} }
} }

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 "10553" #define REVISION_NR "10554"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__