Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-04 08:07:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creature: Attach out-of-combat health regen to the Engaged system, not the Combat flag. Closes #21571.

Browse Source
This commit is contained in:
Treeston
2019-06-23 13:27:29 +02:00
parent 632a300dd2
commit a5f8c0d30c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -799,7 +799,7 @@ void Creature::Update(uint32 diff)
if (m_regenTimer == 0) 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() || // or the victim/owner/charmer is not a player
!EnsureVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->IsGameMaster()); // or the victim/owner/charmer is not a GameMaster !EnsureVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->IsGameMaster()); // or the victim/owner/charmer is not a GameMaster