Improve robustness against players doing weird unsupported things

4 files changed, 77 insertions, 1 deletions

diff --git a/callbuttons.lua b/callbuttons.lua
index 58cd40d..7e19de6 100644
--- a/callbuttons.lua
+++ b/callbuttons.lua
@@ -239,3 +239,35 @@ for _,state in ipairs(validstates) do
 		end,
 	})
 end
+
+minetest.register_abm({
+	label = "Check call buttons for missing/replaced controllers",
+	nodenames = {"group:_celevator_callbutton",},
+	interval = 15,
+	chance = 1,
+	action = function(pos)
+		local meta = minetest.get_meta(pos)
+		local carid = meta:get_int("carid")
+		if not (carid and carid > 0) then return end --Not set up yet
+		local carinfo = minetest.deserialize(celevator.storage:get_string("car"..carid))
+		if not carinfo then
+			meta:set_string("infotext","Error reading car information!\nPlease remove and replace this node.")
+			return
+		end
+		local iscontroller = (carinfo.controllerpos and celevator.controller.iscontroller(carinfo.controllerpos))
+		local isdispatcher = (carinfo.dispatcherpos and celevator.dispatcher.isdispatcher(carinfo.dispatcherpos))
+		if not (iscontroller or isdispatcher) then
+			meta:set_string("infotext","Controller/dispatcher is missing!\nPlease remove and replace this node.")
+			return
+		end
+		local metacarid = 0
+		if iscontroller then
+			metacarid = celevator.get_meta(carinfo.controllerpos):get_int("carid")
+		elseif isdispatcher then
+			metacarid = celevator.get_meta(carinfo.dispatcherpos):get_int("carid")
+		end
+		if metacarid ~= carid then
+			meta:set_string("infotext","Controller/dispatcher found but with incorrect ID!\nPlease remove and replace this node.")
+		end
+	end,
+})
diff --git a/controllerfw.lua b/controllerfw.lua
index eeb8814..3fff47a 100644
--- a/controllerfw.lua
+++ b/controllerfw.lua
@@ -74,6 +74,9 @@ local faultnames = {
 	drivebadorigin = "Drive Origin Invalid",
 	drivedoorinterlock = "Attempted to Move Doors With Car in Motion",
 	driveoutofbounds = "Target Position Out of Bounds",
+	drivenomachine = "Hoist Machine Missing",
+	drivemachinemismatch = "Drive<->Machine ID Mismatch",
+	drivecontrollermismatch = "Controller<->Drive ID Mismatch",
 }
 
 local function drivecmd(command)
diff --git a/drive_entity.lua b/drive_entity.lua
index de7c43f..0ddd4c4 100644
--- a/drive_entity.lua
+++ b/drive_entity.lua
@@ -653,7 +653,21 @@ function celevator.drives.entity.moveto(pos,target,inspection)
 	meta:mark_as_private({"apos","dpos","vel","maxvel","state","startpos","doorstate"})
 	local carid = celevator.get_meta(pos):get_int("carid")
 	local carinfo = minetest.deserialize(celevator.storage:get_string(string.format("car%d",carid)))
-	if not (carinfo and carinfo.machinepos) then return end
+	if not (carinfo and carinfo.machinepos and celevator.get_node(carinfo.machinepos).name == "celevator:machine") then
+		meta:set_string("fault","nomachine")
+		return
+	end
+	if not carinfo.controllerpos then return end
+	local controllermeta = celevator.get_meta(carinfo.controllerpos)
+	if controllermeta:get_int("carid") ~= carid then
+		meta:set_string("fault","controllermismatch")
+		return
+	end
+	local machinemeta = celevator.get_meta(carinfo.machinepos)
+	if machinemeta:get_int("carid") ~= carid then
+		meta:set_string("fault","machinemismatch")
+		return
+	end
 	local origin = minetest.string_to_pos(meta:get_string("origin"))
 	if not origin then
 		minetest.log("error","[celevator] [entity drive] Invalid origin for drive at "..minetest.pos_to_string(pos))
diff --git a/pilantern.lua b/pilantern.lua
index 7dda0a5..29f3cf7 100644
--- a/pilantern.lua
+++ b/pilantern.lua
@@ -578,3 +578,30 @@ minetest.register_abm({
 		celevator.pi.updatedisplay(pos)
 	end,
 })
+
+minetest.register_abm({
+	label = "Check PIs/lanterns for missing/replaced controllers",
+	nodenames = {"group:_celevator_pi","group:_celevator_lantern"},
+	interval = 15,
+	chance = 1,
+	action = function(pos)
+		local meta = minetest.get_meta(pos)
+		local carid = meta:get_int("carid")
+		if not (carid and carid > 0) then return end --Not set up yet
+		local carinfo = minetest.deserialize(celevator.storage:get_string("car"..carid))
+		if not carinfo then
+			celevator.pi.settext(pos," --")
+			meta:set_string("infotext","Error reading car information!\nPlease remove and replace this node.")
+			return
+		end
+		if not (carinfo.controllerpos and celevator.controller.iscontroller(carinfo.controllerpos)) then
+			celevator.pi.settext(pos," --")
+			meta:set_string("infotext","Controller is missing!\nPlease remove and replace this node.")
+			return
+		end
+		if celevator.get_meta(carinfo.controllerpos):get_int("carid") ~= carid then
+			celevator.pi.settext(pos," --")
+			meta:set_string("infotext","Controller found but with incorrect ID!\nPlease remove and replace this node.")
+		end
+	end,
+})