diff --git a/mods/mobs/npc.lua b/mods/mobs/npc.lua
index 59dfba63..f278c64e 100755
--- a/mods/mobs/npc.lua
+++ b/mods/mobs/npc.lua
@@ -87,7 +87,14 @@ mobs:register_mob("mobs:npc", {
 			local pos = self.object:getpos()
 			pos.y = pos.y + 0.5
 			minetest.add_item(pos, {name = mobs.npc_drops[math.random(1,#mobs.npc_drops)]})
-		else
+		elsif item:get_name() == "default:diamond" then
+			self.diamond_count = (self.diamond_count or 0)
+			if not minetest.setting_getbool("creative_mode") then
+				item:take_item()
+				clicker:set_wielded_item(item)
+			end
+			if self.diamond_count < 4 then return end
+
 			if self.owner == "" then
 				self.owner = clicker:get_player_name()
 			else