Merge remote-tracking branch 'origin' into lsid

This commit is contained in:
Akkadius
2019-07-21 22:18:19 +00:00
39 changed files with 497 additions and 383 deletions
+6 -1
View File
@@ -4182,7 +4182,12 @@ void Client::Handle_OP_ChannelMessage(const EQApplicationPacket *app)
return;
}
ChannelMessageReceived(cm->chan_num, cm->language, cm->skill_in_language, cm->message, cm->targetname);
uint8 skill_in_language = 100;
if (cm->language < MAX_PP_LANGUAGE)
{
skill_in_language = m_pp.languages[cm->language];
}
ChannelMessageReceived(cm->chan_num, cm->language, skill_in_language, cm->message, cm->targetname);
return;
}