jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 19:18:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into mod_notify_onbanwarn

Browse source
This commit is contained in:
woogerboy21 2016-01-31 18:43:24 -05:00
commit 54ebb6a508
62 changed files with 31523 additions and 21910 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/server_protocolhandler.cpp
View file

@ -608,7 +608,6 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo
ServerInfo_ChatMessage chatMessage;
for (int i = 0; i < chatHistory.size(); ++i) {
chatMessage = chatHistory.at(i);
qDebug() << QString::fromStdString(chatMessage.message()).simplified();
Event_RoomSay roomChatHistory;
roomChatHistory.set_message(chatMessage.sender_name() + ": " + chatMessage.message());
roomChatHistory.set_message_type(Event_RoomSay::ChatHistory);