From f29644efd5cf430c321ad68122c385b4535069da Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 23 Jun 2019 13:28:45 +0200 Subject: [PATCH] some more cleanup, a5f8c0d follow-up (cherry picked from commit 00728cef1565a78b39541fbaea5923dcfc243743) --- src/server/game/Entities/Creature/Creature.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 2f2a71c34ca..99569ac175a 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -863,11 +863,7 @@ void Creature::Update(uint32 diff) if (m_regenTimer == 0) { - bool bInCombat = IsEngaged() && (!GetVictim() || // if IsInCombat() is true and this has no victim - !EnsureVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() || // or the victim/owner/charmer is not a player - !EnsureVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->IsGameMaster()); // or the victim/owner/charmer is not a GameMaster - - if (!IsInEvadeMode() && (!bInCombat || IsPolymorphed() || CanNotReachTarget())) // regenerate health if not in combat or if polymorphed + if (!IsInEvadeMode() && (!IsEngaged() || IsPolymorphed() || CanNotReachTarget())) // regenerate health if not in combat or if polymorphed RegenerateHealth(); if (GetPowerType() == POWER_ENERGY)