From e3411b4740be2241c49361f9f6223f52f4389c7d Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 23 Jun 2019 13:27:29 +0200 Subject: Core/Creature: Attach out-of-combat health regen to the Engaged system, not the Combat flag. Closes #21571. (cherry picked from commit a5f8c0d30ca8793a0d1f97a16ab0e0a9f066dab4) --- src/server/game/Entities/Creature/Creature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 2e260347a0a..2f2a71c34ca 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -863,7 +863,7 @@ void Creature::Update(uint32 diff) if (m_regenTimer == 0) { - bool bInCombat = IsInCombat() && (!GetVictim() || // if IsInCombat() is true and this has no victim + 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 -- cgit v1.2.3