diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-06-23 13:27:29 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-12 00:33:23 +0100 |
| commit | e3411b4740be2241c49361f9f6223f52f4389c7d (patch) | |
| tree | 045dd0cfd7428797e0c2a46ff0aa1b42d9ec232a /src | |
| parent | dabdad3b47d7438327d3ee861eddd68e9bea68b1 (diff) | |
Core/Creature: Attach out-of-combat health regen to the Engaged system, not the Combat flag. Closes #21571.
(cherry picked from commit a5f8c0d30ca8793a0d1f97a16ab0e0a9f066dab4)
Diffstat (limited to 'src')
| -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 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 |