aboutsummaryrefslogtreecommitdiff
path: root/src/script/common
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2015-10-29 14:48:10 -0400
committerShadowNinja <shadowninja@minetest.net>2015-10-31 13:28:58 -0400
commit9269a0ecc7267822bc5ac5af95ad4977bdc94fec (patch)
tree1cf8639cc0a6b367670ac673780f321f85b467be /src/script/common
parentb872df6ef6a15ae4624b35ea7b8960bc24da1128 (diff)
downloadminetest-9269a0ecc7267822bc5ac5af95ad4977bdc94fec.tar.gz
minetest-9269a0ecc7267822bc5ac5af95ad4977bdc94fec.tar.bz2
minetest-9269a0ecc7267822bc5ac5af95ad4977bdc94fec.zip
Fix server crashing on Lua errors
Previously, the server called FATAL_ERROR when a Lua error occured. This caused a (mostly useless) core dump. The server now simply throws an exception, which is caught and printed before exiting with a non-zero return value. This also fixes a number of instances where errors were logged multiple times.
Diffstat (limited to 'src/script/common')
-rw-r--r--src/script/common/c_types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/common/c_types.h b/src/script/common/c_types.h
index 706470737..056f30251 100644
--- a/src/script/common/c_types.h
+++ b/src/script/common/c_types.h
@@ -52,10 +52,10 @@ public:
}
};
-class LuaError : public ServerError
+class LuaError : public ModError
{
public:
- LuaError(const std::string &s) : ServerError(s) {}
+ LuaError(const std::string &s) : ModError(s) {}
};