Mirrorlandia_minetest/towercrane
1
0
Fork 0
mirror of https://github.com/minetest-mods/towercrane.git synced 2024-11-22 15:23:51 +01:00
Code Issues Projects Releases Wiki Activity

Fix rare crash and irrecoverable operator state (#16)

Browse Source 
* Fix rare crash and irrecoverable operator state

* Do not restore if the player is not an operator

* Fix typo
This commit is contained in:
1F616EMO~nya 2024-04-16 19:47:54 +08:00 committed by GitHub
parent af87d6278c
commit b7bed50ac7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
control.lua
View File

@ -103,7 +103,7 @@ end
local function reset_operator_privs(player) local function reset_operator_privs(player)
local privs = minetest.get_player_privs(player:get_player_name()) local privs = minetest.get_player_privs(player:get_player_name())
local meta = player:get_meta() local meta = player:get_meta()
if meta and privs then if meta and privs and meta:get_int("towercrane_isoperator") ~= 0 then
meta:set_string("towercrane_pos", "") meta:set_string("towercrane_pos", "")
-- restore the player privs default values -- restore the player privs default values
meta:set_int("towercrane_isoperator", 0) meta:set_int("towercrane_isoperator", 0)
@ -270,6 +270,7 @@ minetest.register_node("towercrane:mast_ctrl_on", {
meta:set_string("infotext", S("Switch crane on/off")) meta:set_string("infotext", S("Switch crane on/off"))
end, end,
drop = "",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
light_source = 3, light_source = 3,
@ -295,8 +296,14 @@ minetest.register_node("towercrane:mast_ctrl_off", {
if set_operator_privs(clicker, pos) then if set_operator_privs(clicker, pos) then
start_crane(pos, clicker) start_crane(pos, clicker)
local pos1, pos2 = calc_construction_area(pos) local pos1, pos2 = calc_construction_area(pos)
if pos1 and pos2 then
-- control player every second -- control player every second
minetest.after(1, control_player, pos, pos1, pos2, clicker:get_player_name()) minetest.after(1, control_player, pos, pos1, pos2, clicker:get_player_name())
else
-- Something weird happened, restore privileges
stop_crane(pos, clicker)
reset_operator_privs(clicker)
end
end end
end end
end, end,
@ -307,6 +314,7 @@ minetest.register_node("towercrane:mast_ctrl_off", {
meta:set_string("infotext", S("Switch crane on/off")) meta:set_string("infotext", S("Switch crane on/off"))
end, end,
drop = "",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
@ -315,9 +323,10 @@ minetest.register_node("towercrane:mast_ctrl_off", {
}) })
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
-- To recover from a crash, this must be done unconditionally
reset_operator_privs(player)
local pos = get_my_crane_pos(player) local pos = get_my_crane_pos(player)
if pos then if pos then
reset_operator_privs(player)
stop_crane(pos, player) stop_crane(pos, player)
end end
end) end)