flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed group color's.

Browse Source
This commit is contained in:
Howaner 2014-07-27 13:47:21 +02:00
parent a5cca16abe
commit 7f9f46c911
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ClientHandle.cpp
View File

@ -1973,28 +1973,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) void cClientHandle::SendChat(const AString & a_Message, eMessageType a_ChatPrefix, const AString & a_AdditionalData)
{ {
bool ShouldAppendChatPrefixes = true; cWorld * World = GetPlayer()->GetWorld();
if (World == NULL)
if (GetPlayer()->GetWorld() == NULL)
{ {
cWorld * World = cRoot::Get()->GetWorld(GetPlayer()->GetLoadedWorldName()); World = cRoot::Get()->GetWorld(GetPlayer()->GetLoadedWorldName());
if (World == NULL) if (World == NULL)
{ {
World = cRoot::Get()->GetDefaultWorld(); 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)); m_Protocol->SendChat(Message.append(a_Message));
} }

2
src/GroupManager.cpp
View File

@ -153,7 +153,7 @@ bool cGroupManager::LoadGroups()
AString Color = IniFile.GetValue(KeyName, "Color", "-"); AString Color = IniFile.GetValue(KeyName, "Color", "-");
if ((Color != "-") && (Color.length() >= 1)) if ((Color != "-") && (Color.length() >= 1))
{ {
Group->SetColor(cChatColor::Delimiter + Color[0]); Group->SetColor(cChatColor::Delimiter + Color);
} }
else else
{ {