diff options
| author | jackpoz <giacomopoz@gmail.com> | 2019-04-27 14:40:28 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-02 00:39:20 +0100 |
| commit | 519e3c9ab718ce50dbaf66a50d15f5ead2dc9885 (patch) | |
| tree | 7d304aaf28a4428d2c7655f79a7988d9b38254f4 | |
| parent | dd825c56148ed9530e4a314bc91f29ddc86b7122 (diff) | |
Core/Commands: Fix .cheat god command letting you die
Fix .cheat god command still letting you die with Area Aura like Slime near Thaddius, broken since 777b287dff8bce806849a26d59fe40f864c385ed
(cherry picked from commit f26f716714fefa2af4c6e3eea263206682d45236)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index cc8294c6965..4e9b7c222c9 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -687,10 +687,10 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons // Hook for OnDamage Event sScriptMgr->OnDamage(attacker, victim, damage); - if (victim->GetTypeId() == TYPEID_PLAYER && attacker != victim) + if (victim->GetTypeId() == TYPEID_PLAYER) { // Signal to pets that their owner was attacked - except when DOT. - if (damagetype != DOT) + if (attacker != victim && damagetype != DOT) { for (Unit* controlled : victim->m_Controlled) if (Creature* cControlled = controlled->ToCreature()) |