diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-06-23 13:27:29 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-06-23 13:27:29 +0200 |
| commit | a5f8c0d30ca8793a0d1f97a16ab0e0a9f066dab4 (patch) | |
| tree | dab9efb103ed1a9d2ed318af43f16d1c0f732fe9 | |
| parent | 632a300dd20aad9663392c2f21a8ed29ffee1ef7 (diff) | |
Core/Creature: Attach out-of-combat health regen to the Engaged system, not the Combat flag. Closes #21571.
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 7585c37db81..ef2ccd8e635 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -799,7 +799,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 |