diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-12-06 21:02:52 +0100 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2016-01-15 20:27:04 +0100 |
| commit | 700899e0e5caf0953f61b1615defefe9be3ce6b3 (patch) | |
| tree | 11ee284931647ef02fe9cb43307e7dbb1b0e14ec /src/server/game/Spells/SpellEffects.cpp | |
| parent | 93952b77e22a509fcd2b07c6af1680c00a9b4ec1 (diff) | |
Core/Quest: Fix issues reported by static analysis
(cherry picked from commit f1f4005ad8a17ea5fdd2b66f8ed3d0bd7c4c1efb)
# Conflicts:
# src/server/game/Entities/Unit/Unit.cpp
# src/server/game/Entities/Unit/Unit.h
# src/server/game/Handlers/GroupHandler.cpp
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 1d08f845a43..b993951db55 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -5435,7 +5435,7 @@ void Spell::EffectGameObjectDamage(SpellEffIndex /*effIndex*/) FactionTemplateEntry const* casterFaction = caster->GetFactionTemplateEntry(); FactionTemplateEntry const* targetFaction = sFactionTemplateStore.LookupEntry(gameObjTarget->GetUInt32Value(GAMEOBJECT_FACTION)); // Do not allow to damage GO's of friendly factions (ie: Wintergrasp Walls/Ulduar Storm Beacons) - if ((casterFaction && targetFaction && !casterFaction->IsFriendlyTo(*targetFaction)) || !targetFaction) + if (!targetFaction || (casterFaction && targetFaction && !casterFaction->IsFriendlyTo(*targetFaction))) gameObjTarget->ModifyHealth(-damage, caster, GetSpellInfo()->Id); } |