Illuna-Minetest/minetest_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mergeconflicts

Browse Source
This commit is contained in:
Milan*
2017-07-30 12:15:29 +02:00
parent 34075ee529 71dff2ac4a
commit 8a3f06a18f
47 changed files with 1139 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mods/default/functions.lua
View File

@@ -140,7 +140,7 @@ default.cool_lava = function(pos, node)
{pos = pos, max_hear_distance = 16, gain = 0.25})
end
if minetest.setting_getbool("enable_lavacooling") ~= false then
if minetest.settings:get_bool("enable_lavacooling") ~= false then
minetest.register_abm({
label = "Lava cooling",
nodenames = {"default:lava_source", "default:lava_flowing"},
@@ -148,7 +148,9 @@ if minetest.setting_getbool("enable_lavacooling") ~= false then
interval = 1,
chance = 2,
catch_up = false,
action = default.cool_lava,
action = function(...)
default.cool_lava(...)
end,
})
end
@@ -231,7 +233,9 @@ minetest.register_abm({
neighbors = {"group:sand"},
interval = 12,
chance = 83,
action = default.grow_cactus
action = function(...)
default.grow_cactus(...)
end
})
minetest.register_abm({
@@ -240,7 +244,9 @@ minetest.register_abm({
neighbors = {"default:dirt", "default:dirt_with_grass"},
interval = 14,
chance = 71,
action = default.grow_papyrus
action = function(...)
default.grow_papyrus(...)
end
})