diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 06975b94a..d56fc534a 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -2041,6 +2041,8 @@ bool Creature::MeetsSelectAttackingRequirement(Unit* pTarget, SpellEntry const* if (selectFlags & SELECT_FLAG_IN_MELEE_RANGE && !CanReachWithMeleeAttack(pTarget)) return false; + if (selectFlags & SELECT_FLAG_NOT_IN_MELEE_RANGE && CanReachWithMeleeAttack(pTarget)) + return false; if (selectFlags & SELECT_FLAG_IN_LOS && !IsWithinLOSInMap(pTarget)) return false; diff --git a/src/game/Creature.h b/src/game/Creature.h index 6c25e1f15..2a3a3582b 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -298,13 +298,14 @@ enum AttackingTarget enum SelectFlags { - SELECT_FLAG_IN_LOS = 0x001, // Default Selection Requirement for Spell-targets - SELECT_FLAG_PLAYER = 0x002, - SELECT_FLAG_POWER_MANA = 0x004, // For Energy based spells, like manaburn - SELECT_FLAG_POWER_RAGE = 0x008, - SELECT_FLAG_POWER_ENERGY = 0x010, - SELECT_FLAG_POWER_RUNIC = 0x020, - SELECT_FLAG_IN_MELEE_RANGE = 0x040, + SELECT_FLAG_IN_LOS = 0x001, // Default Selection Requirement for Spell-targets + SELECT_FLAG_PLAYER = 0x002, + SELECT_FLAG_POWER_MANA = 0x004, // For Energy based spells, like manaburn + SELECT_FLAG_POWER_RAGE = 0x008, + SELECT_FLAG_POWER_ENERGY = 0x010, + SELECT_FLAG_POWER_RUNIC = 0x020, + SELECT_FLAG_IN_MELEE_RANGE = 0x040, + SELECT_FLAG_NOT_IN_MELEE_RANGE = 0x080, }; // Vendors diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index fa1c34794..1dd296a4a 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11849" + #define REVISION_NR "11850" #endif // __REVISION_NR_H__