summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-25 17:25:39 +0200
committerMattes D <github@xoft.cz>2014-08-25 17:25:39 +0200
commitbf16c5ed92c7d45599099c4c3d628cee1a60f35f (patch)
tree4c6177c118bb347cb055dd3fc06de0e6ff53abdd
parentFixed a type warning. (diff)
downloadcuberite-bf16c5ed92c7d45599099c4c3d628cee1a60f35f.tar
cuberite-bf16c5ed92c7d45599099c4c3d628cee1a60f35f.tar.gz
cuberite-bf16c5ed92c7d45599099c4c3d628cee1a60f35f.tar.bz2
cuberite-bf16c5ed92c7d45599099c4c3d628cee1a60f35f.tar.lz
cuberite-bf16c5ed92c7d45599099c4c3d628cee1a60f35f.tar.xz
cuberite-bf16c5ed92c7d45599099c4c3d628cee1a60f35f.tar.zst
cuberite-bf16c5ed92c7d45599099c4c3d628cee1a60f35f.zip
-rw-r--r--src/Inventory.cpp2
-rw-r--r--src/Protocol/MojangAPI.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index 8da3dea5f..832a079bc 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -106,7 +106,7 @@ int cInventory::AddItem(const cItem & a_Item, bool a_AllowNewStacks, bool a_tryT
// When the item is a armor, try to set it directly to the armor slot.
if (ItemCategory::IsArmor(a_Item.m_ItemType))
{
- for (size_t i = 0; i < (size_t)m_ArmorSlots.GetNumSlots(); i++)
+ for (int i = 0; i < m_ArmorSlots.GetNumSlots(); i++)
{
if (m_ArmorSlots.GetSlot(i).IsEmpty() && cSlotAreaArmor::CanPlaceArmorInSlot(i, a_Item))
{
diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp
index d107a8470..83c2dc300 100644
--- a/src/Protocol/MojangAPI.cpp
+++ b/src/Protocol/MojangAPI.cpp
@@ -675,7 +675,7 @@ void cMojangAPI::CacheNamesToUUIDs(const AStringVector & a_PlayerNames)
// Also cache the UUIDToName:
{
cCSLock Lock(m_CSUUIDToName);
- for (size_t idx = 0; idx < JsonCount; ++idx)
+ for (Json::Value::UInt idx = 0; idx < JsonCount; ++idx)
{
Json::Value & Val = root[idx];
AString JsonName = Val.get("name", "").asString();