aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-04-22 10:56:31 +02:00
commit b8cec2dff1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/server/src/input_output_service/chat_manager.cpp
View file

@ -488,7 +488,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
{ {
// if( itCl->second->isMuted() ) // if( itCl->second->isMuted() )
CEntityId eid = TheDataset.getEntityId(sender); CEntityId eid = TheDataset.getEntityId(sender);
if(_MutedUniverseUsers.find( eid ) != _MutedUniverseUsers.end()) if(_MutedUsers.find( eid ) != _MutedUsers.end())
{ {
nldebug("IOSCM: chat The player %s:%x is universe muted", nldebug("IOSCM: chat The player %s:%x is universe muted",
TheDataset.getEntityId(sender).toString().c_str(), TheDataset.getEntityId(sender).toString().c_str(),
@ -650,7 +650,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
// If universal channel check if player muted // If universal channel check if player muted
if (session->getChan()->UniversalChannel) if (session->getChan()->UniversalChannel)
{ {
if(_MutedUsers.find( eid ) != _MutedUsers.end()) if(_MutedUniverseUsers.find( eid ) != _MutedUniverseUsers.end())
{ {
nldebug("IOSCM: chat The player %s:%x is muted", nldebug("IOSCM: chat The player %s:%x is muted",
TheDataset.getEntityId(sender).toString().c_str(), TheDataset.getEntityId(sender).toString().c_str(),