diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-17 21:22:45 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-17 21:22:45 +0200 |
| commit | fe8e904dead393968dfa674281931b408e926053 (patch) | |
| tree | a2bfe7a8a07995e2c79096cad7d2fc8e6039c10e /src/server/game/Entities/Pet | |
| parent | e0bf4d7e7d96221d2317e6847eaf0d483287c284 (diff) | |
| parent | 0f0cea104dcceb029fc74e12f60f913e55d267fc (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
Diffstat (limited to 'src/server/game/Entities/Pet')
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 7f4bead4656..82c6f1541ef 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1876,6 +1876,8 @@ bool Pet::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint3 if (!InitEntry(Entry)) return false; + // Force regen flag for player pets, just like we do for players themselves + SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER); SetSheath(SHEATH_STATE_MELEE); return true; |