From 544c7ef55b883da11f5cd8bab2ba25fa0eab7844 Mon Sep 17 00:00:00 2001
From: LeMagnesium <mg.minetest@gmail.com>
Date: Sun, 12 Apr 2015 23:36:50 +0200
Subject: [PATCH] Reverted NPC taming

---
 mods/mobs/npc.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mods/mobs/npc.lua b/mods/mobs/npc.lua
index ff926124..a4647133 100755
--- a/mods/mobs/npc.lua
+++ b/mods/mobs/npc.lua
@@ -87,13 +87,15 @@ 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)]})
-		elseif item:get_name() == "default:diamond" then
+--[[		elseif item:get_name() == "default:diamond" then
 			self.diamond_count = (self.diamond_count or 0) + 1
 			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
+]]--
+		else
 			if self.owner == "" then
 				self.owner = clicker:get_player_name()
 			else