diff options
| author | madmaxoft <github@xoft.cz> | 2014-05-28 22:41:23 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-05-28 22:41:23 +0200 |
| commit | 10273f64a2ec326201d3553f3704d2d6f21b7a86 (patch) | |
| tree | e892ee320e777f7bc82e9deae434e60e2f5cb6cc /src | |
| parent | Merge branch 'master' into VillageGen (diff) | |
| download | cuberite-10273f64a2ec326201d3553f3704d2d6f21b7a86.tar cuberite-10273f64a2ec326201d3553f3704d2d6f21b7a86.tar.gz cuberite-10273f64a2ec326201d3553f3704d2d6f21b7a86.tar.bz2 cuberite-10273f64a2ec326201d3553f3704d2d6f21b7a86.tar.lz cuberite-10273f64a2ec326201d3553f3704d2d6f21b7a86.tar.xz cuberite-10273f64a2ec326201d3553f3704d2d6f21b7a86.tar.zst cuberite-10273f64a2ec326201d3553f3704d2d6f21b7a86.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Protocol/Protocol17x.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index 7c526d103..f7564fe6d 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -234,7 +234,8 @@ void cProtocol172::SendChat(const cCompositeChat & a_Message) // Compose the complete Json string to send: Json::Value msg; - msg["text"] = cClientHandle::FormatMessageType(m_Client->GetPlayer()->GetWorld()->ShouldUseChatPrefixes(), a_Message.GetMessageType(), a_Message.GetAdditionalMessageTypeData()); // The client crashes without this field being present + cWorld * World = m_Client->GetPlayer()->GetWorld(); + msg["text"] = cClientHandle::FormatMessageType((World == NULL) ? false : World->ShouldUseChatPrefixes(), a_Message.GetMessageType(), a_Message.GetAdditionalMessageTypeData()); // The client crashes without this field being present const cCompositeChat::cParts & Parts = a_Message.GetParts(); for (cCompositeChat::cParts::const_iterator itr = Parts.begin(), end = Parts.end(); itr != end; ++itr) { |