Illuna-Minetest/minetest_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bones: fix mergeconflict

Browse Source
This commit is contained in:
tchncs 2016-09-01 14:22:49 +02:00
parent 9fb3a1960b
commit 930d201f39
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mods/bones/init.lua
View File

@ -207,17 +207,11 @@ minetest.register_on_dieplayer(function(player)
drop(pos, ItemStack("bones:bones")) drop(pos, ItemStack("bones:bones"))
return return
end 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()) local param2 = minetest.dir_to_facedir(player:get_look_dir())
minetest.set_node(pos, {name = "bones:bones", param2 = param2}) 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 meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()