Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-28 05:21:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Harden against unknown nodes

Browse source
This commit is contained in:
teknomunk 2024-04-06 07:33:47 +00:00
parent 659a387256
commit ce9e3481af
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mods/ENTITIES/mcl_minecarts/carts.lua
View file

@ -56,15 +56,16 @@ local function handle_cart_enter_exit(self, pos, next_dir, event)
local check_pos = pos + dir * check[1] + right * check[2] + up * check[3] local check_pos = pos + dir * check[1] + right * check[2] + up * check[3]
local node = minetest.get_node(check_pos) local node = minetest.get_node(check_pos)
local node_def = minetest.registered_nodes[node.name] local node_def = minetest.registered_nodes[node.name]
if node_def then
-- node-specific hook
local hook_name = "_mcl_minecarts_"..event..check[4]
local hook = node_def[hook_name]
if hook then hook(check_pos, self, next_dir, pos) end
-- node-specific hook -- global minecart hook
local hook_name = "_mcl_minecarts_"..event..check[4] hook = mcl_minecarts[event..check[4]]
local hook = node_def[hook_name] if hook then hook(check_pos, self, next_dir, node_def) end
if hook then hook(check_pos, self, next_dir, pos) end end
-- global minecart hook
hook = mcl_minecarts[event..check[4]]
if hook then hook(check_pos, self, next_dir, node_def) end
end end
-- Handle cart-specific behaviors -- Handle cart-specific behaviors
@ -85,9 +86,11 @@ local function handle_cart_node_watches(self, dtime)
for _,node_pos in ipairs(watches) do for _,node_pos in ipairs(watches) do
local node = minetest.get_node(node_pos) local node = minetest.get_node(node_pos)
local node_def = minetest.registered_nodes[node.name] local node_def = minetest.registered_nodes[node.name]
local hook = node_def._mcl_minecarts_node_on_step if node_def then
if hook and hook(node_pos, self, dtime) then local hook = node_def._mcl_minecarts_node_on_step
new_watches[#new_watches+1] = node_pos if hook and hook(node_pos, self, dtime) then
new_watches[#new_watches+1] = node_pos
end
end end
end end
@ -197,10 +200,8 @@ local function calculate_acceleration(self, staticdata)
acceleration = 0.6 acceleration = 0.6
elseif staticdata.velocity >= ( node_def._max_acceleration_velocity or max_vel ) then elseif staticdata.velocity >= ( node_def._max_acceleration_velocity or max_vel ) then
-- Standard friction -- Standard friction
else elseif node_def and node_def._rail_acceleration then
if node_def._rail_acceleration then acceleration = node_def._rail_acceleration * 4
acceleration = node_def._rail_acceleration * 4
end
end end
-- Factor in gravity after everything else -- Factor in gravity after everything else
@ -860,11 +861,9 @@ function mcl_minecarts.place_minecart(itemstack, pointed_thing, placer)
end end
local function dropper_place_minecart(dropitem, pos) local function dropper_place_minecart(dropitem, pos)
local node = minetest.get_node(pos)
local nodedef = minetest.registered_nodes[node.name]
-- Don't try to place the minecart if pos isn't a rail -- Don't try to place the minecart if pos isn't a rail
if (nodedef.groups.rail or 0) == 0 then return false end local node = minetest.get_node(pos)
if minetest.get_item_group(node.name, "rail") == 0 then return false end
mcl_minecarts.place_minecart(dropitem, { mcl_minecarts.place_minecart(dropitem, {
above = pos, above = pos,

4
mods/ENTITIES/mcl_minecarts/functions.lua
View file

@ -207,8 +207,8 @@ local function update_rail_connections(pos, opt)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local nodedef = minetest.registered_nodes[node.name] local nodedef = minetest.registered_nodes[node.name]
if not nodedef._mcl_minecarts then if not nodedef or not nodedef._mcl_minecarts then
minetest.log("warning", "attemting to rail connect "..node.name) minetest.log("warning", "attemting to rail connect to "..node.name)
return return
end end