1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-09-29 16:00:33 +02:00

Merge branch 'master' of gitpiserver:minetest/minetest-minetestforfun-server

Conflicts:
	mods/mobs/npc.lua
This commit is contained in:
LeMagnesium 2015-04-12 23:18:33 +02:00
commit d6bea75353

View File

@ -94,7 +94,6 @@ mobs:register_mob("mobs:npc", {
clicker:set_wielded_item(item) clicker:set_wielded_item(item)
end end
if self.diamond_count < 4 then return end if self.diamond_count < 4 then return end
if self.owner == "" then if self.owner == "" then
self.owner = clicker:get_player_name() self.owner = clicker:get_player_name()
else else