diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-03-17 15:27:17 -0700 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-03-17 15:27:17 -0700 |
| commit | 9fc7fe6b2828930dfe78d57b6c0c8a065fe18f78 (patch) | |
| tree | 4bed1a2ae56f7bcf26b349386d74cd3db604db08 /src | |
| parent | 21ccfb8e2e12945315dc3eba64c02d7ac5cd61e7 (diff) | |
| parent | b61759c9eac34665224fa77793eda9b2ffd87f5f (diff) | |
Merge pull request #5748 from MrSmite/Pet_1
Pet - Fix focus regen gets stuck due to lag/high diffs
closes #5153
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Pet/Pet.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 3221017e108..1a3c1a3fbb3 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -537,7 +537,13 @@ void Pet::Update(uint32 diff) Regenerate(POWER_FOCUS); m_regenTimer += PET_FOCUS_REGEN_INTERVAL - diff; if (!m_regenTimer) ++m_regenTimer; + + // Reset if large diff (lag) causes focus to get 'stuck' + if (m_regenTimer > PET_FOCUS_REGEN_INTERVAL) + m_regenTimer = PET_FOCUS_REGEN_INTERVAL; + break; + // in creature::update //case POWER_ENERGY: // Regenerate(POWER_ENERGY); |