From 4584543d45d3e6404b6a8a6fd7cae6346066a7bb Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 23 Dec 2021 20:03:50 -0500 Subject: [PATCH] some more cleanup Port From (https://github.com/TrinityCore/TrinityCore/commit/f29644efd5cf430c321ad68122c385b4535069da) --- Source/Game/Entities/Creature/Creature.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index 4cbe2a779..fdc608cb3 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -590,11 +590,7 @@ namespace Game.Entities if (RegenTimer == 0) { - 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 - - 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() == PowerType.Energy)