diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-07 23:33:46 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-07 23:33:46 +0100 |
| commit | 41451100c171af3c21e10141d6651b1ef89477b6 (patch) | |
| tree | c7028991822e81b8cc11adc57c6caaeddd39ffe7 | |
| parent | Fix for entity spawning in general (diff) | |
| download | cuberite-41451100c171af3c21e10141d6651b1ef89477b6.tar cuberite-41451100c171af3c21e10141d6651b1ef89477b6.tar.gz cuberite-41451100c171af3c21e10141d6651b1ef89477b6.tar.bz2 cuberite-41451100c171af3c21e10141d6651b1ef89477b6.tar.lz cuberite-41451100c171af3c21e10141d6651b1ef89477b6.tar.xz cuberite-41451100c171af3c21e10141d6651b1ef89477b6.tar.zst cuberite-41451100c171af3c21e10141d6651b1ef89477b6.zip | |
| -rw-r--r-- | source/Protocol/Protocol17x.cpp | 2 | ||||
| -rw-r--r-- | source/Root.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/Protocol/Protocol17x.cpp b/source/Protocol/Protocol17x.cpp index daea79578..d45528c5f 100644 --- a/source/Protocol/Protocol17x.cpp +++ b/source/Protocol/Protocol17x.cpp @@ -420,7 +420,7 @@ void cProtocol172::SendLogin(const cPlayer & a_Player, const cWorld & a_World) { cPacketizer Pkt(*this, 0x01); // Join Game packet Pkt.WriteInt(a_Player.GetUniqueID()); - Pkt.WriteByte((Byte)a_Player.GetEffectiveGameMode()); + Pkt.WriteByte((Byte)a_Player.GetEffectiveGameMode() | (cRoot::Get()->GetServer()->IsHardcore() ? 0x08 : 0)); // Hardcore flag bit 4 Pkt.WriteChar((char)a_World.GetDimension()); Pkt.WriteByte(2); // TODO: Difficulty (set to Normal) Pkt.WriteByte(cRoot::Get()->GetServer()->GetMaxPlayers()); diff --git a/source/Root.cpp b/source/Root.cpp index 8ec94629b..4760c3ef1 100644 --- a/source/Root.cpp +++ b/source/Root.cpp @@ -285,7 +285,10 @@ void cRoot::LoadWorlds(cIniFile & IniFile) if (!FoundAdditionalWorlds) { - IniFile.AddKeyComment("Worlds", " World=secondworld"); + if (IniFile.GetKeyComment("Worlds", 0) != " World=secondworld") + { + IniFile.AddKeyComment("Worlds", " World=secondworld"); + } } } |