diff options
author | Wyrserth <43747507+Wyrserth@users.noreply.github.com> | 2019-05-30 20:07:46 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-12-09 00:13:59 +0100 |
commit | 9d865f7536ae6feda6fba77785e4548f95ca5d03 (patch) | |
tree | e6ab18f07f552669b6b10418a2122b0795241b20 /src/server/game/Spells/SpellEffects.cpp | |
parent | 049606e31edefd175030996b1504bcc4eef1a2f5 (diff) |
Core/Misc: don't allow players to use/activate/loot non-allowed gameobjects while under the effect of a damage immunity aura (#23319)
* Core/Misc: don't allow players to use/activate/loot non-allowed gameobjects while under the effect of a damage immunity aura.
* Forgot to change this in last-second rename.
* Apply suggested changes, thanks Shauren!
(cherry picked from commit 8bc5451864570c07eff6d427846335044f85a509)
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
-rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 6d1e0cbe581..cc1ea5cc0ed 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1656,6 +1656,10 @@ void Spell::EffectOpenLock() if (gameObjTarget) { GameObjectTemplate const* goInfo = gameObjTarget->GetGOInfo(); + + if (goInfo->GetNoDamageImmune() && player->HasUnitFlag(UNIT_FLAG_IMMUNE)) + return; + // Arathi Basin banner opening. /// @todo Verify correctness of this check if ((goInfo->type == GAMEOBJECT_TYPE_BUTTON && goInfo->button.noDamageImmune) || (goInfo->type == GAMEOBJECT_TYPE_GOOBER && goInfo->goober.requireLOS)) |