forked from nalc/homedecor_modpack
		
	Merge remote-tracking branch 'upstream/master'
This commit is contained in:
		| @@ -8,16 +8,9 @@ if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then | ||||
| end | ||||
|  | ||||
| if minetest.get_modpath("moreblocks") then | ||||
| 	minetest.register_alias_force("moreblocks:tar", "building_blocks:Tar") | ||||
| 	stairsplus:register_alias_all("building_blocks", "tar", "building_blocks", "Tar") | ||||
| 	stairsplus:register_alias_all("building_blocks", "marble", "building_blocks", "Marble") | ||||
| 	for _, i in ipairs(stairsplus.shapes_list) do | ||||
| 		local class = i[1] | ||||
| 		local cut = i[2] | ||||
| 		minetest.unregister_item("moreblocks:"..class.."tar"..cut) | ||||
| 		minetest.register_alias("moreblocks:"..class.."tar"..cut, "building_blocks:"..class.."tar"..cut) | ||||
| 	end | ||||
| 	minetest.unregister_item("moreblocks:tar") | ||||
| 	minetest.register_alias("moreblocks:tar", "building_blocks:Tar") | ||||
| 	stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar") | ||||
|  | ||||
| 	if minetest.get_modpath("gloopblocks") then | ||||
|   | ||||
| @@ -194,7 +194,7 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields) | ||||
| 		meta:set_string("infotext", fields.title) | ||||
| 	end | ||||
| 	minetest.log("action", S("@1 has written in a book (title: \"@2\"): \"@3\" at location @4", | ||||
| 			player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:getpos()))) | ||||
| 			player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:get_pos()))) | ||||
|  | ||||
| 	player_current_book[player_name] = nil | ||||
| 	return true | ||||
|   | ||||
| @@ -47,13 +47,13 @@ local add_mesh_desk_fan_entity = function(pos) | ||||
| 	local param2 = minetest.get_node(pos).param2 | ||||
| 	local entity = minetest.add_entity(pos, "homedecor:mesh_desk_fan") | ||||
| 	if param2 == 0 then | ||||
| 		entity:setyaw(3.142) -- 180 degrees | ||||
| 		entity:set_yaw(3.142) -- 180 degrees | ||||
| 	elseif minetest.get_node(pos).param2 == 1 then | ||||
| 		entity:setyaw(3.142/2) -- 90 degrees | ||||
| 		entity:set_yaw(3.142/2) -- 90 degrees | ||||
| 	elseif minetest.get_node(pos).param2 == 3 then | ||||
| 		entity:setyaw((-3.142/2)) -- 270 degrees | ||||
| 		entity:set_yaw((-3.142/2)) -- 270 degrees | ||||
| 	else | ||||
| 		entity:setyaw(0) | ||||
| 		entity:set_yaw(0) | ||||
| 	end | ||||
| 	return entity | ||||
| end | ||||
|   | ||||
| @@ -121,7 +121,7 @@ function lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, seats) | ||||
|  | ||||
| 	--seat the player | ||||
| 	sit_pos.y = sit_pos.y-0.5 | ||||
| 	clicker:setpos(sit_pos) | ||||
| 	clicker:set_pos(sit_pos) | ||||
| 	return itemstack | ||||
| end | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user