Merge branch 'master' of https://github.com/crazyginger72/cg72_game

mods/default/compass.lua

@@ -789,24 +789,15 @@ minetest.register_chatcommand("find_bookmark", {
 })
 
 
-
-
-
 -- compassgps mod
 
 
-
-
 -- default to 0/0/0
 local default_spawn = {x=0, y=0, z=0}
 -- default to static spawnpoint (overwrites 0/0/0)
-local default_spawn_settings = minetest.setting_get("static_spawnpoint")
-if (default_spawn_settings) then
-	pos1 = string.find(default_spawn_settings, ",", 0)
-	default_spawn.x = tonumber(string.sub(default_spawn_settings, 0, pos1 - 1))
-	pos2 = string.find(default_spawn_settings, ",", pos1 + 1)
-	default_spawn.y = tonumber(string.sub(default_spawn_settings, pos1 + 1, pos2 - 1))
-	default_spawn.z = tonumber(string.sub(default_spawn_settings, pos2 + 1))
+local default_spawn_settings = minetest.setting_get("spawn")
+if (default_spawn_settings) ~= nil then
+	default_spawn = minetest.string_to_pos(default_spawn_settings)
 end
 
 local last_time_spawns_read = "default"

mods/default/craftitems.lua

@@ -10,16 +10,9 @@ minetest.register_craftitem("default:paper", {
 	description = "Paper",
 	inventory_image = "default_paper.png",
 	on_place = function(itemstack, placer, pointed_thing)
-		local pt = pointed_thing
-		local above = pt.above
-		local under = pt.under
-		local fdir = minetest.dir_to_facedir(placer:get_look_dir())
-		if minetest.get_node(above).name == "air" then
-			if (above.x ~= under.x) or (above.z ~= under.z) then
-				minetest.add_node(above, {name="default:letter_empty", param2=wdir[fdir+1]})
-			else
-				minetest.add_node(above, {name="default:letter_empty", param2=fdir})
-			end
+		local where = pointed_thing.above
+		if minetest.get_node(where).name == "air" then
+			minetest.add_node(where, {name="default:letter_empty"})
 			if not minetest.setting_getbool("creative_mode") then
 				itemstack:take_item()
 			end

mods/default/functions.lua

@@ -589,8 +589,7 @@ minetest.register_abm({
 		else
 			itemstacks = minetest.get_node_drops(node.name)
 			for _, itemname in ipairs(itemstacks) do
-				if minetest.get_item_group(node.name, "treedecay_drop") ~= 0 or
-						itemname ~= node.name then
+				if itemname ~= node.name then
 					local p_drop = {
 						x = pos.x - 0.5 + math.random(),
 						y = pos.y - 0.5 + math.random(),