diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2020-05-10 15:37:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 14:37:44 +0200 |
| commit | 5eaf68670ac13ae4b594b0fa2b6d36da61014b68 (patch) | |
| tree | 0ceee3839ddf7765422b53501a48bc46338bf9d0 /src/server/game/Entities | |
| parent | 772f506a3b426e27ee64b0506aed06219c8d7747 (diff) | |
Core/PacketIO: Updated logout opcodes (#24519)
(cherry picked from commit f59a701e2903d6ef023cd10aa7f4a80a524a8c07)
# Conflicts:
# src/server/database/Database/Implementation/LoginDatabase.cpp
# src/server/database/Database/Implementation/LoginDatabase.h
# src/server/game/Handlers/MiscHandler.cpp
# src/server/game/Server/Packets/AuthenticationPackets.cpp
# src/server/game/Server/Packets/AuthenticationPackets.h
# src/server/game/Server/Packets/CharacterPackets.h
# src/server/game/Server/Protocol/Opcodes.cpp
# src/server/game/Server/Protocol/Opcodes.h
# src/server/game/Server/WorldSession.cpp
# src/server/game/Server/WorldSession.h
# src/server/game/Server/WorldSocket.cpp
Co-authored-by: Shauren <shauren.trinity@gmail.com>
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 5f1b8034bb8..a90145c139f 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1788,6 +1788,8 @@ class TC_GAME_API Unit : public WorldObject void ProcSkillsAndReactives(bool isVictim, Unit* procTarget, uint32 typeMask, uint32 hitMask, WeaponAttackType attType); + protected: + void SetFeared(bool apply); void SetConfused(bool apply); void SetStunned(bool apply); @@ -1795,6 +1797,8 @@ class TC_GAME_API Unit : public WorldObject uint32 m_rootTimes; + private: + uint32 m_state; // Even derived shouldn't modify uint32 m_lastManaUse; // msecs TimeTrackerSmall m_splineSyncTimer; |