summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol132.cpp
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 14:32:40 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 14:32:40 +0100
commit779aca60511055832e776ab4a6299a2b7e049a16 (patch)
treedfb031e9bd01b25ab0199286cf6e660f26489817 /src/Protocol/Protocol132.cpp
parentMerge branch 'master' into cmake (diff)
parentMerge branch 'master', remote-tracking branch 'upstream/master' (diff)
downloadcuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar
cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.gz
cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.bz2
cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.lz
cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.xz
cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.zst
cuberite-779aca60511055832e776ab4a6299a2b7e049a16.zip
Diffstat (limited to 'src/Protocol/Protocol132.cpp')
-rw-r--r--src/Protocol/Protocol132.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index d8f450588..346607b79 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -188,7 +188,7 @@ void cProtocol132::DataReceived(const char * a_Data, int a_Size)
byte Decrypted[512];
while (a_Size > 0)
{
- int NumBytes = (a_Size > sizeof(Decrypted)) ? sizeof(Decrypted) : a_Size;
+ int NumBytes = (a_Size > (int)sizeof(Decrypted)) ? (int)sizeof(Decrypted) : a_Size;
m_Decryptor.ProcessData(Decrypted, (byte *)a_Data, NumBytes);
super::DataReceived((const char *)Decrypted, NumBytes);
a_Size -= NumBytes;
@@ -705,7 +705,7 @@ void cProtocol132::Flush(void)
byte Encrypted[8192]; // Larger buffer, we may be sending lots of data (chunks)
while (a_Size > 0)
{
- int NumBytes = (a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : a_Size;
+ int NumBytes = (a_Size > (int)sizeof(Encrypted)) ? (int)sizeof(Encrypted) : a_Size;
m_Encryptor.ProcessData(Encrypted, (byte *)a_Data, NumBytes);
super::SendData((const char *)Encrypted, NumBytes);
a_Size -= NumBytes;