mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-18 19:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10518] Prevent emotes animation in feign death state.

Browse source 
In 3.x this has been posisble only with cheating tool.
This commit is contained in:
VladimirMangos 2010-09-22 14:05:27 +04:00
parent fa9c6e2e61
commit 14127b4d08
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/ChatHandler.cpp
View file

@ -494,7 +494,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
void WorldSession::HandleEmoteOpcode( WorldPacket & recv_data ) void WorldSession::HandleEmoteOpcode( WorldPacket & recv_data )
{ {
if(!GetPlayer()->isAlive()) if(!GetPlayer()->isAlive() || GetPlayer()->hasUnitState(UNIT_STAT_DIED))
return; return;
uint32 emote; uint32 emote;
@ -567,8 +567,14 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
case EMOTE_ONESHOT_NONE: case EMOTE_ONESHOT_NONE:
break; break;
default: default:
{
// in feign death state allowed only text emotes.
if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
break;
GetPlayer()->HandleEmoteCommand(emote_id); GetPlayer()->HandleEmoteCommand(emote_id);
break; break;
}
} }
Unit* unit = ObjectAccessor::GetUnit(*_player, guid); Unit* unit = ObjectAccessor::GetUnit(*_player, guid);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10517" #define REVISION_NR "10518"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__