summaryrefslogtreecommitdiff
path: root/src/script/scripting_server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/script/scripting_server.cpp')
-rw-r--r--src/script/scripting_server.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/script/scripting_server.cpp b/src/script/scripting_server.cpp
index 5b99468dc..b462141b0 100644
--- a/src/script/scripting_server.cpp
+++ b/src/script/scripting_server.cpp
@@ -98,8 +98,9 @@ void ServerScripting::initAsync()
luaL_checktype(L, -1, LUA_TTABLE);
lua_getfield(L, -1, "get_globals_to_transfer");
lua_call(L, 0, 1);
- luaL_checktype(L, -1, LUA_TSTRING);
- getServer()->m_async_globals_data.set(readParam<std::string>(L, -1));
+ auto *data = script_pack(L, -1);
+ assert(!data->contains_userdata);
+ getServer()->m_async_globals_data.reset(data);
lua_pushnil(L);
lua_setfield(L, -3, "get_globals_to_transfer"); // unset function too
lua_pop(L, 2); // pop 'core', return value
@@ -183,8 +184,8 @@ void ServerScripting::InitializeAsync(lua_State *L, int top)
// globals data
lua_getglobal(L, "core");
luaL_checktype(L, -1, LUA_TTABLE);
- std::string s = ModApiBase::getServer(L)->m_async_globals_data.get();
- lua_pushlstring(L, s.c_str(), s.size());
+ auto *data = ModApiBase::getServer(L)->m_async_globals_data.get();
+ script_unpack(L, data);
lua_setfield(L, -2, "transferred_globals");
lua_pop(L, 1); // pop 'core'
}