Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Emote: Fix an issue with EMOTE_STATE_READ, which persisted after closing the map

Browse Source
This commit is contained in:
Carbenium
2015-03-13 22:31:58 +01:00
parent 8c329aff72
commit c68449f49e
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Handlers/ChatHandler.cpp
View File

@@ -529,8 +529,10 @@ void WorldSession::HandleEmoteOpcode(WorldPackets::Chat::EmoteClient& /* packet
if (!GetPlayer()->IsAlive() || GetPlayer()->HasUnitState(UNIT_STATE_DIED))
return;
sScriptMgr->OnPlayerEmote(GetPlayer(), 0);
GetPlayer()->HandleEmoteCommand(0);
sScriptMgr->OnPlayerClearEmote(GetPlayer());
if (_player->GetUInt32Value(UNIT_NPC_EMOTESTATE))
_player->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
}
void WorldSession::HandleTextEmoteOpcode(WorldPackets::Chat::CTextEmote& packet)

4
src/server/game/Scripting/ScriptMgr.cpp
View File

@@ -1257,9 +1257,9 @@ void ScriptMgr::OnPlayerChat(Player* player, uint32 type, uint32 lang, std::stri
FOREACH_SCRIPT(PlayerScript)->OnChat(player, type, lang, msg, channel);
}
void ScriptMgr::OnPlayerEmote(Player* player, uint32 emote)
void ScriptMgr::OnPlayerClearEmote(Player* player)
{
FOREACH_SCRIPT(PlayerScript)->OnEmote(player, emote);
FOREACH_SCRIPT(PlayerScript)->OnClearEmote(player);
}
void ScriptMgr::OnPlayerTextEmote(Player* player, uint32 textEmote, uint32 emoteNum, ObjectGuid guid)

4
src/server/game/Scripting/ScriptMgr.h
View File

@@ -735,7 +735,7 @@ class PlayerScript : public UnitScript
virtual void OnChat(Player* /*player*/, uint32 /*type*/, uint32 /*lang*/, std::string& /*msg*/, Channel* /*channel*/) { }
// Both of the below are called on emote opcodes.
virtual void OnEmote(Player* /*player*/, uint32 /*emote*/) { }
virtual void OnClearEmote(Player* /*player*/) { }
virtual void OnTextEmote(Player* /*player*/, uint32 /*textEmote*/, uint32 /*emoteNum*/, ObjectGuid /*guid*/) { }
@@ -1076,7 +1076,7 @@ class ScriptMgr
void OnPlayerChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group);
void OnPlayerChat(Player* player, uint32 type, uint32 lang, std::string& msg, Guild* guild);
void OnPlayerChat(Player* player, uint32 type, uint32 lang, std::string& msg, Channel* channel);
void OnPlayerEmote(Player* player, uint32 emote);
void OnPlayerClearEmote(Player* player);
void OnPlayerTextEmote(Player* player, uint32 textEmote, uint32 emoteNum, ObjectGuid guid);
void OnPlayerSpellCast(Player* player, Spell* spell, bool skipCheck);
void OnPlayerLogin(Player* player, bool firstLogin);