git/celevator-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent crashing when minetest.get_objects_inside_radius() returns garbage

Browse Source
This commit is contained in:
cheapie 2024-04-22 17:55:20 -05:00
parent fb49406dd5
commit e29d179464
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
car.lua
View File

@ -679,7 +679,7 @@ minetest.register_on_player_receive_fields(function(_,formname,fields)
local cartopboxpos = vector.add(rootpos,vector.rotate_around_axis(vector.new(0,3,1),vector.new(0,1,0),rootdir)) local cartopboxpos = vector.add(rootpos,vector.rotate_around_axis(vector.new(0,3,1),vector.new(0,1,0),rootdir))
local erefs = minetest.get_objects_inside_radius(cartopboxpos,0.5) local erefs = minetest.get_objects_inside_radius(cartopboxpos,0.5)
for _,ref in pairs(erefs) do for _,ref in pairs(erefs) do
if toberemoved[ref:get_luaentity().name] then if ref:get_luaentity() and toberemoved[ref:get_luaentity().name] then
ref:remove() ref:remove()
end end
end end

10
drive_entity.lua
View File

@ -260,7 +260,7 @@ function celevator.drives.entity.entitiestonodes(refs,carid)
for _,eref in ipairs(refs) do for _,eref in ipairs(refs) do
local pos = eref:get_pos() local pos = eref:get_pos()
local top = false local top = false
if pos and (eref:get_luaentity().name == "celevator:car_moving" or eref:get_luaentity().name == "celevator:hwdoor_moving") then if pos and eref:get_luaentity() and (eref:get_luaentity().name == "celevator:car_moving" or eref:get_luaentity().name == "celevator:hwdoor_moving") then
pos = vector.round(pos) pos = vector.round(pos)
local node = { local node = {
name = eref:get_properties().wield_item, name = eref:get_properties().wield_item,
@ -270,7 +270,7 @@ function celevator.drives.entity.entitiestonodes(refs,carid)
minetest.set_node(pos,node) minetest.set_node(pos,node)
eref:remove() eref:remove()
if carid then celevator.get_meta(pos):set_int("carid",carid) end if carid then celevator.get_meta(pos):set_int("carid",carid) end
elseif pos and eref:get_luaentity().name == "celevator:incar_pi_entity" then elseif pos and eref:get_luaentity() and eref:get_luaentity().name == "celevator:incar_pi_entity" then
pos = vector.new(pos.x,math.floor(pos.y+0.5),pos.z) pos = vector.new(pos.x,math.floor(pos.y+0.5),pos.z)
eref:set_pos(pos) eref:set_pos(pos)
elseif not ok then elseif not ok then
@ -287,10 +287,10 @@ function celevator.drives.entity.entitiestonodes(refs,carid)
if top then ppos.y = ppos.y+1.1 end if top then ppos.y = ppos.y+1.1 end
i:set_pos(ppos) i:set_pos(ppos)
minetest.after(0.5,i.set_pos,i,ppos) minetest.after(0.5,i.set_pos,i,ppos)
elseif i:get_luaentity().name == "celevator:car_top_box" or i:get_luaentity().name == "celevator:car_door" then elseif i:get_luaentity() and (i:get_luaentity().name == "celevator:car_top_box" or i:get_luaentity().name == "celevator:car_door") then
local epos = i:get_pos() local epos = i:get_pos()
epos.y = math.floor(epos.y+0.5) epos.y = math.floor(epos.y+0.5)
if i:get_luaentity().name == "celevator:car_top_box" then if i:get_luaentity() and i:get_luaentity().name == "celevator:car_top_box" then
epos.y = epos.y+0.1 epos.y = epos.y+0.1
end end
i:set_pos(epos) i:set_pos(epos)
@ -773,7 +773,7 @@ minetest.register_node("celevator:machine",{
end end
local erefs = minetest.get_objects_inside_radius(sheavepos,0.5) local erefs = minetest.get_objects_inside_radius(sheavepos,0.5)
for _,ref in pairs(erefs) do for _,ref in pairs(erefs) do
if ref:get_luaentity().name == "celevator:sheave_moving" then if ref:get_luaentity() and ref:get_luaentity().name == "celevator:sheave_moving" then
ref:remove() ref:remove()
end end
end end