From 930d201f39be0ecd1e8613dee90e17a074640876 Mon Sep 17 00:00:00 2001 From: tchncs Date: Thu, 1 Sep 2016 14:22:49 +0200 Subject: [PATCH] bones: fix mergeconflict --- mods/bones/init.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mods/bones/init.lua b/mods/bones/init.lua index 13af52b5..20ae55e0 100644 --- a/mods/bones/init.lua +++ b/mods/bones/init.lua @@ -207,17 +207,11 @@ minetest.register_on_dieplayer(function(player) drop(pos, ItemStack("bones:bones")) return end -<<<<<<< HEAD - - minetest.set_node(pos, {name="bones:bones", param2=param2}) - - minetest.chat_send_player(player_name, "Your stuff is waiting for you at "..minetest.pos_to_string(pos).. ". Go and grab it! ;-)") - minetest.log("action", player_name.." left their bones at "..minetest.pos_to_string(pos)) -======= local param2 = minetest.dir_to_facedir(player:get_look_dir()) minetest.set_node(pos, {name = "bones:bones", param2 = param2}) ->>>>>>> 5e9e3f7e84fafd6ece535b1c7aff3b9ea4e6405b + minetest.chat_send_player(player_name, "Your stuff is waiting for you at "..minetest.pos_to_string(pos).. ". Go and grab it! ;-)") + minetest.log("action", player_name.." left their bones at "..minetest.pos_to_string(pos)) local meta = minetest.get_meta(pos) local inv = meta:get_inventory()