flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

InfoDump: Do not crash if one plugin fails to load.

Browse Source 
If there's a syntax error in one plugin's Info.lua file, report the error and continue processing.
This commit is contained in:
Mattes D 2014-10-20 20:14:00 +02:00
parent b025bb63c2
commit d79d5945e3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MCServer/Plugins/InfoDump.lua
View File

@ -625,7 +625,11 @@ local function LoadPluginInfo(a_FolderName)
-- This is Lua-5.1-specific and won't work in Lua 5.2! -- This is Lua-5.1-specific and won't work in Lua 5.2!
local Sandbox = {} local Sandbox = {}
setfenv(cfg, Sandbox) setfenv(cfg, Sandbox)
cfg() local isSuccess, errMsg = pcall(cfg)
if not(isSuccess) then
return nil, "Cannot load Info.lua: " .. (errMsg or "<unknown error>")
end
if (Sandbox.g_PluginInfo == nil) then if (Sandbox.g_PluginInfo == nil) then
return nil, "Info.lua doesn't contain the g_PluginInfo declaration" return nil, "Info.lua doesn't contain the g_PluginInfo declaration"
end end