summaryrefslogtreecommitdiffstats
path: root/src/Protocol
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-24 10:13:54 +0200
committerMattes D <github@xoft.cz>2014-10-24 10:13:54 +0200
commit2940ced832e506fb1bb2b5292d49b2c7c31afb5b (patch)
tree9b5c06b80b752eda2cb5dd25d271d50d9eb1dc1f /src/Protocol
parentReimplemented cEvent using C++11 primitives. (diff)
parentMerge pull request #1565 from mc-server/MergedIniFile (diff)
downloadcuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.gz
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.bz2
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.lz
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.xz
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.zst
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.zip
Diffstat (limited to 'src/Protocol')
-rw-r--r--src/Protocol/Authenticator.cpp2
-rw-r--r--src/Protocol/MojangAPI.cpp2
-rw-r--r--src/Protocol/Protocol17x.cpp1
-rw-r--r--src/Protocol/Protocol18x.cpp1
4 files changed, 4 insertions, 2 deletions
diff --git a/src/Protocol/Authenticator.cpp b/src/Protocol/Authenticator.cpp
index 984000795..c9e4296a2 100644
--- a/src/Protocol/Authenticator.cpp
+++ b/src/Protocol/Authenticator.cpp
@@ -7,7 +7,7 @@
#include "../Server.h"
#include "../ClientHandle.h"
-#include "inifile/iniFile.h"
+#include "../IniFile.h"
#include "json/json.h"
#include "PolarSSL++/BlockingSslClientSocket.h"
diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp
index dd0d62af5..67f513e44 100644
--- a/src/Protocol/MojangAPI.cpp
+++ b/src/Protocol/MojangAPI.cpp
@@ -7,7 +7,7 @@
#include "MojangAPI.h"
#include "SQLiteCpp/Database.h"
#include "SQLiteCpp/Statement.h"
-#include "inifile/iniFile.h"
+#include "../IniFile.h"
#include "json/json.h"
#include "PolarSSL++/BlockingSslClientSocket.h"
#include "../RankManager.h"
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index f33d37b30..1d108ce9c 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1901,6 +1901,7 @@ void cProtocol172::HandlePacketClientSettings(cByteBuffer & a_ByteBuffer)
HANDLE_READ(a_ByteBuffer, ReadByte, Byte, ShowCape);
m_Client->SetLocale(Locale);
+ m_Client->SetViewDistance(ViewDistance);
// TODO: Do anything with the other values.
}
diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp
index 8445e8f26..8170a494f 100644
--- a/src/Protocol/Protocol18x.cpp
+++ b/src/Protocol/Protocol18x.cpp
@@ -2160,6 +2160,7 @@ void cProtocol180::HandlePacketClientSettings(cByteBuffer & a_ByteBuffer)
HANDLE_READ(a_ByteBuffer, ReadChar, char, SkinFlags);
m_Client->SetLocale(Locale);
+ m_Client->SetViewDistance(ViewDistance);
// TODO: Handle other values
}