diff options
| author | Malcrom <malcromdev@gmail.com> | 2012-02-09 16:43:00 -0330 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2012-02-09 16:43:00 -0330 |
| commit | b20c0a1770872caec0f9e8069241e23df005ba60 (patch) | |
| tree | a4752d89d7bb49c133f12fd1ce66db2f9766fe2f /src/server/game/Handlers/ChatHandler.cpp | |
| parent | 197b72ccb66083460dee8b542ede83c69259e096 (diff) | |
| parent | 800cf737500048a0950dcde312b35be08e1ed006 (diff) | |
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/ChatHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 3d689196256..966eae598a6 100755 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -481,7 +481,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data) void WorldSession::HandleEmoteOpcode(WorldPacket & recv_data) { - if (!GetPlayer()->isAlive() || GetPlayer()->HasUnitState(UNIT_STAT_DIED)) + if (!GetPlayer()->isAlive() || GetPlayer()->HasUnitState(UNIT_STATE_DIED)) return; uint32 emote; @@ -558,7 +558,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket & recv_data) break; default: // Only allow text-emotes for "dead" entities (feign death included) - if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) + if (GetPlayer()->HasUnitState(UNIT_STATE_DIED)) break; GetPlayer()->HandleEmoteCommand(emote_anim); break; |