Merge remote-tracking branch 'upstream/master'

* Permet de les dropper quand on récolte le bloc où ils sont attachés.

bushes/init.lua

@@ -314,4 +314,6 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
 	for _, pos in ipairs(locations) do
 		grow_youngtree2(pos)
 	end
-end)
+end)
+
+minetest.log("action", "[bushes] loaded.")

bushes_classic/nodes.lua

@@ -4,6 +4,8 @@ local S = minetest.get_translator("bushes_classic")
 plantlife_bushes = {}
 
 -- TODO: add support for nodebreakers? those dig like mese picks
+local random = math.random
+
 plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	if not (digger and pos and oldnode) then
 		return
@@ -63,7 +65,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 
 		-- with a chance of 1/3, return 2 bushes
 		local amount
-		if can_harvest and math.random(1,3) == 1 then
+		if can_harvest and random(1,3) == 1 then
 			amount = "2"
 		else
 			amount = "1"
@@ -75,7 +77,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	elseif groupcaps.choppy then
 
 		-- the amount of sticks may vary
-		local amount = math.random(4, 20)
+		local amount = random(4, 20)
 		-- return some sticks
 		harvested = "default:stick " .. amount
 
@@ -136,7 +138,7 @@ minetest.register_abm({
 			local dirt = minetest.get_node(dirtpos)
 			local is_soil = minetest.get_item_group(dirt.name, "soil") or minetest.get_item_group(dirt.name, "potting_soil")
 
-			if is_soil and (dirt.name == "farming:soil_wet" or math.random(1,3) == 1) then
+			if is_soil and (dirt.name == "farming:soil_wet" or random(1,3) == 1) then
 				minetest.swap_node( pos, {name = "bushes:" .. bush_name .. "_bush"})
 			end
 		end
@@ -159,7 +161,6 @@ for i, bush_name in ipairs(bushes_classic.bushes) do
 		paramtype2 = "facedir",
 		on_use = minetest.item_eat(18),
 		groups = { dig_immediate = 3 },
-		is_ground_content = false,
 	})
 
 
@@ -211,5 +212,4 @@ minetest.register_node(":bushes:basket_empty", {
 	paramtype = "light",
 	paramtype2 = "facedir",
     groups = { dig_immediate = 3 },
-	is_ground_content = false,
 })

cavestuff/nodes.lua

@@ -1,6 +1,8 @@
 -- support for i18n
 local S = minetest.get_translator("cavestuff")
 
+local random = math.random
+
 --Rocks
 
 local cbox = {
@@ -15,12 +17,12 @@ minetest.register_node("cavestuff:pebble_1",{
 	tiles = {"undergrowth_pebble.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=3, stone=1, attached_node=1, dig_immediate=3},
+	groups = {cracky=3, stone=1, attached_node=1},
 	selection_box = cbox,
 	collision_box = cbox,
 	on_place = function(itemstack, placer, pointed_thing)
 		-- place a random pebble node
-		local stack = ItemStack("cavestuff:pebble_"..math.random(1,2))
+		local stack = ItemStack("cavestuff:pebble_"..random(1,2))
 		local ret = minetest.item_place(stack, placer, pointed_thing)
 		return ItemStack("cavestuff:pebble_1 "..itemstack:get_count()-(1-ret:get_count()))
 	end,
@@ -34,7 +36,7 @@ minetest.register_node("cavestuff:pebble_2",{
 	drop = "cavestuff:pebble_1",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1, dig_immediate=3},
+	groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1},
 	selection_box = cbox,
 	collision_box = cbox,
 	sounds = default.node_sound_stone_defaults(),
@@ -47,12 +49,12 @@ minetest.register_node("cavestuff:desert_pebble_1",{
 	 tiles = {"default_desert_stone.png"},
 	 paramtype = "light",
 	paramtype2 = "facedir",
-	 groups = {cracky=3, stone=1, attached_node=1, dig_immediate=3},
+	 groups = {cracky=3, stone=1, attached_node=1},
 	selection_box = cbox,
 	collision_box = cbox,
 	 on_place = function(itemstack, placer, pointed_thing)
 		-- place a random pebble node
-		local stack = ItemStack("cavestuff:desert_pebble_"..math.random(1,2))
+		local stack = ItemStack("cavestuff:desert_pebble_"..random(1,2))
 		local ret = minetest.item_place(stack, placer, pointed_thing)
 		return ItemStack("cavestuff:desert_pebble_1 "..itemstack:get_count()-(1-ret:get_count()))
 	end,
@@ -66,7 +68,7 @@ minetest.register_node("cavestuff:desert_pebble_2",{
 	 tiles = {"default_desert_stone.png"},
 	 paramtype = "light",
 	paramtype2 = "facedir",
-	 groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1, dig_immediate=3},
+	 groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1},
 	selection_box = cbox,
 	collision_box = cbox,
 	 sounds = default.node_sound_stone_defaults(),
@@ -78,7 +80,6 @@ minetest.register_node("cavestuff:stalactite_1",{
 	drawtype="nodebox",
 	tiles = {"undergrowth_pebble.png"},
 	groups = {cracky=3,attached_node=1},
-	is_ground_content = false,
 	description = S("Stalactite"),
 	paramtype = "light",
 	paramtype2 = "wallmounted",
@@ -125,7 +126,6 @@ minetest.register_node("cavestuff:stalactite_2",{
 	drawtype="nodebox",
 	tiles = {"undergrowth_pebble.png"},
 	groups = {cracky=3,attached_node=1,not_in_creative_inventory=1},
-	is_ground_content = false,
 	drop = "cavestuff:stalactite_1",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
@@ -144,7 +144,6 @@ minetest.register_node("cavestuff:stalactite_3",{
 	drawtype="nodebox",
 	tiles = {"undergrowth_pebble.png"},
 	groups = {cracky=3,attached_node=1,not_in_creative_inventory=1},
-	is_ground_content = false,
 	drop = "cavestuff:stalactite_1",
 	paramtype = "light",
 	paramtype2 = "wallmounted",

dryplants/init.lua

@@ -119,7 +119,6 @@ minetest.register_node("dryplants:grass", {
         fixed = {-0.5   , -0.5   , -0.5   ,   0.5   , -0.4375,  0.5   },
     },
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -152,7 +151,6 @@ minetest.register_node("dryplants:hay", {
         fixed = {-0.5   , -0.5   , -0.5   ,   0.5   , -0.4375,  0.5   },
     },
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 

dryplants/juncus.lua

@@ -153,4 +153,4 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
 	for _, pos in ipairs(locations) do
 		grow_juncus(pos)
 	end
-end)
+end)

dryplants/reed.lua

@@ -44,7 +44,6 @@ minetest.register_node("dryplants:wetreed_slab", {
 		fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2},
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -73,7 +72,6 @@ minetest.register_node("dryplants:wetreed_roof", {
 		}
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -196,7 +194,6 @@ minetest.register_node("dryplants:wetreed_roof_corner", {
 		}
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -227,7 +224,6 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", {
 		}
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -267,7 +263,6 @@ minetest.register_node("dryplants:reed", {
 	paramtype2 = "facedir",
 	tiles = {"dryplants_reed.png"},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -289,7 +284,6 @@ minetest.register_node("dryplants:reed_slab", {
 		fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2},
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -318,7 +312,6 @@ minetest.register_node("dryplants:reed_roof", {
 		}
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -349,7 +342,6 @@ minetest.register_node("dryplants:reed_roof_corner", {
 		}
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -380,6 +372,5 @@ minetest.register_node("dryplants:reed_roof_corner_2", {
 		}
 	},
 	groups = {snappy=3, flammable=2},
-	is_ground_content = false,
 	sounds = default.node_sound_leaves_defaults(),
 })

dryplants/reedmace.lua

@@ -88,7 +88,6 @@ minetest.register_node("dryplants:reedmace_spikes", {
 		flammable=2,
 		not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = 'dryplants:reedmace_sapling',
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -111,7 +110,6 @@ minetest.register_node("dryplants:reedmace_top", {
 		flammable=2,
 		not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = 'dryplants:reedmace_sapling',
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -135,7 +133,6 @@ minetest.register_node("dryplants:reedmace_height_2", {
 		flammable=2--,
 		--not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = 'dryplants:reedmace_sapling',
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -159,7 +156,6 @@ minetest.register_node("dryplants:reedmace_height_3", {
 		flammable=2--,
 		--not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = 'dryplants:reedmace_sapling',
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -183,7 +179,6 @@ minetest.register_node("dryplants:reedmace_height_3_spikes", {
 		flammable=2--,
 		--not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = 'dryplants:reedmace_sapling',
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -206,7 +201,6 @@ minetest.register_node("dryplants:reedmace", {
 		flammable=2,
 		not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = 'dryplants:reedmace_sapling',
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -237,7 +231,6 @@ minetest.register_node("dryplants:reedmace_bottom", {
 		flammable=2,
 		not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = 'dryplants:reedmace_sapling',
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {

ferns/gianttreefern.lua

@@ -138,7 +138,6 @@ minetest.register_node("ferns:tree_fern_leaves_giant", {
 		attached_node=1,
 		not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = {
 		max_items = 2,
 		items = {
@@ -180,7 +179,6 @@ minetest.register_node("ferns:tree_fern_leave_big", {
 		attached_node=1,
 		not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = "",
 	sounds = default.node_sound_leaves_defaults(),
 	after_destruct = function(pos,oldnode)
@@ -219,7 +217,6 @@ minetest.register_node("ferns:tree_fern_leave_big_end", {
 		attached_node=1,
 		not_in_creative_inventory=1
 	},
-	is_ground_content = false,
 	drop = "",
 	sounds = default.node_sound_leaves_defaults(),
 })
@@ -258,7 +255,6 @@ minetest.register_node("ferns:fern_trunk_big_top", {
 		not_in_creative_inventory=1,
 		leafdecay=3 -- to support vines
 	},
-	is_ground_content = false,
 	drop = "ferns:fern_trunk_big",
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -285,15 +281,17 @@ minetest.register_node("ferns:fern_trunk_big", {
 		fixed = {-1/4, -1/2, -1/4, 1/4, 1/2, 1/4},
 	},
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
-	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
-	after_destruct = function(pos,oldnode)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-        if node.name == "ferns:fern_trunk_big" or node.name == "ferns:fern_trunk_big_top" then
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk_big")
-        end
-    end,
+	after_dig_node = function(pos, node, metadata, digger)
+		if digger == nil then return end
+		local np = {x=pos.x,y=pos.y+1,z=pos.z}
+		local nn = minetest.get_node(np)
+		if nn.name == "ferns:fern_trunk_big" or
+			nn.name == "ferns:fern_trunk_big_top"
+		then
+			minetest.node_dig(np, nn, digger)
+		end
+	end,
 })
 
 -----------------------------------------------------------------------------------------------