From a730e17a37b58f8b4f4c823a26099c4d2c3bdb85 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 27 Apr 2019 14:40:28 +0200 Subject: [PATCH] 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 # Conflicts: # src/server/game/Entities/Unit/Unit.cpp --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 2730ceb4411..c48c2af8019 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -768,10 +768,10 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam // Hook for OnDamage Event sScriptMgr->OnDamage(this, victim, damage); - if (victim->GetTypeId() == TYPEID_PLAYER && this != 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())