Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Fix error handling compatibility with Minetest bundled Lua' (#3533) from fix_error_handling_compatibility into master 

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3533
make-new-music-louder
ancientmarinerdev 2023-03-12 22:09:12 +00:00
parent 4fe4559e6d 0f7efcf9c1
commit 32ffa32009
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -468,9 +468,17 @@ end
local last_crash_warn_time = 0 local last_crash_warn_time = 0
local on_step_error_handler = function () local function log_error (stack_trace, info, info2)
local info = debug.getinfo(1, "SnlufL") minetest.log("action", "--- Bug report start (please provide a few lines before this also for context) ---")
minetest.log("action", "Error: " .. stack_trace)
minetest.log("action", "Bug info: " .. info)
if info2 then
minetest.log("action", "Bug info additional: " .. info2)
end
minetest.log("action", "--- Bug report end ---")
end
local function warn_user_error ()
local current_time = os.time() local current_time = os.time()
local time_since_warning = current_time - last_crash_warn_time local time_since_warning = current_time - last_crash_warn_time
@ -482,10 +490,12 @@ local on_step_error_handler = function ()
last_crash_warn_time = current_time last_crash_warn_time = current_time
minetest.log("A game crashing bug was prevented. Please provide debug.log information to MineClone2 dev team for investigation. (Search for: --- Bug report start)") minetest.log("A game crashing bug was prevented. Please provide debug.log information to MineClone2 dev team for investigation. (Search for: --- Bug report start)")
end end
minetest.log("action", "--- Bug report start (please provide a few lines before this also for context) ---") end
minetest.log("action", "Stack trace: ".. tostring(debug.traceback()))
minetest.log("action", "Bug info: ".. dump(info)) local on_step_error_handler = function ()
minetest.log("action", "--- Bug report end ---") warn_user_error ()
local info = debug.getinfo(1, "SnlufL")
log_error(tostring(debug.traceback()), dump(info))
end end
@ -493,14 +503,18 @@ end
-- main mob function -- main mob function
function mob_class:on_step(dtime) function mob_class:on_step(dtime)
if not DEVELOPMENT then if not DEVELOPMENT then
local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime) --local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
local status, retVal = pcall(on_step_work, self, dtime)
if status then if status then
return retVal return retVal
else
warn_user_error ()
local pos = self.object:get_pos()
log_error (dump(retVal), dump(pos), dump(self))
end end
else else
return on_step_work (self, dtime) return on_step_work (self, dtime)
end end
end end
local timer = 0 local timer = 0