summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-30 10:06:18 +0200
committermadmaxoft <github@xoft.cz>2014-07-30 10:06:18 +0200
commitf095e770b84178ad45cbf3ba484b6ee18a239cb7 (patch)
tree70cbfedf25e0abc83655471a8ce44fee99b878f6 /src/ClientHandle.cpp
parentFixed "Dependency" typos (diff)
parentChange Group->SetColor() again. (diff)
downloadcuberite-f095e770b84178ad45cbf3ba484b6ee18a239cb7.tar
cuberite-f095e770b84178ad45cbf3ba484b6ee18a239cb7.tar.gz
cuberite-f095e770b84178ad45cbf3ba484b6ee18a239cb7.tar.bz2
cuberite-f095e770b84178ad45cbf3ba484b6ee18a239cb7.tar.lz
cuberite-f095e770b84178ad45cbf3ba484b6ee18a239cb7.tar.xz
cuberite-f095e770b84178ad45cbf3ba484b6ee18a239cb7.tar.zst
cuberite-f095e770b84178ad45cbf3ba484b6ee18a239cb7.zip
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.cpp19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index b390bf2d6..30ec737be 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1972,28 +1972,17 @@ void cClientHandle::SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSetBlock
void cClientHandle::SendChat(const AString & a_Message, eMessageType a_ChatPrefix, const AString & a_AdditionalData)
{
- bool ShouldAppendChatPrefixes = true;
-
- if (GetPlayer()->GetWorld() == NULL)
+ cWorld * World = GetPlayer()->GetWorld();
+ if (World == NULL)
{
- cWorld * World = cRoot::Get()->GetWorld(GetPlayer()->GetLoadedWorldName());
+ World = cRoot::Get()->GetWorld(GetPlayer()->GetLoadedWorldName());
if (World == NULL)
{
World = cRoot::Get()->GetDefaultWorld();
}
-
- if (!World->ShouldUseChatPrefixes())
- {
- ShouldAppendChatPrefixes = false;
- }
- }
- else if (!GetPlayer()->GetWorld()->ShouldUseChatPrefixes())
- {
- ShouldAppendChatPrefixes = false;
}
- AString Message = FormatMessageType(ShouldAppendChatPrefixes, a_ChatPrefix, a_AdditionalData);
-
+ AString Message = FormatMessageType(World->ShouldUseChatPrefixes(), a_ChatPrefix, a_AdditionalData);
m_Protocol->SendChat(Message.append(a_Message));
}