3 files changed, 11 insertions, 6 deletions
diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index f965975a3..1d62d8b65 100644
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -83,9 +83,9 @@ ScriptApiBase::ScriptApiBase(ScriptingType type):
 
 	lua_atpanic(m_luastack, &luaPanic);
 
-	if (m_type == ScriptingType::Client)
+	/*if (m_type == ScriptingType::Client)
 		clientOpenLibs(m_luastack);
-	else
+	else*/
 		luaL_openlibs(m_luastack);
 
 	// Make the ScriptApiBase* accessible to ModApiBase
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 86f7f7bac..e2ef1f874 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -68,6 +68,7 @@ enum class ScriptingType: u8 {
 class Server;
 #ifndef SERVER
 class Client;
+class Game;
 #endif
 class IGameDef;
 class Environment;
@@ -106,6 +107,7 @@ public:
 	ScriptingType getType() { return m_type; }
 #ifndef SERVER
 	Client* getClient();
+	Game *getGame() { return m_game; }
 #endif
 
 	std::string getOrigin() { return m_last_run_mod; }
@@ -132,6 +134,9 @@ protected:
 	void stackDump(std::ostream &o);
 
 	void setGameDef(IGameDef* gamedef) { m_gamedef = gamedef; }
+#ifndef SERVER
+	void setGame(Game *game) { m_game = game; }
+#endif
 
 	Environment* getEnv() { return m_environment; }
 	void setEnv(Environment* env) { m_environment = env; }
@@ -159,6 +164,7 @@ private:
 	lua_State      *m_luastack = nullptr;
 
 	IGameDef       *m_gamedef = nullptr;
+	Game       *m_game = nullptr;
 	Environment    *m_environment = nullptr;
 #ifndef SERVER
 	GUIEngine      *m_guiengine = nullptr;
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 2afa3a191..d8ff667eb 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -90,6 +90,7 @@ void ScriptApiSecurity::initializeSecurity()
 		"math",
 	};
 	static const char *io_whitelist[] = {
+		"open",
 		"close",
 		"flush",
 		"read",
@@ -173,7 +174,7 @@ void ScriptApiSecurity::initializeSecurity()
 	copy_safe(L, io_whitelist, sizeof(io_whitelist));
 
 	// And replace unsafe ones
-	SECURE_API(io, open);
+	//SECURE_API(io, open);
 	SECURE_API(io, input);
 	SECURE_API(io, output);
 	SECURE_API(io, lines);
@@ -267,7 +268,6 @@ void ScriptApiSecurity::initializeSecurityClient()
 		"getinfo",
 		"traceback"
 	};
-
 #if USE_LUAJIT
 	static const char *jit_whitelist[] = {
 		"arch",
@@ -303,8 +303,6 @@ void ScriptApiSecurity::initializeSecurityClient()
 	SECURE_API(g, require);
 	lua_pop(L, 2);
 
-
-
 	// Copy safe OS functions
 	lua_getglobal(L, "os");
 	lua_newtable(L);
@@ -319,6 +317,7 @@ void ScriptApiSecurity::initializeSecurityClient()
 	copy_safe(L, debug_whitelist, sizeof(debug_whitelist));
 	lua_setfield(L, -3, "debug");
 	lua_pop(L, 1);  // Pop old debug
+	
 
 #if USE_LUAJIT
 	// Copy safe jit functions, if they exist