12 files changed, 170 insertions, 158 deletions

diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp
index 78318a5ee..ebe61631b 100644
--- a/src/Protocol/ChunkDataSerializer.cpp
+++ b/src/Protocol/ChunkDataSerializer.cpp
@@ -105,7 +105,7 @@ void cChunkDataSerializer::Serialize29(AString & a_Data)
 	a_Data.append((const char *)&BitMap1, sizeof(short));
 	a_Data.append((const char *)&BitMap2, sizeof(short));
 	
-	Int32 CompressedSizeBE = htonl(CompressedSize);
+	UInt32 CompressedSizeBE = htonl((UInt32)CompressedSize);
 	a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE));
 	
 	Int32 UnusedInt32 = 0;
@@ -163,7 +163,7 @@ void cChunkDataSerializer::Serialize39(AString & a_Data)
 	a_Data.append((const char *)&BitMap1, sizeof(short));
 	a_Data.append((const char *)&BitMap2, sizeof(short));
 	
-	Int32 CompressedSizeBE = htonl(CompressedSize);
+	UInt32 CompressedSizeBE = htonl((UInt32)CompressedSize);
 	a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE));
 	
 	// Unlike 29, 39 doesn't have the "unused" int
diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h
index d3383bf0d..ae06f2f9e 100644
--- a/src/Protocol/Protocol.h
+++ b/src/Protocol/Protocol.h
@@ -132,7 +132,7 @@ protected:
 	cCriticalSection m_CSPacket;  //< Each SendXYZ() function must acquire this CS in order to send the whole packet at once
 	
 	/// A generic data-sending routine, all outgoing packet data needs to be routed through this so that descendants may override it
-	virtual void SendData(const char * a_Data, int a_Size) = 0;
+	virtual void SendData(const char * a_Data, size_t a_Size) = 0;
 	
 	/// Called after writing each packet, enables descendants to flush their buffers
 	virtual void Flush(void) {};
@@ -143,10 +143,15 @@ protected:
 		SendData((const char *)&a_Value, 1);
 	}
 	
+	void WriteChar(char a_Value)
+	{
+		SendData(&a_Value, 1);
+	}
+	
 	void WriteShort(short a_Value)
 	{
-		a_Value = htons(a_Value);
-		SendData((const char *)&a_Value, 2);
+		u_short Value = htons((u_short)a_Value);
+		SendData((const char *)&Value, 2);
 	}
 	
 	/*
@@ -159,8 +164,8 @@ protected:
 	
 	void WriteInt(int a_Value)
 	{
-		a_Value = htonl(a_Value);
-		SendData((const char *)&a_Value, 4);
+		u_long Value = htonl((u_long)a_Value);
+		SendData((const char *)&Value, 4);
 	}
 	
 	void WriteUInt(unsigned int a_Value)
@@ -171,19 +176,19 @@ protected:
 	
 	void WriteInt64 (Int64 a_Value)
 	{
-		a_Value = HostToNetwork8(&a_Value);
-		SendData((const char *)&a_Value, 8);
+		UInt64 Value = HostToNetwork8(&a_Value);
+		SendData((const char *)Value, 8);
 	}
 	
 	void WriteFloat (float a_Value)
 	{
-		unsigned int val = HostToNetwork4(&a_Value);
+		UInt32 val = HostToNetwork4(&a_Value);
 		SendData((const char *)&val, 4);
 	}
 	
 	void WriteDouble(double a_Value)
 	{
-		unsigned long long val = HostToNetwork8(&a_Value);
+		UInt64 val = HostToNetwork8(&a_Value);
 		SendData((const char *)&val, 8);
 	}
 	
@@ -191,7 +196,7 @@ protected:
 	{
 		AString UTF16;
 		UTF8ToRawBEUTF16(a_Value.c_str(), a_Value.length(), UTF16);
-		WriteShort((unsigned short)(UTF16.size() / 2));
+		WriteShort((short)(UTF16.size() / 2));
 		SendData(UTF16.data(), UTF16.size());
 	}
 	
@@ -211,7 +216,7 @@ protected:
 	{
 		// A 32-bit integer can be encoded by at most 5 bytes:
 		unsigned char b[5];
-		int idx = 0;
+		size_t idx = 0;
 		do
 		{
 			b[idx] = (a_Value & 0x7f) | ((a_Value > 0x7f) ? 0x80 : 0x00);
@@ -224,7 +229,7 @@ protected:
 	
 	void WriteVarUTF8String(const AString & a_String)
 	{
-		WriteVarInt(a_String.size());
+		WriteVarInt((UInt32)a_String.size());
 		SendData(a_String.data(), a_String.size());
 	}
 } ;
diff --git a/src/Protocol/Protocol125.cpp b/src/Protocol/Protocol125.cpp
index 69f4934d8..bf946ef19 100644
--- a/src/Protocol/Protocol125.cpp
+++ b/src/Protocol/Protocol125.cpp
@@ -161,8 +161,8 @@ void cProtocol125::SendBlockAction(int a_BlockX, int a_BlockY, int a_BlockZ, cha
 	WriteInt  (a_BlockX);
 	WriteShort((short)a_BlockY);
 	WriteInt  (a_BlockZ);
-	WriteByte (a_Byte1);
-	WriteByte (a_Byte2);
+	WriteChar (a_Byte1);
+	WriteChar (a_Byte2);
 	Flush();
 }
 
@@ -209,12 +209,12 @@ void cProtocol125::SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSetBlockV
 	WriteByte (PACKET_MULTI_BLOCK);
 	WriteInt  (a_ChunkX);
 	WriteInt  (a_ChunkZ);
-	WriteShort((unsigned short)a_Changes.size());
-	WriteUInt (sizeof(int) * a_Changes.size());
+	WriteShort((short)a_Changes.size());
+	WriteUInt ((UInt32)(4 * a_Changes.size()));
 	for (sSetBlockVector::const_iterator itr = a_Changes.begin(), end = a_Changes.end(); itr != end; ++itr)
 	{
-		unsigned int Coords = itr->y | (itr->z << 8) | (itr->x << 12);
-		unsigned int Blocks = itr->BlockMeta | (itr->BlockType << 4);
+		UInt32 Coords = ((UInt32)itr->y) | ((UInt32)(itr->z << 8)) | ((UInt32)(itr->x << 12));
+		UInt32 Blocks = ((UInt32)itr->BlockMeta) | ((UInt32)(itr->BlockType << 4));
 		WriteUInt(Coords << 16 | Blocks);
 	}
 	Flush();
@@ -239,32 +239,11 @@ void cProtocol125::SendChat(const AString & a_Message)
 void cProtocol125::SendChat(const cCompositeChat & a_Message)
 {
 	// This version doesn't support composite messages, just extract each part's text and use it:
-	AString Msg;
-	const cCompositeChat::cParts & Parts = a_Message.GetParts();
-	for (cCompositeChat::cParts::const_iterator itr = Parts.begin(), end = Parts.end(); itr != end; ++itr)
-	{
-		switch ((*itr)->m_PartType)
-		{
-			case cCompositeChat::ptText:
-			case cCompositeChat::ptClientTranslated:
-			case cCompositeChat::ptRunCommand:
-			case cCompositeChat::ptSuggestCommand:
-			{
-				Msg.append((*itr)->m_Text);
-				break;
-			}
-			case cCompositeChat::ptUrl:
-			{
-				Msg.append(((cCompositeChat::cUrlPart *)(*itr))->m_Url);
-				break;
-			}
-		}  // switch (PartType)
-	}  // for itr - Parts[]
 	
 	// Send the message:
 	cCSLock Lock(m_CSPacket);
 	WriteByte  (PACKET_CHAT);
-	WriteString(Msg);
+	WriteString(a_Message.ExtractText());
 	Flush();
 }
 
@@ -346,8 +325,8 @@ void cProtocol125::SendEntityEffect(const cEntity & a_Entity, int a_EffectID, in
 	cCSLock Lock(m_CSPacket);
 	WriteByte (PACKET_ENTITY_EFFECT);
 	WriteInt  (a_Entity.GetUniqueID());
-	WriteByte (a_EffectID);
-	WriteByte (a_Amplifier);
+	WriteByte ((Byte)a_EffectID);
+	WriteByte ((Byte)a_Amplifier);
 	WriteShort(a_Duration);
 	Flush();
 }
@@ -378,7 +357,7 @@ void cProtocol125::SendEntityHeadLook(const cEntity & a_Entity)
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_ENT_HEAD_LOOK);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte((char)((a_Entity.GetHeadYaw() / 360.f) * 256));
+	WriteChar((char)((a_Entity.GetHeadYaw() / 360.f) * 256));
 	Flush();
 }
 
@@ -393,8 +372,8 @@ void cProtocol125::SendEntityLook(const cEntity & a_Entity)
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_ENT_LOOK);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte((char)((a_Entity.GetYaw()   / 360.f) * 256));
-	WriteByte((char)((a_Entity.GetPitch() / 360.f) * 256));
+	WriteChar((char)((a_Entity.GetYaw()   / 360.f) * 256));
+	WriteChar((char)((a_Entity.GetPitch() / 360.f) * 256));
 	Flush();
 }
 
@@ -442,9 +421,9 @@ void cProtocol125::SendEntityRelMove(const cEntity & a_Entity, char a_RelX, char
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_ENT_REL_MOVE);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte(a_RelX);
-	WriteByte(a_RelY);
-	WriteByte(a_RelZ);
+	WriteChar(a_RelX);
+	WriteChar(a_RelY);
+	WriteChar(a_RelZ);
 	Flush();
 }
 
@@ -459,11 +438,11 @@ void cProtocol125::SendEntityRelMoveLook(const cEntity & a_Entity, char a_RelX,
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_ENT_REL_MOVE_LOOK);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte(a_RelX);
-	WriteByte(a_RelY);
-	WriteByte(a_RelZ);
-	WriteByte((char)((a_Entity.GetYaw()   / 360.f) * 256));
-	WriteByte((char)((a_Entity.GetPitch() / 360.f) * 256));
+	WriteChar(a_RelX);
+	WriteChar(a_RelY);
+	WriteChar(a_RelZ);
+	WriteChar((char)((a_Entity.GetYaw()   / 360.f) * 256));
+	WriteChar((char)((a_Entity.GetPitch() / 360.f) * 256));
 	Flush();
 }
 
@@ -476,7 +455,7 @@ void cProtocol125::SendEntityStatus(const cEntity & a_Entity, char a_Status)
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_ENT_STATUS);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte(a_Status);
+	WriteChar(a_Status);
 	Flush();
 }
 
@@ -509,7 +488,7 @@ void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_Bloc
 	WriteDouble (a_BlockY);
 	WriteDouble (a_BlockZ);
 	WriteFloat  (a_Radius);
-	WriteInt    (a_BlocksAffected.size());
+	WriteInt    ((Int32)a_BlocksAffected.size());
 	int BlockX = (int)a_BlockX;
 	int BlockY = (int)a_BlockY;
 	int BlockZ = (int)a_BlockZ;
@@ -534,7 +513,7 @@ void cProtocol125::SendGameMode(eGameMode a_GameMode)
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_CHANGE_GAME_STATE);
 	WriteByte(3);
-	WriteByte((char)a_GameMode);
+	WriteChar((char)a_GameMode);
 	Flush();
 }
 
@@ -559,7 +538,7 @@ void cProtocol125::SendHealth(void)
 	cCSLock Lock(m_CSPacket);
 	WriteByte (PACKET_UPDATE_HEALTH);
 	WriteShort((short)m_Client->GetPlayer()->GetHealth());
-	WriteShort(m_Client->GetPlayer()->GetFoodLevel());
+	WriteShort((short)m_Client->GetPlayer()->GetFoodLevel());
 	WriteFloat((float)m_Client->GetPlayer()->GetFoodSaturationLevel());
 	Flush();
 }
@@ -572,7 +551,7 @@ void cProtocol125::SendInventorySlot(char a_WindowID, short a_SlotNum, const cIt
 {
 	cCSLock Lock(m_CSPacket);
 	WriteByte (PACKET_INVENTORY_SLOT);
-	WriteByte (a_WindowID);
+	WriteChar (a_WindowID);
 	WriteShort(a_SlotNum);
 	WriteItem (a_Item);
 	Flush();
@@ -621,17 +600,14 @@ void cProtocol125::SendMapColumn(int a_ID, int a_X, int a_Y, const Byte * a_Colo
 
 	WriteByte (PACKET_ITEM_DATA);
 	WriteShort(E_ITEM_MAP);
-	WriteShort(a_ID);
-	WriteShort(3 + a_Length);
+	WriteShort((short)a_ID);
+	WriteShort((short)(3 + a_Length));
 
 	WriteByte(0);
-	WriteByte(a_X);
-	WriteByte(a_Y);
+	WriteChar((char)a_X);
+	WriteChar((char)a_Y);
 	
-	for (unsigned int i = 0; i < a_Length; ++i)
-	{
-		WriteByte(a_Colors[i]);
-	}
+	SendData((const char *)a_Colors, a_Length);
 
 	Flush();
 }
@@ -646,16 +622,16 @@ void cProtocol125::SendMapDecorators(int a_ID, const cMapDecoratorList & a_Decor
 
 	WriteByte (PACKET_ITEM_DATA);
 	WriteShort(E_ITEM_MAP);
-	WriteShort(a_ID);
-	WriteShort(1 + (3 * a_Decorators.size()));
+	WriteShort((short)a_ID);
+	WriteShort((short)(1 + (3 * a_Decorators.size())));
 
 	WriteByte(1);
 	
 	for (cMapDecoratorList::const_iterator it = a_Decorators.begin(); it != a_Decorators.end(); ++it)
 	{
-		WriteByte((it->GetType() << 4) | (it->GetRot() & 0xf));
-		WriteByte(it->GetPixelX());
-		WriteByte(it->GetPixelZ());
+		WriteByte((Byte)(it->GetType() << 4) | (it->GetRot() & 0xf));
+		WriteByte((Byte)it->GetPixelX());
+		WriteByte((Byte)it->GetPixelZ());
 	}
 
 	Flush();
@@ -672,7 +648,7 @@ void cProtocol125::SendPickupSpawn(const cPickup & a_Pickup)
 	WriteByte   (PACKET_PICKUP_SPAWN);
 	WriteInt    (a_Pickup.GetUniqueID());
 	WriteShort  (a_Pickup.GetItem().m_ItemType);
-	WriteByte   (a_Pickup.GetItem().m_ItemCount);
+	WriteChar   (a_Pickup.GetItem().m_ItemCount);
 	WriteShort  (a_Pickup.GetItem().m_ItemDamage);
 	WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32));
 	WriteByte   ((char)(a_Pickup.GetSpeed().x * 8));
@@ -690,7 +666,7 @@ void cProtocol125::SendEntityAnimation(const cEntity & a_Entity, char a_Animatio
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_ANIMATION);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte(a_Animation);
+	WriteChar(a_Animation);
 	Flush();
 }
 
@@ -784,8 +760,8 @@ void cProtocol125::SendPlayerSpawn(const cPlayer & a_Player)
 	WriteInt   ((int)(a_Player.GetPosX() * 32));
 	WriteInt   ((int)(a_Player.GetPosY() * 32));
 	WriteInt   ((int)(a_Player.GetPosZ() * 32));
-	WriteByte  ((char)((a_Player.GetYaw()   / 360.f) * 256));
-	WriteByte  ((char)((a_Player.GetPitch() / 360.f) * 256));
+	WriteChar  ((char)((a_Player.GetYaw()   / 360.f) * 256));
+	WriteChar  ((char)((a_Player.GetPitch() / 360.f) * 256));
 	WriteShort (HeldItem.IsEmpty() ? 0 : HeldItem.m_ItemType);
 	Flush();
 }
@@ -811,9 +787,9 @@ void cProtocol125::SendPluginMessage(const AString & a_Channel, const AString &
 void cProtocol125::SendRemoveEntityEffect(const cEntity & a_Entity, int a_EffectID)
 {
 	cCSLock Lock(m_CSPacket);
-	WriteByte  (PACKET_REMOVE_ENTITY_EFFECT);
-	WriteInt   (a_Entity.GetUniqueID());
-	WriteByte  (a_EffectID);
+	WriteByte(PACKET_REMOVE_ENTITY_EFFECT);
+	WriteInt (a_Entity.GetUniqueID());
+	WriteChar((char)a_EffectID);
 	Flush();
 }
 
@@ -827,7 +803,7 @@ void cProtocol125::SendRespawn(void)
 	WriteByte  (PACKET_RESPAWN);
 	WriteInt   ((int)(m_Client->GetPlayer()->GetWorld()->GetDimension()));
 	WriteByte  (2);  // TODO: Difficulty; 2 = Normal
-	WriteByte  ((char)m_Client->GetPlayer()->GetGameMode());
+	WriteChar  ((char)m_Client->GetPlayer()->GetGameMode());
 	WriteShort (256);  // Current world height
 	WriteString("default");
 }
@@ -858,7 +834,7 @@ void cProtocol125::SendExperienceOrb(const cExpOrb & a_ExpOrb)
 	WriteInt((int) a_ExpOrb.GetPosX());
 	WriteInt((int) a_ExpOrb.GetPosY());
 	WriteInt((int) a_ExpOrb.GetPosZ());
-	WriteShort(a_ExpOrb.GetReward());
+	WriteShort((short)a_ExpOrb.GetReward());
 	Flush();
 }
 
@@ -899,7 +875,7 @@ void cProtocol125::SendSpawnMob(const cMonster & a_Mob)
 	cCSLock Lock(m_CSPacket);
 	WriteByte   (PACKET_SPAWN_MOB);
 	WriteInt    (a_Mob.GetUniqueID());
-	WriteByte   (a_Mob.GetMobType());
+	WriteByte   ((Byte)a_Mob.GetMobType());
 	WriteVectorI((Vector3i)(a_Mob.GetPosition() * 32));
 	WriteByte   (0);
 	WriteByte   (0);
@@ -924,7 +900,7 @@ void cProtocol125::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType,
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_SPAWN_OBJECT);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte(a_ObjectType);
+	WriteChar(a_ObjectType);
 	WriteInt ((int)(a_Entity.GetPosX() * 32));
 	WriteInt ((int)(a_Entity.GetPosY() * 32));
 	WriteInt ((int)(a_Entity.GetPosZ() * 32));
@@ -949,7 +925,7 @@ void cProtocol125::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTyp
 	cCSLock Lock(m_CSPacket);
 	WriteByte (PACKET_SPAWN_OBJECT);
 	WriteInt  (a_Vehicle.GetUniqueID());
-	WriteByte (a_VehicleType);
+	WriteChar (a_VehicleType);
 	WriteInt  ((int)(a_Vehicle.GetPosX() * 32));
 	WriteInt  ((int)(a_Vehicle.GetPosY() * 32));
 	WriteInt  ((int)(a_Vehicle.GetPosZ() * 32));
@@ -987,8 +963,8 @@ void cProtocol125::SendTeleportEntity(const cEntity & a_Entity)
 	WriteInt    ((int)(floor(a_Entity.GetPosX() * 32)));
 	WriteInt    ((int)(floor(a_Entity.GetPosY() * 32)));
 	WriteInt    ((int)(floor(a_Entity.GetPosZ() * 32)));
-	WriteByte   ((char)((a_Entity.GetYaw() / 360.f) * 256));
-	WriteByte   ((char)((a_Entity.GetPitch() / 360.f) * 256));
+	WriteChar   ((char)((a_Entity.GetYaw() / 360.f) * 256));
+	WriteChar   ((char)((a_Entity.GetPitch() / 360.f) * 256));
 	Flush();
 }
 
@@ -1063,7 +1039,7 @@ void cProtocol125::SendUseBed(const cEntity & a_Entity, int a_BlockX, int a_Bloc
 	WriteInt (a_Entity.GetUniqueID());
 	WriteByte(0);	// Unknown byte only 0 has been observed
 	WriteInt (a_BlockX);
-	WriteByte(a_BlockY);
+	WriteByte((Byte)a_BlockY);
 	WriteInt (a_BlockZ);
 	Flush();
 }
@@ -1107,7 +1083,7 @@ void cProtocol125::SendWholeInventory(const cWindow & a_Window)
 	cCSLock Lock(m_CSPacket);
 	cItems Slots;
 	a_Window.GetSlots(*(m_Client->GetPlayer()), Slots);
-	SendWindowSlots(a_Window.GetWindowID(), Slots.size(), &(Slots[0]));
+	SendWindowSlots(a_Window.GetWindowID(), (int)Slots.size(), &(Slots[0]));
 }
 
 
@@ -1124,7 +1100,7 @@ void cProtocol125::SendWindowClose(const cWindow & a_Window)
 	
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_WINDOW_CLOSE);
-	WriteByte(a_Window.GetWindowID());
+	WriteChar(a_Window.GetWindowID());
 	Flush();
 }
 
@@ -1141,10 +1117,10 @@ void cProtocol125::SendWindowOpen(const cWindow & a_Window)
 	}
 	cCSLock Lock(m_CSPacket);
 	WriteByte  (PACKET_WINDOW_OPEN);
-	WriteByte  (a_Window.GetWindowID());
-	WriteByte  (a_Window.GetWindowType());
+	WriteChar  (a_Window.GetWindowID());
+	WriteByte  ((Byte)a_Window.GetWindowType());
 	WriteString(a_Window.GetWindowTitle());
-	WriteByte  (a_Window.GetNumNonInventorySlots());
+	WriteByte  ((Byte)a_Window.GetNumNonInventorySlots());
 	Flush();
 }
 
@@ -1156,7 +1132,7 @@ void cProtocol125::SendWindowProperty(const cWindow & a_Window, short a_Property
 {
 	cCSLock Lock(m_CSPacket);
 	WriteByte (PACKET_WINDOW_PROPERTY);
-	WriteByte (a_Window.GetWindowID());
+	WriteChar (a_Window.GetWindowID());
 	WriteShort(a_Property);
 	WriteShort(a_Value);
 	Flush();
@@ -1177,7 +1153,7 @@ AString cProtocol125::GetAuthServerID(void)
 
 
 
-void cProtocol125::SendData(const char * a_Data, int a_Size)
+void cProtocol125::SendData(const char * a_Data, size_t a_Size)
 {
 	m_Client->SendData(a_Data, a_Size);
 }
@@ -1548,7 +1524,7 @@ int cProtocol125::ParsePluginMessage(void)
 	HANDLE_PACKET_READ(ReadBEUTF16String16, AString, ChannelName);
 	HANDLE_PACKET_READ(ReadBEShort,         short,   Length);
 	AString Data;
-	if (!m_ReceivedData.ReadString(Data, Length))
+	if (!m_ReceivedData.ReadString(Data, (size_t)Length))
 	{
 		m_ReceivedData.CheckValid();
 		return PARSE_INCOMPLETE;
@@ -1709,7 +1685,7 @@ void cProtocol125::SendPreChunk(int a_ChunkX, int a_ChunkZ, bool a_ShouldLoad)
 void cProtocol125::SendWindowSlots(char a_WindowID, int a_NumItems, const cItem * a_Items)
 {
 	WriteByte (PACKET_INVENTORY_WHOLE);
-	WriteByte (a_WindowID);
+	WriteChar (a_WindowID);
 	WriteShort((short)a_NumItems);
 
 	for (int j = 0; j < a_NumItems; j++)
@@ -1739,7 +1715,7 @@ void cProtocol125::WriteItem(const cItem & a_Item)
 		return;
 	}
 	
-	WriteByte (a_Item.m_ItemCount);
+	WriteChar (a_Item.m_ItemCount);
 	WriteShort(a_Item.m_ItemDamage);
 	
 	if (cItem::IsEnchantable(a_Item.m_ItemType))
@@ -1786,7 +1762,7 @@ int cProtocol125::ParseItem(cItem & a_Item)
 	}
 		
 	// TODO: Enchantment not implemented yet!
-	if (!m_ReceivedData.SkipRead(EnchantNumBytes))
+	if (!m_ReceivedData.SkipRead((size_t)EnchantNumBytes))
 	{
 		return PARSE_INCOMPLETE;
 	}
@@ -1871,7 +1847,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
 		case cMonster::mtCreeper:
 		{
 			WriteByte(0x10);
-			WriteByte(((const cCreeper &)a_Mob).IsBlowing() ? 1 : -1); // Blowing up?
+			WriteChar(((const cCreeper &)a_Mob).IsBlowing() ? 1 : -1); // Blowing up?
 			WriteByte(0x11);
 			WriteByte(((const cCreeper &)a_Mob).IsCharged() ? 1 : 0); // Lightning-charged?
 			break;
@@ -1941,9 +1917,9 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
 
 			WriteByte(0x10);
 			Byte SheepMetadata = 0;
-			SheepMetadata = ((const cSheep &)a_Mob).GetFurColor(); // Fur colour
+			SheepMetadata = (Byte)((const cSheep &)a_Mob).GetFurColor();
 
-			if (((const cSheep &)a_Mob).IsSheared()) // Is sheared?
+			if (((const cSheep &)a_Mob).IsSheared())
 			{
 				SheepMetadata |= 0x16;
 			}
@@ -1972,17 +1948,25 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
 			WriteByte(((const cWitch &)a_Mob).IsAngry() ? 1 : 0); // Aggravated? Doesn't seem to do anything
 			break;
 		}
+		case cMonster::mtWither:
+		{
+			WriteByte(0x54); // Int at index 20
+			WriteInt((Int32)((const cWither &)a_Mob).GetNumInvulnerableTicks());
+			WriteByte(0x66); // Float at index 6
+			WriteFloat((float)(a_Mob.GetHealth()));
+			break;
+		}
 		case cMonster::mtSlime:
 		case cMonster::mtMagmaCube:
 		{
 			WriteByte(0x10);
 			if (a_Mob.GetMobType() == cMonster::mtSlime)
 			{
-				WriteByte(((const cSlime &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME
+				WriteByte((Byte)((const cSlime &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME
 			}
 			else
 			{
-				WriteByte(((const cMagmaCube &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME
+				WriteByte((Byte)((const cMagmaCube &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME
 			}
 			break;
 		}
@@ -2021,7 +2005,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
 			WriteInt(Flags);
 
 			WriteByte(0x13);
-			WriteByte(((const cHorse &)a_Mob).GetHorseType()); // Type of horse (donkey, chestnut, etc.)
+			WriteByte((Byte)((const cHorse &)a_Mob).GetHorseType()); // Type of horse (donkey, chestnut, etc.)
 
 			WriteByte(0x54);
 			int Appearance = 0;
@@ -2033,6 +2017,10 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
 			WriteInt(((const cHorse &)a_Mob).GetHorseArmour()); // Horshey armour
 			break;
 		}
+		default:
+		{
+			break;
+		}
 	}
 }
 
diff --git a/src/Protocol/Protocol125.h b/src/Protocol/Protocol125.h
index aca24c03a..08d3ebbe9 100644
--- a/src/Protocol/Protocol125.h
+++ b/src/Protocol/Protocol125.h
@@ -125,7 +125,7 @@ protected:
 	
 	AString m_Username;  ///< Stored in ParseHandshake(), compared to Login username
 	
-	virtual void SendData(const char * a_Data, int a_Size) override;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 	
 	/// Sends the Handshake packet
 	void SendHandshake(const AString & a_ConnectionHash);
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index be9c503ed..ce5942a5c 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -115,7 +115,7 @@ void cProtocol132::DataReceived(const char * a_Data, size_t a_Size)
 		Byte Decrypted[512];
 		while (a_Size > 0)
 		{
-			int NumBytes = (a_Size > (int)sizeof(Decrypted)) ? (int)sizeof(Decrypted) : a_Size;
+			size_t NumBytes = (a_Size > sizeof(Decrypted)) ? sizeof(Decrypted) : a_Size;
 			m_Decryptor.ProcessData(Decrypted, (Byte *)a_Data, NumBytes);
 			super::DataReceived((const char *)Decrypted, NumBytes);
 			a_Size -= NumBytes;
@@ -139,8 +139,8 @@ void cProtocol132::SendBlockAction(int a_BlockX, int a_BlockY, int a_BlockZ, cha
 	WriteInt  (a_BlockX);
 	WriteShort((short)a_BlockY);
 	WriteInt  (a_BlockZ);
-	WriteByte (a_Byte1);
-	WriteByte (a_Byte2);
+	WriteChar (a_Byte1);
+	WriteChar (a_Byte2);
 	WriteShort(a_BlockType);
 	Flush();
 }
@@ -157,7 +157,7 @@ void cProtocol132::SendBlockBreakAnim(int a_entityID, int a_BlockX, int a_BlockY
 	WriteInt    (a_BlockX);
 	WriteInt    (a_BlockY);
 	WriteInt    (a_BlockZ);
-	WriteByte   (stage);
+	WriteChar   (stage);
 	Flush();
 }
 
@@ -259,7 +259,7 @@ void cProtocol132::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
 	WriteByte  (PACKET_LOGIN);
 	WriteInt   (a_Player.GetUniqueID());  // EntityID of the player
 	WriteString("default");  // Level type
-	WriteByte  ((int)a_Player.GetGameMode());
+	WriteByte  ((Byte)a_Player.GetGameMode());
 	WriteByte  ((Byte)(a_World.GetDimension()));
 	WriteByte  (2);  // TODO: Difficulty
 	WriteByte  (0);  // Unused, used to be world height
@@ -283,8 +283,8 @@ void cProtocol132::SendPlayerSpawn(const cPlayer & a_Player)
 	WriteInt   ((int)(a_Player.GetPosX() * 32));
 	WriteInt   ((int)(a_Player.GetPosY() * 32));
 	WriteInt   ((int)(a_Player.GetPosZ() * 32));
-	WriteByte  ((char)((a_Player.GetYaw()   / 360.f) * 256));
-	WriteByte  ((char)((a_Player.GetPitch() / 360.f) * 256));
+	WriteChar  ((char)((a_Player.GetYaw()   / 360.f) * 256));
+	WriteChar  ((char)((a_Player.GetPitch() / 360.f) * 256));
 	WriteShort (HeldItem.IsEmpty() ? 0 : HeldItem.m_ItemType);
 	// Player metadata: just use a default metadata value, since the client doesn't like starting without any metadata:
 	WriteByte  (0);  // Index 0, byte (flags)
@@ -306,7 +306,7 @@ void cProtocol132::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int
 	WriteInt    (a_SrcY);
 	WriteInt    (a_SrcZ);
 	WriteFloat  (a_Volume);
-	WriteByte   ((char)(a_Pitch * 63.0f));
+	WriteChar   ((char)(a_Pitch * 63.0f));
 	Flush();
 }
 
@@ -320,7 +320,7 @@ void cProtocol132::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_Src
 	WriteByte(PACKET_SOUND_PARTICLE_EFFECT);
 	WriteInt (a_EffectID);
 	WriteInt (a_SrcX);
-	WriteByte(a_SrcY);
+	WriteByte((Byte)a_SrcY);
 	WriteInt (a_SrcZ);
 	WriteInt (a_Data);
 	Flush();
@@ -335,7 +335,7 @@ void cProtocol132::SendSpawnMob(const cMonster & a_Mob)
 	cCSLock Lock(m_CSPacket);
 	WriteByte   (PACKET_SPAWN_MOB);
 	WriteInt    (a_Mob.GetUniqueID());
-	WriteByte   (a_Mob.GetMobType());
+	WriteByte   ((Byte)a_Mob.GetMobType());
 	WriteVectorI((Vector3i)(a_Mob.GetPosition() * 32));
 	WriteByte   ((Byte)((a_Mob.GetYaw()     / 360.f) * 256));
 	WriteByte   ((Byte)((a_Mob.GetPitch()   / 360.f) * 256));
@@ -411,12 +411,12 @@ void cProtocol132::SendWholeInventory(const cWindow & a_Window)
 	const cInventory & Inventory = m_Client->GetPlayer()->GetInventory();
 	int BaseOffset = a_Window.GetNumSlots() - (cInventory::invNumSlots - cInventory::invInventoryOffset);  // Number of non-inventory slots
 	char WindowID = a_Window.GetWindowID();
-	for (int i = 0; i < cInventory::invInventoryCount; i++)
+	for (short i = 0; i < cInventory::invInventoryCount; i++)
 	{
 		SendInventorySlot(WindowID, BaseOffset + i, Inventory.GetInventorySlot(i));
 	}  // for i - Inventory[]
 	BaseOffset += cInventory::invInventoryCount;
-	for (int i = 0; i < cInventory::invHotbarCount; i++)
+	for (short i = 0; i < cInventory::invHotbarCount; i++)
 	{
 		SendInventorySlot(WindowID, BaseOffset + i, Inventory.GetHotbarSlot(i));
 	}  // for i - Hotbar[]
@@ -527,21 +527,30 @@ int cProtocol132::ParseClientStatuses(void)
 
 int cProtocol132::ParseEncryptionKeyResponse(void)
 {
+	// Read the encryption key:
 	HANDLE_PACKET_READ(ReadBEShort, short, EncKeyLength);
+	if (EncKeyLength > MAX_ENC_LEN)
+	{
+		LOGD("Too long encryption key");
+		m_Client->Kick("Hacked client");
+		return PARSE_OK;
+	}
 	AString EncKey;
-	if (!m_ReceivedData.ReadString(EncKey, EncKeyLength))
+	if (!m_ReceivedData.ReadString(EncKey, (size_t)EncKeyLength))
 	{
 		return PARSE_INCOMPLETE;
 	}
+	
+	// Read the encryption nonce:
 	HANDLE_PACKET_READ(ReadBEShort, short, EncNonceLength);
 	AString EncNonce;
-	if (!m_ReceivedData.ReadString(EncNonce, EncNonceLength))
+	if (!m_ReceivedData.ReadString(EncNonce, (size_t)EncNonceLength))
 	{
 		return PARSE_INCOMPLETE;
 	}
-	if ((EncKeyLength > MAX_ENC_LEN) || (EncNonceLength > MAX_ENC_LEN))
+	if (EncNonceLength > MAX_ENC_LEN)
 	{
-		LOGD("Too long encryption");
+		LOGD("Too long encryption nonce");
 		m_Client->Kick("Hacked client");
 		return PARSE_OK;
 	}
@@ -605,7 +614,7 @@ int cProtocol132::ParseTabCompletion(void)
 
 
 
-void cProtocol132::SendData(const char * a_Data, int a_Size)
+void cProtocol132::SendData(const char * a_Data, size_t a_Size)
 {
 	m_DataToSend.append(a_Data, a_Size);
 }
@@ -623,23 +632,23 @@ void cProtocol132::Flush(void)
 		LOGD("Flushing empty");
 		return;
 	}
-	const char * a_Data = m_DataToSend.data();
-	int a_Size = m_DataToSend.size();
+	const char * Data = m_DataToSend.data();
+	size_t Size = m_DataToSend.size();
 	if (m_IsEncrypted)
 	{
 		Byte Encrypted[8192];  // Larger buffer, we may be sending lots of data (chunks)
-		while (a_Size > 0)
+		while (Size > 0)
 		{
-			int NumBytes = (a_Size > (int)sizeof(Encrypted)) ? (int)sizeof(Encrypted) : a_Size;
-			m_Encryptor.ProcessData(Encrypted, (Byte *)a_Data, NumBytes);
+			size_t NumBytes = (Size > sizeof(Encrypted)) ? sizeof(Encrypted) : Size;
+			m_Encryptor.ProcessData(Encrypted, (Byte *)Data, NumBytes);
 			super::SendData((const char *)Encrypted, NumBytes);
-			a_Size -= NumBytes;
-			a_Data += NumBytes;
+			Size -= NumBytes;
+			Data += NumBytes;
 		}
 	}
 	else
 	{
-		super::SendData(a_Data, a_Size);
+		super::SendData(Data, Size);
 	}
 	m_DataToSend.clear();
 }
@@ -665,7 +674,7 @@ void cProtocol132::WriteItem(const cItem & a_Item)
 	}
 	
 	WriteShort(ItemType);
-	WriteByte (a_Item.m_ItemCount);
+	WriteChar (a_Item.m_ItemCount);
 	WriteShort(a_Item.m_ItemDamage);
 	
 	if (a_Item.m_Enchantments.IsEmpty())
@@ -681,7 +690,7 @@ void cProtocol132::WriteItem(const cItem & a_Item)
 	Writer.Finish();
 	AString Compressed;
 	CompressStringGZIP(Writer.GetResult().data(), Writer.GetResult().size(), Compressed);
-	WriteShort(Compressed.size());
+	WriteShort((short)Compressed.size());
 	SendData(Compressed.data(), Compressed.size());
 }
 
@@ -717,8 +726,8 @@ int cProtocol132::ParseItem(cItem & a_Item)
 		
 	// Read the metadata
 	AString Metadata;
-	Metadata.resize(MetadataLength);
-	if (!m_ReceivedData.ReadBuf((void *)Metadata.data(), MetadataLength))
+	Metadata.resize((size_t)MetadataLength);
+	if (!m_ReceivedData.ReadBuf((void *)Metadata.data(), (size_t)MetadataLength))
 	{
 		return PARSE_INCOMPLETE;
 	}
diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h
index 0702fbf5a..b280c8a41 100644
--- a/src/Protocol/Protocol132.h
+++ b/src/Protocol/Protocol132.h
@@ -87,7 +87,7 @@ protected:
 	/// The ServerID used for session authentication; set in StartEncryption(), used in GetAuthServerID()
 	AString m_AuthServerID;
 	
-	virtual void SendData(const char * a_Data, int a_Size) override;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 	
 	// DEBUG:
 	virtual void Flush(void) override;
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp
index 232b2718e..f694af1eb 100644
--- a/src/Protocol/Protocol14x.cpp
+++ b/src/Protocol/Protocol14x.cpp
@@ -103,9 +103,9 @@ void cProtocol142::SendPickupSpawn(const cPickup & a_Pickup)
 	WriteInt    (a_Pickup.GetUniqueID());
 	WriteItem   (a_Pickup.GetItem());
 	WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32));
-	WriteByte   ((char)(a_Pickup.GetSpeed().x * 8));
-	WriteByte   ((char)(a_Pickup.GetSpeed().y * 8));
-	WriteByte   ((char)(a_Pickup.GetSpeed().z * 8));
+	WriteChar   ((char)(a_Pickup.GetSpeed().x * 8));
+	WriteChar   ((char)(a_Pickup.GetSpeed().y * 8));
+	WriteChar   ((char)(a_Pickup.GetSpeed().z * 8));
 	Flush();
 }
 
@@ -119,7 +119,7 @@ void cProtocol142::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_Src
 	WriteByte(PACKET_SOUND_PARTICLE_EFFECT);
 	WriteInt (a_EffectID);
 	WriteInt (a_SrcX);
-	WriteByte(a_SrcY);
+	WriteByte((Byte)a_SrcY);
 	WriteInt (a_SrcZ);
 	WriteInt (a_Data);
 	WriteBool(0);
@@ -218,7 +218,7 @@ void cProtocol146::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType,
 	cCSLock Lock(m_CSPacket);
 	WriteByte(PACKET_SPAWN_OBJECT);
 	WriteInt (a_Entity.GetUniqueID());
-	WriteByte(a_ObjectType);
+	WriteChar(a_ObjectType);
 	WriteInt ((int)(a_Entity.GetPosX() * 32));
 	WriteInt ((int)(a_Entity.GetPosY() * 32));
 	WriteInt ((int)(a_Entity.GetPosZ() * 32));
@@ -243,7 +243,7 @@ void cProtocol146::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTyp
 	cCSLock Lock(m_CSPacket);
 	WriteByte (PACKET_SPAWN_OBJECT);
 	WriteInt  (a_Vehicle.GetUniqueID());
-	WriteByte (a_VehicleType);
+	WriteChar (a_VehicleType);
 	WriteInt  ((int)(a_Vehicle.GetPosX() * 32));
 	WriteInt  ((int)(a_Vehicle.GetPosY() * 32));
 	WriteInt  ((int)(a_Vehicle.GetPosZ() * 32));
diff --git a/src/Protocol/Protocol16x.cpp b/src/Protocol/Protocol16x.cpp
index ecb24254f..bf7d9a0b1 100644
--- a/src/Protocol/Protocol16x.cpp
+++ b/src/Protocol/Protocol16x.cpp
@@ -119,7 +119,7 @@ void cProtocol161::SendHealth(void)
 	cCSLock Lock(m_CSPacket);
 	WriteByte (PACKET_UPDATE_HEALTH);
 	WriteFloat((float)m_Client->GetPlayer()->GetHealth());
-	WriteShort(m_Client->GetPlayer()->GetFoodLevel());
+	WriteShort((short)m_Client->GetPlayer()->GetFoodLevel());
 	WriteFloat((float)m_Client->GetPlayer()->GetFoodSaturationLevel());
 	Flush();
 }
@@ -163,10 +163,10 @@ void cProtocol161::SendWindowOpen(const cWindow & a_Window)
 	}
 	cCSLock Lock(m_CSPacket);
 	WriteByte  (PACKET_WINDOW_OPEN);
-	WriteByte  (a_Window.GetWindowID());
-	WriteByte  (a_Window.GetWindowType());
+	WriteChar  (a_Window.GetWindowID());
+	WriteByte  ((Byte)a_Window.GetWindowType());
 	WriteString(a_Window.GetWindowTitle());
-	WriteByte  (a_Window.GetNumNonInventorySlots());
+	WriteByte  ((Byte)a_Window.GetNumNonInventorySlots());
 	WriteByte  (1);  // Use title
 	if (a_Window.GetWindowType() == cWindow::wtAnimalChest)
 	{
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 721ed349e..a4319df37 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1236,7 +1236,7 @@ void cProtocol172::SendWindowProperty(const cWindow & a_Window, short a_Property
 
 
 
-void cProtocol172::AddReceivedData(const char * a_Data, int a_Size)
+void cProtocol172::AddReceivedData(const char * a_Data, size_t a_Size)
 {
 	// Write the incoming data into the comm log file:
 	if (g_ShouldLogCommIn)
@@ -1258,7 +1258,7 @@ void cProtocol172::AddReceivedData(const char * a_Data, int a_Size)
 		AString Hex;
 		CreateHexDump(Hex, a_Data, a_Size, 16);
 		m_CommLogFile.Printf("Incoming data: %d (0x%x) bytes: \n%s\n",
-			a_Size, a_Size, Hex.c_str()
+			(unsigned)a_Size, (unsigned)a_Size, Hex.c_str()
 		);
 		m_CommLogFile.Flush();
 	}
@@ -1988,14 +1988,14 @@ void cProtocol172::WritePacket(cByteBuffer & a_Packet)
 
 
 
-void cProtocol172::SendData(const char * a_Data, int a_Size)
+void cProtocol172::SendData(const char * a_Data, size_t a_Size)
 {
 	if (m_IsEncrypted)
 	{
 		Byte Encrypted[8192];  // Larger buffer, we may be sending lots of data (chunks)
 		while (a_Size > 0)
 		{
-			size_t NumBytes = ((size_t)a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : (size_t)a_Size;
+			size_t NumBytes = (a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : a_Size;
 			m_Encryptor.ProcessData(Encrypted, (Byte *)a_Data, NumBytes);
 			m_Client->SendData((const char *)Encrypted, NumBytes);
 			a_Size -= NumBytes;
@@ -2535,6 +2535,7 @@ void cProtocol172::cPacketizer::WriteEntityMetadata(const cEntity & a_Entity)
 			WriteByte(Frame.GetRotation());
 			break;
 		}
+		default: break;
 	}
 }
 
@@ -2659,6 +2660,15 @@ void cProtocol172::cPacketizer::WriteMobMetadata(const cMonster & a_Mob)
 			WriteByte(((const cWitch &)a_Mob).IsAngry() ? 1 : 0);
 			break;
 		}
+
+		case cMonster::mtWither:
+		{
+			WriteByte(0x54); // Int at index 20
+			WriteInt(((const cWither &)a_Mob).GetNumInvulnerableTicks());
+			WriteByte(0x66); // Float at index 6
+			WriteFloat((float)(a_Mob.GetHealth()));
+			break;
+		}
 		
 		case cMonster::mtSlime:
 		{
diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h
index 41163009e..91186b270 100644
--- a/src/Protocol/Protocol17x.h
+++ b/src/Protocol/Protocol17x.h
@@ -196,7 +196,7 @@ protected:
 			m_Out.WriteVarUTF8String(a_Value);
 		}
 		
-		void WriteBuf(const char * a_Data, int a_Size)
+		void WriteBuf(const char * a_Data, size_t a_Size)
 		{
 			m_Out.Write(a_Data, a_Size);
 		}
@@ -243,7 +243,7 @@ protected:
 	
 	
 	/** Adds the received (unencrypted) data to m_ReceivedData, parses complete packets */
-	void AddReceivedData(const char * a_Data, int a_Size);
+	void AddReceivedData(const char * a_Data, size_t a_Size);
 	
 	/** Reads and handles the packet. The packet length and type have already been read.
 	Returns true if the packet was understood, false if it was an unknown packet
@@ -287,7 +287,7 @@ protected:
 	void WritePacket(cByteBuffer & a_Packet);
 
 	/** Sends the data to the client, encrypting them if needed. */
-	virtual void SendData(const char * a_Data, int a_Size) override;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 
 	void SendCompass(const cWorld & a_World);
 	
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp
index 3b9003e60..3f7d7b254 100644
--- a/src/Protocol/ProtocolRecognizer.cpp
+++ b/src/Protocol/ProtocolRecognizer.cpp
@@ -794,7 +794,7 @@ AString cProtocolRecognizer::GetAuthServerID(void)
 
 
 
-void cProtocolRecognizer::SendData(const char * a_Data, int a_Size)
+void cProtocolRecognizer::SendData(const char * a_Data, size_t a_Size)
 {
 	// This is used only when handling the server ping
 	m_Client->SendData(a_Data, a_Size);
@@ -854,7 +854,7 @@ bool cProtocolRecognizer::TryRecognizeProtocol(void)
 	// This must be a lengthed protocol, try if it has the entire initial handshake packet:
 	m_Buffer.ResetRead();
 	UInt32 PacketLen;
-	UInt32 ReadSoFar = m_Buffer.GetReadableSpace();
+	UInt32 ReadSoFar = (UInt32)m_Buffer.GetReadableSpace();
 	if (!m_Buffer.ReadVarInt(PacketLen))
 	{
 		// Not enough bytes for the packet length, keep waiting
@@ -931,7 +931,7 @@ bool cProtocolRecognizer::TryRecognizeLengthlessProtocol(void)
 bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRemaining)
 {
 	UInt32 PacketType;
-	UInt32 NumBytesRead = m_Buffer.GetReadableSpace();
+	UInt32 NumBytesRead = (UInt32)m_Buffer.GetReadableSpace();
 	if (!m_Buffer.ReadVarInt(PacketType))
 	{
 		return false;
@@ -962,7 +962,7 @@ bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRema
 			m_Buffer.ReadBEShort(ServerPort);
 			m_Buffer.ReadVarInt(NextState);
 			m_Buffer.CommitRead();
-			m_Protocol = new cProtocol172(m_Client, ServerAddress, ServerPort, NextState);
+			m_Protocol = new cProtocol172(m_Client, ServerAddress, (UInt16)ServerPort, NextState);
 			return true;
 		}
 	}
diff --git a/src/Protocol/ProtocolRecognizer.h b/src/Protocol/ProtocolRecognizer.h
index d7fb8fad2..072d7c2d2 100644
--- a/src/Protocol/ProtocolRecognizer.h
+++ b/src/Protocol/ProtocolRecognizer.h
@@ -133,7 +133,7 @@ public:
 	
 	virtual AString GetAuthServerID(void) override;
 
-	virtual void SendData(const char * a_Data, int a_Size) override;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 
 protected:
 	cProtocol * m_Protocol;  //< The recognized protocol