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

[7045] Some additional check

Browse source 
More correct spell select for creatures if spell PreventionType == SPELL_PREVENTION_TYPE_SILENCE
Also add check for PreventionType == SPELL_PREVENTION_TYPE_PACIFY

Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-01-07 17:59:12 +03:00
parent ccdad44e6c
commit d12944d8f2
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/Creature.cpp
View file

@ -1596,7 +1596,9 @@ SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim)
// continue; // continue;
if( dist > range || dist < minrange ) if( dist > range || dist < minrange )
continue; continue;
if(HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED)) if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
continue;
if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
continue; continue;
return spellInfo; return spellInfo;
} }
@ -1640,7 +1642,9 @@ SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim)
// continue; // continue;
if( dist > range || dist < minrange ) if( dist > range || dist < minrange )
continue; continue;
if(HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED)) if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
continue;
if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
continue; continue;
return spellInfo; return spellInfo;
} }

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 "7044" #define REVISION_NR "7045"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__