minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Clean up some getServer() unsafety" 

Turned out to not be a good idea.
This reverts commit 58eccc7a2a.
This commit is contained in:
sfan5 2024-04-28 00:24:22 +02:00
parent 73dbd2f0ab
commit df4c9e2903
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/cpp_api/s_base.cpp
View File

@ -541,8 +541,8 @@ Server* ScriptApiBase::getServer()
{ {
// Since the gamedef is the server it's still possible to retrieve it in // Since the gamedef is the server it's still possible to retrieve it in
// e.g. the async environment, but this isn't meant to happen. // e.g. the async environment, but this isn't meant to happen.
if (getType() != ScriptingType::Server) // TODO: still needs work
return nullptr; //assert(getType() == ScriptingType::Server);
return dynamic_cast<Server *>(m_gamedef); return dynamic_cast<Server *>(m_gamedef);
} }

13
src/script/scripting_emerge.cpp
View File

@ -56,15 +56,10 @@ EmergeScripting::EmergeScripting(EmergeThread *parent):
InitializeModApi(L, top); InitializeModApi(L, top);
// pull the globals data from the server auto *data = ModApiBase::getServer(L)->m_lua_globals_data.get();
{ assert(data);
auto *server = dynamic_cast<Server*>(ModApiBase::getGameDef(L)); script_unpack(L, data);
assert(server); lua_setfield(L, top, "transferred_globals");
auto *data = server->m_lua_globals_data.get();
assert(data);
script_unpack(L, data);
lua_setfield(L, top, "transferred_globals");
}
lua_pop(L, 1); lua_pop(L, 1);

6
src/script/scripting_server.cpp
View File

@ -192,10 +192,8 @@ void ServerScripting::InitializeAsync(lua_State *L, int top)
LuaVoxelManip::Register(L); LuaVoxelManip::Register(L);
LuaSettings::Register(L); LuaSettings::Register(L);
// pull the globals data from the server // globals data
auto *server = dynamic_cast<Server*>(ModApiBase::getGameDef(L)); auto *data = ModApiBase::getServer(L)->m_lua_globals_data.get();
assert(server);
auto *data = server->m_lua_globals_data.get();
assert(data); assert(data);
script_unpack(L, data); script_unpack(L, data);
lua_setfield(L, top, "transferred_globals"); lua_setfield(L, top, "transferred_globals");