diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-07 21:10:12 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-07 21:10:12 +0100 |
| commit | 0f36d1c122c78757c9106eb6afa5e3897a87e5fb (patch) | |
| tree | af15705e4d27ee6fdad50f1c3486bd16728cee60 /src | |
| parent | Removed some unexported documentation. (diff) | |
| download | cuberite-0f36d1c122c78757c9106eb6afa5e3897a87e5fb.tar cuberite-0f36d1c122c78757c9106eb6afa5e3897a87e5fb.tar.gz cuberite-0f36d1c122c78757c9106eb6afa5e3897a87e5fb.tar.bz2 cuberite-0f36d1c122c78757c9106eb6afa5e3897a87e5fb.tar.lz cuberite-0f36d1c122c78757c9106eb6afa5e3897a87e5fb.tar.xz cuberite-0f36d1c122c78757c9106eb6afa5e3897a87e5fb.tar.zst cuberite-0f36d1c122c78757c9106eb6afa5e3897a87e5fb.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/ClientHandle.cpp | 2 | ||||
| -rw-r--r-- | src/World.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index 911c0795f..15b614999 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -1809,7 +1809,7 @@ void cClientHandle::SendChat(const AString & a_Message, ChatPrefixCodes a_ChatPr if (ShouldAppendChatPrefixes) Message = Printf("%s[MSG: %s] %s%s", cChatColor::LightBlue.c_str(), a_AdditionalData.c_str(), cChatColor::White.c_str(), cChatColor::Italic.c_str()); else - Message = Printf("%s", cChatColor::LightBlue.c_str()); + Message = Printf("%s: %s", a_AdditionalData.c_str(), cChatColor::LightBlue.c_str()); break; } case mtJoin: diff --git a/src/World.cpp b/src/World.cpp index e5c9f4398..bb6f5f29a 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -544,10 +544,10 @@ void cWorld::Start(void) m_IsPumpkinBonemealable = IniFile.GetValueSetB("Plants", "IsPumpkinBonemealable", false); m_IsSaplingBonemealable = IniFile.GetValueSetB("Plants", "IsSaplingBonemealable", true); m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false); - m_bEnabledPVP = IniFile.GetValueSetB("PVP", "Enabled", true); m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", true); m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true); m_bCommandBlocksEnabled = IniFile.GetValueSetB("Mechanics", "CommandBlocksEnabled", false); + m_bEnabledPVP = IniFile.GetValueSetB("Mechanics", "PVPEnabled", true); m_bUseChatPrefixes = IniFile.GetValueSetB("Mechanics", "UseChatPrefixes", true); m_VillagersShouldHarvestCrops = IniFile.GetValueSetB("Monsters", "VillagersShouldHarvestCrops", true); |