Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2022-08-26 15:21:26 +02:00
commit aaa0ba123b
2 changed files with 5 additions and 2 deletions

View File

@ -80,8 +80,11 @@ end
-- ABM converts the trunk to a regular fruit trunk, and spawns some coconuts) -- ABM converts the trunk to a regular fruit trunk, and spawns some coconuts)
minetest.register_abm({ minetest.register_abm({
nodenames = { "moretrees:palm_fruit_trunk_gen" }, nodenames = { "moretrees:palm_fruit_trunk_gen" },
interval = 1, interval = 6,
chance = 1, chance = 1,
min_y = biome_lib.mapgen_elevation_limit.min,
max_y = biome_lib.mapgen_elevation_limit.max,
label = "converts palm trunk to a regular fruit trunk, and spawns some coconuts",
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
minetest.swap_node(pos, {name="moretrees:palm_fruit_trunk"}) minetest.swap_node(pos, {name="moretrees:palm_fruit_trunk"})
local poslist = minetest.find_nodes_in_area( local poslist = minetest.find_nodes_in_area(

View File

@ -556,7 +556,7 @@ end
local poplar_leaves_drop = minetest.registered_nodes["moretrees:poplar_leaves"].drop local poplar_leaves_drop = minetest.registered_nodes["moretrees:poplar_leaves"].drop
minetest.override_item("moretrees:poplar_leaves", { minetest.override_item("moretrees:poplar_leaves", {
drop = { drop = {
max_items = poplar_leaves_drop.maxitems, max_items = poplar_leaves_drop.max_items,
items = { items = {
{items = {"moretrees:poplar_sapling"}, rarity = 1.33 * poplar_leaves_drop.items[1].rarity }, {items = {"moretrees:poplar_sapling"}, rarity = 1.33 * poplar_leaves_drop.items[1].rarity },
{items = {"moretrees:poplar_small_sapling"}, rarity = 1.33 * poplar_leaves_drop.items[1].rarity }, {items = {"moretrees:poplar_small_sapling"}, rarity = 1.33 * poplar_leaves_drop.items[1].rarity },