diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-01-07 13:57:34 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-01-07 13:57:34 +0100 |
| commit | 0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f (patch) | |
| tree | d2593b129bf0e83d72937cf52e8a9283c85be46a /src/Protocol/Protocol132.cpp | |
| parent | Merge branch 'master' of github.com:mc-server/MCServer (diff) | |
| parent | Added Base64Encode(). (diff) | |
| download | cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.gz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.bz2 cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.lz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.xz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.zst cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.zip | |
Diffstat (limited to 'src/Protocol/Protocol132.cpp')
| -rw-r--r-- | src/Protocol/Protocol132.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp index 46ac4ef89..302d1298c 100644 --- a/src/Protocol/Protocol132.cpp +++ b/src/Protocol/Protocol132.cpp @@ -5,7 +5,6 @@ #include "Globals.h" #include "ChunkDataSerializer.h" -#include "cryptopp/randpool.h" #include "Protocol132.h" #include "../Root.h" #include "../Server.h" @@ -19,8 +18,20 @@ #include "../WorldStorage/FastNBT.h" #include "../StringCompression.h" +#ifdef _MSC_VER + #pragma warning(push) + #pragma warning(disable:4127) + #pragma warning(disable:4244) + #pragma warning(disable:4231) + #pragma warning(disable:4189) + #pragma warning(disable:4702) +#endif +#include "cryptopp/randpool.h" +#ifdef _MSC_VER + #pragma warning(pop) +#endif #define HANDLE_PACKET_READ(Proc, Type, Var) \ @@ -866,7 +877,7 @@ void cProtocol132::SendCompass(const cWorld & a_World) void cProtocol132::SendEncryptionKeyRequest(void) { cCSLock Lock(m_CSPacket); - WriteByte((char)0xfd); + WriteByte(0xfd); WriteString(cRoot::Get()->GetServer()->GetServerID()); WriteShort((short)m_ServerPublicKey.size()); SendData(m_ServerPublicKey.data(), m_ServerPublicKey.size()); @@ -914,7 +925,7 @@ void cProtocol132::HandleEncryptionKeyResponse(const AString & a_EncKey, const A { // Send encryption key response: cCSLock Lock(m_CSPacket); - WriteByte((char)0xfc); + WriteByte(0xfc); WriteShort(0); WriteShort(0); Flush(); |