diff options
author | HaoTNN <haotnn@gmail.com> | 2015-06-03 11:57:07 +0200 |
---|---|---|
committer | HaoTNN <haotnn@gmail.com> | 2015-06-03 11:57:07 +0200 |
commit | 6f1a3cb6dd6c102342eb8cfa901530f4d022c98c (patch) | |
tree | 697e29dfcf31001023ac87b325ea41f047dd16ae /src/Protocol/Protocol18x.cpp | |
parent | Fixes multiple furnace issues, including from loading world storage (diff) | |
parent | Merge pull request #2199 from jan64/master (diff) | |
download | cuberite-6f1a3cb6dd6c102342eb8cfa901530f4d022c98c.tar cuberite-6f1a3cb6dd6c102342eb8cfa901530f4d022c98c.tar.gz cuberite-6f1a3cb6dd6c102342eb8cfa901530f4d022c98c.tar.bz2 cuberite-6f1a3cb6dd6c102342eb8cfa901530f4d022c98c.tar.lz cuberite-6f1a3cb6dd6c102342eb8cfa901530f4d022c98c.tar.xz cuberite-6f1a3cb6dd6c102342eb8cfa901530f4d022c98c.tar.zst cuberite-6f1a3cb6dd6c102342eb8cfa901530f4d022c98c.zip |
Diffstat (limited to 'src/Protocol/Protocol18x.cpp')
-rw-r--r-- | src/Protocol/Protocol18x.cpp | 60 |
1 files changed, 57 insertions, 3 deletions
diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp index d06022ce0..d9449283b 100644 --- a/src/Protocol/Protocol18x.cpp +++ b/src/Protocol/Protocol18x.cpp @@ -234,18 +234,72 @@ void cProtocol180::SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSetBlockV void cProtocol180::SendChat(const AString & a_Message) { + this->SendChatType(a_Message, ctChatBox); +} + + + + + +void cProtocol180::SendChat(const cCompositeChat & a_Message) +{ + this->SendChatType(a_Message, ctChatBox); +} + + + + + +void cProtocol180::SendChatSystem(const AString & a_Message) +{ + this->SendChatType(a_Message, ctSystem); +} + + + + + +void cProtocol180::SendChatSystem(const cCompositeChat & a_Message) +{ + this->SendChatType(a_Message, ctSystem); +} + + + + + +void cProtocol180::SendChatAboveActionBar(const AString & a_Message) +{ + this->SendChatType(a_Message, ctAboveActionBar); +} + + + + + +void cProtocol180::SendChatAboveActionBar(const cCompositeChat & a_Message) +{ + this->SendChatType(a_Message, ctAboveActionBar); +} + + + + + +void cProtocol180::SendChatType(const AString & a_Message, eChatType type) +{ ASSERT(m_State == 3); // In game mode? cPacketizer Pkt(*this, 0x02); // Chat Message packet Pkt.WriteString(Printf("{\"text\":\"%s\"}", EscapeString(a_Message).c_str())); - Pkt.WriteBEInt8(0); + Pkt.WriteBEInt8(type); } -void cProtocol180::SendChat(const cCompositeChat & a_Message) +void cProtocol180::SendChatType(const cCompositeChat & a_Message, eChatType type) { ASSERT(m_State == 3); // In game mode? @@ -255,7 +309,7 @@ void cProtocol180::SendChat(const cCompositeChat & a_Message) // Send the message to the client: cPacketizer Pkt(*this, 0x02); Pkt.WriteString(a_Message.CreateJsonString(ShouldUseChatPrefixes)); - Pkt.WriteBEInt8(0); + Pkt.WriteBEInt8(type); } |