forked from luanti-org/minetest_game
		
	Add furnace protection, eat some lines of codes
This adds protection for furnaces (when the area is protected, so it the furnace). Also made the codes a bit shorter..
This commit is contained in:
		@@ -120,8 +120,6 @@ minetest.register_on_dieplayer(function(player)
 | 
			
		||||
	local player_name = player:get_player_name()
 | 
			
		||||
	local player_inv = player:get_inventory()
 | 
			
		||||
	
 | 
			
		||||
	minetest.chat_send_player(player_name, "You died at "..minetest.pos_to_string(pos))
 | 
			
		||||
	
 | 
			
		||||
	local nn = minetest.get_node(pos).name
 | 
			
		||||
	if minetest.registered_nodes[nn].can_dig and
 | 
			
		||||
		not minetest.registered_nodes[nn].can_dig(pos, player) then
 | 
			
		||||
 
 | 
			
		||||
@@ -827,10 +827,6 @@ minetest.register_node("default:chest_locked", {
 | 
			
		||||
	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 | 
			
		||||
		local meta = minetest.get_meta(pos)
 | 
			
		||||
		if not has_locked_chest_privilege(meta, player) then
 | 
			
		||||
			minetest.log("action", player:get_player_name()..
 | 
			
		||||
					" tried to access a locked chest belonging to "..
 | 
			
		||||
					meta:get_string("owner").." at "..
 | 
			
		||||
					minetest.pos_to_string(pos))
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		return count
 | 
			
		||||
@@ -838,10 +834,6 @@ minetest.register_node("default:chest_locked", {
 | 
			
		||||
    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
 | 
			
		||||
		local meta = minetest.get_meta(pos)
 | 
			
		||||
		if not has_locked_chest_privilege(meta, player) then
 | 
			
		||||
			minetest.log("action", player:get_player_name()..
 | 
			
		||||
					" tried to access a locked chest belonging to "..
 | 
			
		||||
					meta:get_string("owner").." at "..
 | 
			
		||||
					minetest.pos_to_string(pos))
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		return stack:get_count()
 | 
			
		||||
@@ -849,18 +841,10 @@ minetest.register_node("default:chest_locked", {
 | 
			
		||||
    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
 | 
			
		||||
		local meta = minetest.get_meta(pos)
 | 
			
		||||
		if not has_locked_chest_privilege(meta, player) then
 | 
			
		||||
			minetest.log("action", player:get_player_name()..
 | 
			
		||||
					" tried to access a locked chest belonging to "..
 | 
			
		||||
					meta:get_string("owner").." at "..
 | 
			
		||||
					minetest.pos_to_string(pos))
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		return stack:get_count()
 | 
			
		||||
	end,
 | 
			
		||||
	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 | 
			
		||||
		minetest.log("action", player:get_player_name()..
 | 
			
		||||
				" moves stuff in locked chest at "..minetest.pos_to_string(pos))
 | 
			
		||||
	end,
 | 
			
		||||
    on_metadata_inventory_put = function(pos, listname, index, stack, player)
 | 
			
		||||
		minetest.log("action", player:get_player_name()..
 | 
			
		||||
				" moves stuff to locked chest at "..minetest.pos_to_string(pos))
 | 
			
		||||
@@ -961,6 +945,9 @@ minetest.register_node("default:furnace", {
 | 
			
		||||
		return true
 | 
			
		||||
	end,
 | 
			
		||||
	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
 | 
			
		||||
		if minetest.is_protected(pos, player:get_player_name()) then
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		local meta = minetest.get_meta(pos)
 | 
			
		||||
		local inv = meta:get_inventory()
 | 
			
		||||
		if listname == "fuel" then
 | 
			
		||||
@@ -979,6 +966,9 @@ minetest.register_node("default:furnace", {
 | 
			
		||||
		end
 | 
			
		||||
	end,
 | 
			
		||||
	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 | 
			
		||||
		if minetest.is_protected(pos, player:get_player_name()) then
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		local meta = minetest.get_meta(pos)
 | 
			
		||||
		local inv = meta:get_inventory()
 | 
			
		||||
		local stack = inv:get_stack(from_list, from_index)
 | 
			
		||||
@@ -997,6 +987,12 @@ minetest.register_node("default:furnace", {
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
	end,
 | 
			
		||||
	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
 | 
			
		||||
		if minetest.is_protected(pos, player:get_player_name()) then
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		return stack:get_count()
 | 
			
		||||
	end,
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_node("default:furnace_active", {
 | 
			
		||||
@@ -1047,6 +1043,9 @@ minetest.register_node("default:furnace_active", {
 | 
			
		||||
		return true
 | 
			
		||||
	end,
 | 
			
		||||
	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
 | 
			
		||||
		if minetest.is_protected(pos, player:get_player_name()) then
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		local meta = minetest.get_meta(pos)
 | 
			
		||||
		local inv = meta:get_inventory()
 | 
			
		||||
		if listname == "fuel" then
 | 
			
		||||
@@ -1065,6 +1064,9 @@ minetest.register_node("default:furnace_active", {
 | 
			
		||||
		end
 | 
			
		||||
	end,
 | 
			
		||||
	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 | 
			
		||||
		if minetest.is_protected(pos, player:get_player_name()) then
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		local meta = minetest.get_meta(pos)
 | 
			
		||||
		local inv = meta:get_inventory()
 | 
			
		||||
		local stack = inv:get_stack(from_list, from_index)
 | 
			
		||||
@@ -1083,6 +1085,12 @@ minetest.register_node("default:furnace_active", {
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
	end,
 | 
			
		||||
	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
 | 
			
		||||
		if minetest.is_protected(pos, player:get_player_name()) then
 | 
			
		||||
			return 0
 | 
			
		||||
		end
 | 
			
		||||
		return stack:get_count()
 | 
			
		||||
	end,
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
local function swap_node(pos,name)
 | 
			
		||||
@@ -1395,84 +1403,27 @@ minetest.register_node("default:grass_1", {
 | 
			
		||||
	end,
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_node("default:grass_2", {
 | 
			
		||||
	description = "Grass",
 | 
			
		||||
	drawtype = "plantlike",
 | 
			
		||||
	waving = 1,
 | 
			
		||||
	tiles = {"default_grass_2.png"},
 | 
			
		||||
	inventory_image = "default_grass_2.png",
 | 
			
		||||
	wield_image = "default_grass_2.png",
 | 
			
		||||
	paramtype = "light",
 | 
			
		||||
	walkable = false,
 | 
			
		||||
	buildable_to = true,
 | 
			
		||||
	is_ground_content = true,
 | 
			
		||||
	drop = "default:grass_1",
 | 
			
		||||
	groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
 | 
			
		||||
	sounds = default.node_sound_leaves_defaults(),
 | 
			
		||||
	selection_box = {
 | 
			
		||||
		type = "fixed",
 | 
			
		||||
		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 | 
			
		||||
	},
 | 
			
		||||
})
 | 
			
		||||
minetest.register_node("default:grass_3", {
 | 
			
		||||
	description = "Grass",
 | 
			
		||||
	drawtype = "plantlike",
 | 
			
		||||
	waving = 1,
 | 
			
		||||
	tiles = {"default_grass_3.png"},
 | 
			
		||||
	inventory_image = "default_grass_3.png",
 | 
			
		||||
	wield_image = "default_grass_3.png",
 | 
			
		||||
	paramtype = "light",
 | 
			
		||||
	walkable = false,
 | 
			
		||||
	buildable_to = true,
 | 
			
		||||
	is_ground_content = true,
 | 
			
		||||
	drop = "default:grass_1",
 | 
			
		||||
	groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
 | 
			
		||||
	sounds = default.node_sound_leaves_defaults(),
 | 
			
		||||
	selection_box = {
 | 
			
		||||
		type = "fixed",
 | 
			
		||||
		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 | 
			
		||||
	},
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_node("default:grass_4", {
 | 
			
		||||
	description = "Grass",
 | 
			
		||||
	drawtype = "plantlike",
 | 
			
		||||
	waving = 1,
 | 
			
		||||
	tiles = {"default_grass_4.png"},
 | 
			
		||||
	inventory_image = "default_grass_4.png",
 | 
			
		||||
	wield_image = "default_grass_4.png",
 | 
			
		||||
	paramtype = "light",
 | 
			
		||||
	walkable = false,
 | 
			
		||||
	buildable_to = true,
 | 
			
		||||
	is_ground_content = true,
 | 
			
		||||
	drop = "default:grass_1",
 | 
			
		||||
	groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
 | 
			
		||||
	sounds = default.node_sound_leaves_defaults(),
 | 
			
		||||
	selection_box = {
 | 
			
		||||
		type = "fixed",
 | 
			
		||||
		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 | 
			
		||||
	},
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_node("default:grass_5", {
 | 
			
		||||
	description = "Grass",
 | 
			
		||||
	drawtype = "plantlike",
 | 
			
		||||
	waving = 1,
 | 
			
		||||
	tiles = {"default_grass_5.png"},
 | 
			
		||||
	inventory_image = "default_grass_5.png",
 | 
			
		||||
	wield_image = "default_grass_5.png",
 | 
			
		||||
	paramtype = "light",
 | 
			
		||||
	walkable = false,
 | 
			
		||||
	buildable_to = true,
 | 
			
		||||
	is_ground_content = true,
 | 
			
		||||
	drop = "default:grass_1",
 | 
			
		||||
	groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
 | 
			
		||||
	sounds = default.node_sound_leaves_defaults(),
 | 
			
		||||
	selection_box = {
 | 
			
		||||
		type = "fixed",
 | 
			
		||||
		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 | 
			
		||||
	},
 | 
			
		||||
})
 | 
			
		||||
for i=2,5 do
 | 
			
		||||
	minetest.register_node("default:grass_"..i, {
 | 
			
		||||
		description = "Grass",
 | 
			
		||||
		drawtype = "plantlike",
 | 
			
		||||
		waving = 1,
 | 
			
		||||
		tiles = {"default_grass_"..i..".png"},
 | 
			
		||||
		inventory_image = "default_grass_"..i..".png",
 | 
			
		||||
		wield_image = "default_grass_"..i..".png",
 | 
			
		||||
		paramtype = "light",
 | 
			
		||||
		walkable = false,
 | 
			
		||||
		buildable_to = true,
 | 
			
		||||
		is_ground_content = true,
 | 
			
		||||
		drop = "default:grass_1",
 | 
			
		||||
		groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
 | 
			
		||||
		sounds = default.node_sound_leaves_defaults(),
 | 
			
		||||
		selection_box = {
 | 
			
		||||
			type = "fixed",
 | 
			
		||||
			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
 | 
			
		||||
		},
 | 
			
		||||
	})
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
minetest.register_node("default:ice", {
 | 
			
		||||
	description = "Ice",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user