diff options
author | AFCMS <afcm.contact@gmail.com> | 2022-08-02 11:58:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-02 11:58:08 +0200 |
commit | 6ec6acc539321709ed8517f1a571777a04f5c24c (patch) | |
tree | 7b63437670a07e218e4af5ebe942e0e3130ec629 /src/script/cpp_api | |
parent | 839600ed703ccffbdb71bd2f04fb379d0920da95 (diff) | |
download | minetest-6ec6acc539321709ed8517f1a571777a04f5c24c.tar.gz minetest-6ec6acc539321709ed8517f1a571777a04f5c24c.tar.bz2 minetest-6ec6acc539321709ed8517f1a571777a04f5c24c.zip |
Add `minetest.settings` to CSM API and allow CSMs to provide `settingtypes.txt` (#12131)
Co-authored-by: sfan5 <sfan5@live.de>
Co-authored-by: SmallJoker <SmallJoker@users.noreply.github.com>
Diffstat (limited to 'src/script/cpp_api')
-rw-r--r-- | src/script/cpp_api/s_security.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index 88e22f16f..316b19926 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -417,6 +417,12 @@ void ScriptApiSecurity::setLuaEnv(lua_State *L, int thread) bool ScriptApiSecurity::isSecure(lua_State *L) { +#ifndef SERVER + auto script = ModApiBase::getScriptApiBase(L); + // CSM keeps no globals backup but is always secure + if (script->getType() == ScriptingType::Client) + return true; +#endif lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_GLOBALS_BACKUP); bool secure = !lua_isnil(L, -1); lua_pop(L, 1); |