Merge remote-tracking branch 'refs/remotes/origin/master' for several fixeds

* allows old way to get boolean value, for tnt
* backported Override builtin item entity the portable way
* another fix of nil for check on mobs
This commit is contained in:
mckaygerhard 2024-04-18 17:18:37 -04:00
commit 44030f041c
2 changed files with 3 additions and 3 deletions

View File

@ -39,8 +39,8 @@ local item = {
})
end,
on_step = function(self, dtime)
builtin_item.on_step(self, dtime)
on_step = function(self, dtime, ...)
builtin_item.on_step(self, dtime, ...)
if self.flammable then
-- flammable, check for igniters

View File

@ -117,7 +117,7 @@ if (PATH_FINDER == nil) then
PATH_FINDER = 1
end
local enable_tnt = minetest.settings:get_bool("enable_tnt")
local enable_tnt = minetest.settings:get_bool("enable_tnt") or minetest.settings:get("enable_tnt") or false
local spawn_nodes = {"group:stone"}
if minetest.get_modpath("nether") then