Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 08:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fix an incorrect check that was exempting negative spells from _IMMUNE_TO_x checks. Closes #21929.

Browse Source
This commit is contained in:
Treeston
2018-08-28 19:42:18 +02:00
parent 829527a08e
commit 75e7404bba
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Object/Object.cpp
View File

@@ -2884,7 +2884,7 @@ bool WorldObject::IsValidAttackTarget(WorldObject const* target, SpellInfo const
return false;
// ignore immunity flags when assisting
if (!bySpell || (isPositiveSpell && !bySpell->HasAttribute(SPELL_ATTR6_ASSIST_IGNORE_IMMUNE_FLAG)))
if (!bySpell || !(isPositiveSpell && bySpell->HasAttribute(SPELL_ATTR6_ASSIST_IGNORE_IMMUNE_FLAG)))
{
if (unit && !unit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && unitTarget && unitTarget->IsImmuneToNPC())
return false;

3
src/server/game/Entities/Unit/UnitDefines.h
View File

@@ -340,7 +340,8 @@ enum ReactStates
REACT_DEFENSIVE = 1,
REACT_AGGRESSIVE = 2
};
inline char const* DescribeReactState(ReactStates state) {
inline char const* DescribeReactState(ReactStates state)
{
switch (state)
{
case REACT_PASSIVE: return "PASSIVE";