From cd1edd609fcf622c8fa16940f4fb575164854498 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 23 Dec 2021 20:03:03 -0500 Subject: [PATCH] Core/Creature: Attach out-of-combat health regen to the Engaged system, not the Combat flag. Port From (https://github.com/TrinityCore/TrinityCore/commit/e3411b4740be2241c49361f9f6223f52f4389c7d) --- Source/Game/Entities/Creature/Creature.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index 73a802fe8..4cbe2a779 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -590,7 +590,7 @@ namespace Game.Entities if (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 !GetVictim().GetCharmerOrOwnerPlayerOrPlayerItself() || // or the victim/owner/charmer is not a player !GetVictim().GetCharmerOrOwnerPlayerOrPlayerItself().IsGameMaster()); // or the victim/owner/charmer is not a GameMaster