Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://git.tchncs.de/Illuna-Minetest/minetest_game

Browse source
This commit is contained in:
Milan 2018-01-16 18:50:16 +01:00
commit 886011937a
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mods/fire/init.lua
View file

@ -31,18 +31,18 @@ minetest.register_node("fire:basic_flame", {
damage_per_second = 4, damage_per_second = 4,
groups = {igniter = 2, dig_immediate = 3, not_in_creative_inventory = 1}, groups = {igniter = 2, dig_immediate = 3, not_in_creative_inventory = 1},
on_timer = function(pos) on_timer = function(pos)
local f = minetest.find_node_near(pos, 1, {"group:flammable"}) --local f = minetest.find_node_near(pos, 1, {"group:flammable"})
if not f then --if not f then
minetest.remove_node(pos) minetest.remove_node(pos)
return -- return
end --end
-- Restart timer -- Restart timer
return true return false
end, end,
drop = "", drop = "",
on_construct = function(pos) on_construct = function(pos)
minetest.get_node_timer(pos):start(math.random(30, 60)) minetest.get_node_timer(pos):start(math.random(20, 30))
end, end,
}) })
@ -288,8 +288,13 @@ minetest.register_abm({
-- Enable the following ABMs according to 'enable fire' setting -- Enable the following ABMs according to 'enable fire' setting
<<<<<<< HEAD
local fire_enabled = minetest.setting_getbool("enable_fire") local fire_enabled = minetest.setting_getbool("enable_fire")
=======
--[[
local fire_enabled = minetest.settings:get_bool("enable_fire")
>>>>>>> 2e47e09... fire: remove fire abm's, make fire nodes last 20-30 seconds
if fire_enabled == nil then if fire_enabled == nil then
-- New setting not specified, check for old setting. -- New setting not specified, check for old setting.
-- If old setting is also not specified, 'not nil' is true. -- If old setting is also not specified, 'not nil' is true.
@ -356,4 +361,4 @@ else -- Fire enabled
end, end,
}) })
end end]]

2
mods/hudbars

@ -1 +1 @@
Subproject commit e9bfd2221f8b68ccbdb8a44155a8c51a54eaaec4 Subproject commit 8d864a49548457ccb3944a62b6a4338f962d4c64

2
mods/mobs_animal

@ -1 +1 @@
Subproject commit 51ac8cc9302637c95867a86264cac004e3426325 Subproject commit 80b157eb20d814513a67c1bd65501ebdd71a05ca

2
mods/mobs_redo

@ -1 +1 @@
Subproject commit 622d04b9e3bc9285ea6250d25d4d7f1dc0e2d471 Subproject commit 95a2e8a47e4ab430e793e22deed8eb5635f27b89