4 files changed, 12 insertions, 3 deletions

diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h
index e7a77dcbc..fdc24689c 100644
--- a/src/Items/ItemBow.h
+++ b/src/Items/ItemBow.h
@@ -57,6 +57,12 @@ public:
 		}
 		Force = std::min(Force, 1.0);
 
+		// Does the player have an arrow?
+		if (!a_Player->IsGameModeCreative() && !a_Player->GetInventory().HasItems(cItem(E_ITEM_ARROW)))
+		{
+			return;
+		}
+
 		// Create the arrow entity:
 		cArrowEntity * Arrow = new cArrowEntity(*a_Player, Force * 2);
 		if (Arrow == NULL)
@@ -73,6 +79,10 @@ public:
 		a_Player->GetWorld()->BroadcastSoundEffect("random.bow", a_Player->GetPosX(), a_Player->GetPosY(), a_Player->GetPosZ(), 0.5, (float)Force);
 		if (!a_Player->IsGameModeCreative())
 		{
+			if (a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchInfinity) == 0)
+			{
+				a_Player->GetInventory().RemoveItem(cItem(E_ITEM_ARROW));
+			}
 			a_Player->UseEquippedItem();
 		}
 	}
diff --git a/src/Items/ItemGoldenApple.h b/src/Items/ItemGoldenApple.h
index 4e1096e65..02ac0202c 100644
--- a/src/Items/ItemGoldenApple.h
+++ b/src/Items/ItemGoldenApple.h
@@ -29,7 +29,7 @@ public:
 		a_Player->AddEntityEffect(cEntityEffect::effRegeneration, 100, 1);
 
 		// When the apple is a 'notch apple', give extra effects:
-		if (a_Item->m_ItemDamage > 0)
+		if (a_Item->m_ItemDamage >= E_META_GOLDEN_APPLE_ENCHANTED)
 		{
 			a_Player->AddEntityEffect(cEntityEffect::effRegeneration, 600, 4);
 			a_Player->AddEntityEffect(cEntityEffect::effResistance, 6000, 0);
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 1c1e3b5b9..bceedaf69 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -66,7 +66,7 @@ cItemHandler * cItemHandler::m_ItemHandler[2268];
 
 cItemHandler * cItemHandler::GetItemHandler(int a_ItemType)
 {
-	if ((a_ItemType < 0) || ((unsigned long)a_ItemType >= ARRAYCOUNT(m_ItemHandler)))
+	if ((a_ItemType < 0) || ((size_t)a_ItemType >= ARRAYCOUNT(m_ItemHandler)))
 	{
 		// Either nothing (-1), or bad value, both cases should return the air handler
 		if (a_ItemType < -1)
diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h
index 7d5760fa9..cd235678d 100644
--- a/src/Items/ItemShovel.h
+++ b/src/Items/ItemShovel.h
@@ -19,7 +19,6 @@ public:
 	cItemShovelHandler(int a_ItemType)
 		: cItemHandler(a_ItemType)
 	{
-
 	}
 
 	virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override